From 8887e1f697d9e13ad277ca7d7054bc42c2459548 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 25 Jul 2018 17:36:41 +0100
Subject: [PATCH 001/199] weechat: seperate weechat-unwrapped from wrapper

If I have a patch I want to apply to weechat, I can't do that with
overrideAttrs like I can with almost every other package, because that
only applies to the wrapper derivation. For other wrapped packages, one
can usually call the wrapper with any version of the derivation, but the
weechat derivation didn't expose a wrapper creation function.

Taking inspiration from other packages, particularly Firefox, I
extracted the wrapper into its own function, made the default weechat
derivation use that, and added weechat-unwrapped.

Now I can add my custom patch like this:

    (wrapWeechat
      (weechat-unwrapped.overrideAttrs (oldAttrs: {
        patches = [
          (fetchpatch {
            url = "https://github.com/weechat/weechat/commit/55767f5f116db3cb56cf85f52aa80feff45b6abf.patch?full_index=1";
            sha256 = "1pkcdsby57diqds1y5hhl0fr4i8j0zax32jb0gqd36siki3lza3d";
          })
        ];
      }))
      { configure =
        { availablePlugins, ... }:
        {
          plugins = with availablePlugins; [
            (python.withPackages (packages: with packages; [ potr websocket_client ]))
          ];
        };
      })

There is a small backward incompatibility here: previously, it was
possible to get an unwrapped weechat like this:

    weechat.override { configure = null; }

This didn't seem too important to keep around since it was also possible
to get an unwrapped weechat in a much more obvious way:

    weechat.unwrapped

I could probably make it so that the first way still worked, if that
behavior turns out to really have been important.
---
 .../networking/irc/weechat/default.nix        | 54 +-----------------
 .../networking/irc/weechat/wrapper.nix        | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +-
 3 files changed, 65 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/weechat/wrapper.nix

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 16162435e09a..82f9e28a13cc 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -2,7 +2,6 @@
 , ncurses, openssl, aspell, gnutls
 , zlib, curl, pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
-, writeScriptBin # for withPlugins
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
@@ -10,9 +9,7 @@
 , pythonSupport ? true, pythonPackages
 , rubySupport ? true, ruby
 , tclSupport ? true, tcl
-, extraBuildInputs ? []
-, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
-, runCommand }:
+, extraBuildInputs ? [] }:
 
 let
   inherit (pythonPackages) python;
@@ -26,7 +23,7 @@ let
   ];
   enabledPlugins = builtins.filter (p: p.enabled) plugins;
 
-  weechat =
+  in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
       version = "2.1";
@@ -81,49 +78,4 @@ let
         maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
         platforms = stdenv.lib.platforms.unix;
       };
-    };
-in if configure == null then weechat else
-  let
-    perlInterpreter = perl;
-    config = configure {
-      availablePlugins = let
-          simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
-        in rec {
-          python = {
-            pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
-            withPackages = pkgsFun: (python // {
-              extraEnv = ''
-                export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
-              '';
-            });
-          };
-          perl = (simplePlugin "perl") // {
-            extraEnv = ''
-              export PATH="${perlInterpreter}/bin:$PATH"
-            '';
-          };
-          tcl = simplePlugin "tcl";
-          ruby = simplePlugin "ruby";
-          guile = simplePlugin "guile";
-          lua = simplePlugin "lua";
-        };
-      };
-
-    inherit (config) plugins;
-
-    pluginsDir = runCommand "weechat-plugins" {} ''
-      mkdir -p $out/plugins
-      for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
-        ln -s $plugin $out/plugins
-      done
-    '';
-  in (writeScriptBin "weechat" ''
-    #!${stdenv.shell}
-    export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
-    ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
-    exec ${weechat}/bin/weechat "$@"
-  '') // {
-    name = weechat.name;
-    unwrapped = weechat;
-    meta = weechat.meta;
-  }
+    }
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
new file mode 100644
index 000000000000..5c557a8fd242
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -0,0 +1,57 @@
+{ pythonPackages, perl, runCommand, lib, writeScriptBin, stdenv
+}:
+
+weechat:
+
+let
+  wrapper = {
+    configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
+  }:
+
+  let
+    perlInterpreter = perl;
+    config = configure {
+      availablePlugins = let
+        simplePlugin = name: { pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so"; };
+        in rec {
+          python = {
+            pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+            withPackages = pkgsFun: (python // {
+              extraEnv = ''
+                export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
+              '';
+            });
+          };
+          perl = (simplePlugin "perl") // {
+            extraEnv = ''
+              export PATH="${perlInterpreter}/bin:$PATH"
+            '';
+          };
+          tcl = simplePlugin "tcl";
+          ruby = simplePlugin "ruby";
+          guile = simplePlugin "guile";
+          lua = simplePlugin "lua";
+        };
+    };
+
+    inherit (config) plugins;
+
+    pluginsDir = runCommand "weechat-plugins" {} ''
+      mkdir -p $out/plugins
+      for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do
+        ln -s $plugin $out/plugins
+      done
+    '';
+
+  in (writeScriptBin "weechat" ''
+    #!${stdenv.shell}
+    export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+    ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+    exec ${weechat}/bin/weechat "$@"
+  '') // {
+    name = weechat.name;
+    unwrapped = weechat;
+    meta = weechat.meta;
+  };
+
+in lib.makeOverridable wrapper
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b22f261ab10..5b95467da98a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18895,12 +18895,16 @@ with pkgs;
 
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
 
-  weechat = callPackage ../applications/networking/irc/weechat {
+  wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
+
+  weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
     inherit (darwin) libresolv;
     guile = guile_2_0;
   };
 
+  weechat = wrapWeechat weechat-unwrapped { };
+
   weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge {
     inherit (luaPackages) cjson;
   };

From 6d4b02df3f8cbc51b35b31208c4127b45d60f431 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Mon, 29 Oct 2018 12:26:18 +0100
Subject: [PATCH 002/199] nixos/containers: don't create veths if not
 configured

Previously, setting "privateNetwork = true" without specifying host and
local addresses would create unconfigured interfaces: ve-$INSTANCE on the host
and eth0 inside the container.

These changes is rebased part of the original PR #3021.
---
 nixos/modules/virtualisation/containers.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 8fe59badd335..50ee89168eee 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -36,7 +36,7 @@ let
         #! ${pkgs.runtimeShell} -e
 
         # Initialise the container side of the veth pair.
-        if [ "$PRIVATE_NETWORK" = 1 ]; then
+        if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
 
           ip link set host0 name eth0
           ip link set dev eth0 up
@@ -85,6 +85,10 @@ let
       cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
 
       if [ "$PRIVATE_NETWORK" = 1 ]; then
+        extraFlags+=" --private-network"
+      fi
+
+      if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
         extraFlags+=" --network-veth"
         if [ -n "$HOST_BRIDGE" ]; then
           extraFlags+=" --network-bridge=$HOST_BRIDGE"
@@ -153,7 +157,7 @@ let
       # Clean up existing machined registration and interfaces.
       machinectl terminate "$INSTANCE" 2> /dev/null || true
 
-      if [ "$PRIVATE_NETWORK" = 1 ]; then
+      if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
         ip link del dev "ve-$INSTANCE" 2> /dev/null || true
         ip link del dev "vb-$INSTANCE" 2> /dev/null || true
       fi
@@ -200,7 +204,7 @@ let
           '';
     in
       ''
-        if [ "$PRIVATE_NETWORK" = 1 ]; then
+        if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
           if [ -z "$HOST_BRIDGE" ]; then
             ifaceHost=ve-$INSTANCE
             ip link set dev $ifaceHost up
@@ -349,7 +353,7 @@ let
         List of forwarded ports from host to container. Each forwarded port
         is specified by protocol, hostPort and containerPort. By default,
         protocol is tcp and hostPort and containerPort are assumed to be
-        the same if containerPort is not explicitly given. 
+        the same if containerPort is not explicitly given.
       '';
     };
 
@@ -694,7 +698,7 @@ in
     # container so that container@.target can get the container
     # configuration.
     environment.etc =
-      let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); 
+      let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
       in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
       { text =
           ''

From f1de24feb89d6516c35b7c34c0fb7dc57e8d865d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= <pe@pijul.org>
Date: Fri, 16 Nov 2018 12:12:59 +0000
Subject: [PATCH 003/199] Rust build-support: fixing a compilation error in
 some crates (such as proc-macro2)

---
 .../rust/build-rust-crate/configure-crate.nix             | 2 ++
 .../build-support/rust/build-rust-crate/install-crate.nix | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

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 37fef2abd774..ff04ba6a8173 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -71,6 +71,8 @@ in ''
   export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
   export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
   export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
+  export NUM_JOBS=1
+  export RUSTC="rustc"
   if [[ -n "${versionPre}" ]]; then
     export CARGO_PKG_VERSION_PRE="${versionPre}"
   fi
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
index c41df34ca39b..3b0282621ea1 100644
--- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -20,9 +20,11 @@ crateName: metadata:
     mkdir -p $out/lib
     cp -r target/build/* $out/lib # */
   fi
-  if [[ "$(ls -A target/bin)" ]]; then
-    mkdir -p $out/bin
-    cp -P target/bin/* $out/bin # */
+  if [[ -d target/bin ]]; then
+    if [[ "$(ls -A target/bin)" ]]; then
+      mkdir -p $out/bin
+      cp -P target/bin/* $out/bin # */
+    fi
   fi
   runHook postInstall
 ''

From 3ffda36356dd7b0fd41fb796b9a65f05f9f3a7a1 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Tue, 20 Nov 2018 01:15:13 +0100
Subject: [PATCH 004/199] wireguard: don't modprobe if boot.isContainer is set

---
 nixos/modules/services/networking/wireguard.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 564632a85ae5..41aff1480a05 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -202,7 +202,7 @@ let
         };
 
         script = ''
-          modprobe wireguard
+          ${optionalString (!config.boot.isContainer) "modprobe wireguard"}
 
           ${values.preSetup}
 

From 0e8332ca2bfe5503cec403ac759c180f1d3d0ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?=
 <pierre-etienne.meunier@inria.fr>
Date: Thu, 22 Nov 2018 11:40:03 +0000
Subject: [PATCH 005/199] Fixing "include"

---
 pkgs/build-support/rust/build-rust-crate/helpers.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix
index e04324684e50..8a0a62434ec0 100644
--- a/pkgs/build-support/rust/build-rust-crate/helpers.nix
+++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix
@@ -2,6 +2,7 @@
 {
   kernel = stdenv.hostPlatform.parsed.kernel.name;
   abi = stdenv.hostPlatform.parsed.abi.name;
+  cpu = stdenv.hostPlatform.parsed.cpu.name;
    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
    mapFeatures = features: map (fun: fun { features = features; });
    mkFeatures = feat: lib.lists.foldl (features: featureName:
@@ -11,10 +12,12 @@
        features
    ) [] (builtins.attrNames feat);
   include = includedFiles: src: builtins.filterSource (path: type:
-    lib.lists.any (f:
-      let p = toString (src + ("/" + f)); in
-      (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-    ) includedFiles
+     lib.lists.any (f:
+       let p = toString (src + ("/" + f));
+           suff = lib.strings.removePrefix p path;
+       in
+       suff == "" || (lib.strings.hasPrefix "/" suff)
+     ) includedFiles
   ) src;
   exclude = excludedFiles: src: builtins.filterSource (path: type:
     lib.lists.all (f:

From 4cb63dc74ce546373b484d297b2ef0f5b1343972 Mon Sep 17 00:00:00 2001
From: Craig Younkins <cyounkins@gmail.com>
Date: Fri, 23 Nov 2018 02:09:49 +0000
Subject: [PATCH 006/199] perlPackages.MailSender: init at 0.903

---
 pkgs/top-level/perl-packages.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 012531799c3d..c951822f8f49 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9156,6 +9156,19 @@ let
     };
   };
 
+  MailSender = buildPerlPackage rec {
+    name = "Mail-Sender-0.903";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz";
+      sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf";
+    };
+    meta = {
+      homepage = https://github.com/Perl-Email-Project/Mail-Sender;
+      description = "(DEPRECATED) module for sending mails with attachments through an SMTP server";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MailSendmail = buildPerlPackage rec {
     name = "Mail-Sendmail-0.80";
     src = fetchurl {

From c116de941106a0f546b3a1659033e4044f40a2d2 Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Thu, 22 Nov 2018 19:57:01 -0800
Subject: [PATCH 007/199] Use runtimeShell for dhcpcd

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index fa025a2ec89e..b9aa7156e86e 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
+{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:
 
 stdenv.mkDerivation rec {
   # when updating this to >=7, check, see previous reverts:
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
     runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
   ];
 
+  prePatch = ''
+    substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
+  '';
+
   preConfigure = "patchShebangs ./configure";
 
   configureFlags = [

From e7fd32d2f1de4d8ead3faf3ddb28566169bea1b5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 26 Nov 2018 10:26:07 +0100
Subject: [PATCH 008/199] appimage-run: fix missing libatk-bridge-2.0.so.0

Fix `error while loading shared libraries: libatk-bridge-2.0.so.0`
when trying to run Beaker Browser >= 0.8.0
---
 pkgs/tools/package-management/appimage-run/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index e744b897f46a..af42b579a423 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -66,6 +66,7 @@ buildFHSUserEnv {
     dbus-glib
     libav
     atk
+    at-spi2-atk
     libudev0-shim
     networkmanager098
 

From 3083fa2aa10908c522e4f1dbdea126dc600ebc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?=
 <pierre-etienne.meunier@inria.fr>
Date: Tue, 27 Nov 2018 16:08:11 +0000
Subject: [PATCH 009/199] Carnix 0.9.2

---
 pkgs/build-support/rust/carnix.nix    |  27 +-
 pkgs/build-support/rust/crates-io.nix | 632 ++++++++++++--------------
 2 files changed, 283 insertions(+), 376 deletions(-)

diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 7a0d92f81b45..dd44fed623ed 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -1,4 +1,4 @@
-# Generated by carnix 0.8.11: carnix generate-nix
+# Generated by carnix 0.9.1: carnix generate-nix
 { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
 with buildRustCrateHelpers;
 let inherit (lib.lists) fold;
@@ -6,7 +6,7 @@ let inherit (lib.lists) fold;
 in
 let crates = cratesIO; in
 rec {
-  carnix = crates.crates.carnix."0.8.11" deps;
+  carnix = crates.crates.carnix."0.9.2" deps;
   __all = [ (carnix {}) ];
   deps.aho_corasick."0.6.8" = {
     memchr = "2.1.0";
@@ -42,7 +42,7 @@ rec {
     arrayvec = "0.4.7";
     constant_time_eq = "0.1.3";
   };
-  deps.carnix."0.8.11" = {
+  deps.carnix."0.9.2" = {
     clap = "2.32.0";
     dirs = "1.0.4";
     env_logger = "0.5.13";
@@ -51,7 +51,6 @@ rec {
     log = "0.4.5";
     nom = "3.2.1";
     regex = "1.0.5";
-    rusqlite = "0.14.0";
     serde = "1.0.80";
     serde_derive = "1.0.80";
     serde_json = "1.0.32";
@@ -112,16 +111,9 @@ rec {
     version_check = "0.1.5";
   };
   deps.libc."0.2.43" = {};
-  deps.libsqlite3_sys."0.9.3" = {
-    pkg_config = "0.3.14";
-  };
-  deps.linked_hash_map."0.4.2" = {};
   deps.log."0.4.5" = {
     cfg_if = "0.1.6";
   };
-  deps.lru_cache."0.1.1" = {
-    linked_hash_map = "0.4.2";
-  };
   deps.memchr."1.0.2" = {
     libc = "0.2.43";
   };
@@ -134,7 +126,6 @@ rec {
   deps.nom."3.2.1" = {
     memchr = "1.0.2";
   };
-  deps.pkg_config."0.3.14" = {};
   deps.proc_macro2."0.4.20" = {
     unicode_xid = "0.1.0";
   };
@@ -170,12 +161,6 @@ rec {
   deps.remove_dir_all."0.5.1" = {
     winapi = "0.3.6";
   };
-  deps.rusqlite."0.14.0" = {
-    bitflags = "1.0.4";
-    libsqlite3_sys = "0.9.3";
-    lru_cache = "0.1.1";
-    time = "0.1.40";
-  };
   deps.rustc_demangle."0.1.9" = {};
   deps.ryu."0.2.6" = {};
   deps.scoped_threadpool."0.1.9" = {};
@@ -220,11 +205,6 @@ rec {
   deps.thread_local."0.3.6" = {
     lazy_static = "1.1.0";
   };
-  deps.time."0.1.40" = {
-    libc = "0.2.43";
-    redox_syscall = "0.1.40";
-    winapi = "0.3.6";
-  };
   deps.toml."0.4.8" = {
     serde = "1.0.80";
   };
@@ -232,7 +212,6 @@ rec {
   deps.unicode_width."0.1.5" = {};
   deps.unicode_xid."0.1.0" = {};
   deps.utf8_ranges."1.0.1" = {};
-  deps.vcpkg."0.2.6" = {};
   deps.vec_map."0.8.1" = {};
   deps.version_check."0.1.5" = {};
   deps.winapi."0.3.6" = {
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
index 9d9cafe4cbf2..b03f52d35096 100644
--- a/pkgs/build-support/rust/crates-io.nix
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -5,6 +5,8 @@ let inherit (lib.lists) fold;
 in
 rec {
 
+# aho-corasick-0.6.8
+
   crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
     crateName = "aho-corasick";
     version = "0.6.8";
@@ -25,6 +27,9 @@ rec {
   ];
 
 
+# end
+# ansi_term-0.11.0
+
   crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate {
     crateName = "ansi_term";
     version = "0.11.0";
@@ -47,6 +52,9 @@ rec {
   ];
 
 
+# end
+# argon2rs-0.2.5
+
   crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate {
     crateName = "argon2rs";
     version = "0.2.5";
@@ -61,11 +69,11 @@ rec {
   features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec {
     argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true);
     blake2_rfc = fold recursiveUpdate {} [
-      { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
-      { "0.2.18".simd_asm =
-        (f.blake2_rfc."0.2.18".simd_asm or false) ||
+      { "${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" =
+        (f.blake2_rfc."${deps.argon2rs."0.2.5".blake2_rfc}"."simd_asm" or false) ||
         (argon2rs."0.2.5"."simd" or false) ||
         (f."argon2rs"."0.2.5"."simd" or false); }
+      { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; }
     ];
     scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true;
   }) [
@@ -74,6 +82,9 @@ rec {
   ];
 
 
+# end
+# arrayvec-0.4.7
+
   crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate {
     crateName = "arrayvec";
     version = "0.4.7";
@@ -102,6 +113,9 @@ rec {
   ];
 
 
+# end
+# atty-0.2.11
+
   crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate {
     crateName = "atty";
     version = "0.2.11";
@@ -136,6 +150,9 @@ rec {
   ];
 
 
+# end
+# backtrace-0.3.9
+
   crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate {
     crateName = "backtrace";
     version = "0.3.9";
@@ -147,13 +164,13 @@ rec {
     ])
       ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([
     ]
-      ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else [])
+      ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.9".backtrace_sys}" deps) ] else [])) else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
       (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps)
     ]) else [])
       ++ (if kernel == "windows" then mapFeatures features ([
     ]
-      ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []);
+      ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.9".winapi}" deps) ] else [])) else []);
     features = mkFeatures (features."backtrace"."0.3.9" or {});
   };
   features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec {
@@ -241,6 +258,9 @@ rec {
   ];
 
 
+# end
+# backtrace-sys-0.1.24
+
   crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate {
     crateName = "backtrace-sys";
     version = "0.1.24";
@@ -265,6 +285,9 @@ rec {
   ];
 
 
+# end
+# bitflags-1.0.4
+
   crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "1.0.4";
@@ -277,6 +300,9 @@ rec {
   }) [];
 
 
+# end
+# blake2-rfc-0.2.18
+
   crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate {
     crateName = "blake2-rfc";
     version = "0.2.18";
@@ -312,65 +338,68 @@ rec {
   ];
 
 
-  crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate {
+# end
+# carnix-0.9.2
+
+  crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate {
     crateName = "carnix";
-    version = "0.8.11";
+    version = "0.9.2";
     authors = [ "pe@pijul.org <pe@pijul.org>" ];
-    sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch";
+    sha256 = "1r668rjqcwsxjpz2hrr7j3k099c1xsb8vfq1w7y1ps9hap9af42z";
     crateBin =
       [{  name = "cargo-generate-nixfile";  path = "src/cargo-generate-nixfile.rs"; }] ++
       [{  name = "carnix";  path = "src/main.rs"; }];
     dependencies = mapFeatures features ([
-      (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps)
-      (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps)
-      (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps)
-      (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps)
-      (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps)
-      (crates."log"."${deps."carnix"."0.8.11"."log"}" deps)
-      (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps)
-      (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps)
-      (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps)
-      (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps)
-      (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps)
-      (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps)
-      (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps)
-      (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps)
+      (crates."clap"."${deps."carnix"."0.9.2"."clap"}" deps)
+      (crates."dirs"."${deps."carnix"."0.9.2"."dirs"}" deps)
+      (crates."env_logger"."${deps."carnix"."0.9.2"."env_logger"}" deps)
+      (crates."error_chain"."${deps."carnix"."0.9.2"."error_chain"}" deps)
+      (crates."itertools"."${deps."carnix"."0.9.2"."itertools"}" deps)
+      (crates."log"."${deps."carnix"."0.9.2"."log"}" deps)
+      (crates."nom"."${deps."carnix"."0.9.2"."nom"}" deps)
+      (crates."regex"."${deps."carnix"."0.9.2"."regex"}" deps)
+      (crates."serde"."${deps."carnix"."0.9.2"."serde"}" deps)
+      (crates."serde_derive"."${deps."carnix"."0.9.2"."serde_derive"}" deps)
+      (crates."serde_json"."${deps."carnix"."0.9.2"."serde_json"}" deps)
+      (crates."tempdir"."${deps."carnix"."0.9.2"."tempdir"}" deps)
+      (crates."toml"."${deps."carnix"."0.9.2"."toml"}" deps)
     ]);
   };
-  features_.carnix."0.8.11" = deps: f: updateFeatures f (rec {
-    carnix."0.8.11".default = (f.carnix."0.8.11".default or true);
-    clap."${deps.carnix."0.8.11".clap}".default = true;
-    dirs."${deps.carnix."0.8.11".dirs}".default = true;
-    env_logger."${deps.carnix."0.8.11".env_logger}".default = true;
-    error_chain."${deps.carnix."0.8.11".error_chain}".default = true;
-    itertools."${deps.carnix."0.8.11".itertools}".default = true;
-    log."${deps.carnix."0.8.11".log}".default = true;
-    nom."${deps.carnix."0.8.11".nom}".default = true;
-    regex."${deps.carnix."0.8.11".regex}".default = true;
-    rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true;
-    serde."${deps.carnix."0.8.11".serde}".default = true;
-    serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true;
-    serde_json."${deps.carnix."0.8.11".serde_json}".default = true;
-    tempdir."${deps.carnix."0.8.11".tempdir}".default = true;
-    toml."${deps.carnix."0.8.11".toml}".default = true;
+  features_.carnix."0.9.2" = deps: f: updateFeatures f (rec {
+    carnix."0.9.2".default = (f.carnix."0.9.2".default or true);
+    clap."${deps.carnix."0.9.2".clap}".default = true;
+    dirs."${deps.carnix."0.9.2".dirs}".default = true;
+    env_logger."${deps.carnix."0.9.2".env_logger}".default = true;
+    error_chain."${deps.carnix."0.9.2".error_chain}".default = true;
+    itertools."${deps.carnix."0.9.2".itertools}".default = true;
+    log."${deps.carnix."0.9.2".log}".default = true;
+    nom."${deps.carnix."0.9.2".nom}".default = true;
+    regex."${deps.carnix."0.9.2".regex}".default = true;
+    serde."${deps.carnix."0.9.2".serde}".default = true;
+    serde_derive."${deps.carnix."0.9.2".serde_derive}".default = true;
+    serde_json."${deps.carnix."0.9.2".serde_json}".default = true;
+    tempdir."${deps.carnix."0.9.2".tempdir}".default = true;
+    toml."${deps.carnix."0.9.2".toml}".default = true;
   }) [
-    (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps)
-    (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps)
-    (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps)
-    (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps)
-    (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps)
-    (features_.log."${deps."carnix"."0.8.11"."log"}" deps)
-    (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps)
-    (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps)
-    (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps)
-    (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps)
-    (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps)
-    (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps)
-    (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps)
-    (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps)
+    (features_.clap."${deps."carnix"."0.9.2"."clap"}" deps)
+    (features_.dirs."${deps."carnix"."0.9.2"."dirs"}" deps)
+    (features_.env_logger."${deps."carnix"."0.9.2"."env_logger"}" deps)
+    (features_.error_chain."${deps."carnix"."0.9.2"."error_chain"}" deps)
+    (features_.itertools."${deps."carnix"."0.9.2"."itertools"}" deps)
+    (features_.log."${deps."carnix"."0.9.2"."log"}" deps)
+    (features_.nom."${deps."carnix"."0.9.2"."nom"}" deps)
+    (features_.regex."${deps."carnix"."0.9.2"."regex"}" deps)
+    (features_.serde."${deps."carnix"."0.9.2"."serde"}" deps)
+    (features_.serde_derive."${deps."carnix"."0.9.2"."serde_derive"}" deps)
+    (features_.serde_json."${deps."carnix"."0.9.2"."serde_json"}" deps)
+    (features_.tempdir."${deps."carnix"."0.9.2"."tempdir"}" deps)
+    (features_.toml."${deps."carnix"."0.9.2"."toml"}" deps)
   ];
 
 
+# end
+# cc-1.0.25
+
   crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
     crateName = "cc";
     version = "1.0.25";
@@ -391,6 +420,9 @@ rec {
   }) [];
 
 
+# end
+# cfg-if-0.1.6
+
   crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
     crateName = "cfg-if";
     version = "0.1.6";
@@ -402,6 +434,9 @@ rec {
   }) [];
 
 
+# end
+# clap-2.32.0
+
   crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate {
     crateName = "clap";
     version = "2.32.0";
@@ -412,12 +447,12 @@ rec {
       (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps)
       (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps)
     ]
-      ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else [])
-      ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else [])
-      ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else []))
+      ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."${deps."clap"."2.32.0".atty}" deps) ] else [])
+      ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."${deps."clap"."2.32.0".strsim}" deps) ] else [])
+      ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."${deps."clap"."2.32.0".vec_map}" deps) ] else []))
       ++ (if !(kernel == "windows") then mapFeatures features ([
     ]
-      ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []);
+      ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.32.0".ansi_term}" deps) ] else [])) else []);
     features = mkFeatures (features."clap"."2.32.0" or {});
   };
   features_.clap."2.32.0" = deps: f: updateFeatures f (rec {
@@ -469,11 +504,11 @@ rec {
     ];
     strsim."${deps.clap."2.32.0".strsim}".default = true;
     textwrap = fold recursiveUpdate {} [
-      { "${deps.clap."2.32.0".textwrap}".default = true; }
-      { "0.10.0".term_size =
-        (f.textwrap."0.10.0".term_size or false) ||
+      { "${deps.clap."2.32.0".textwrap}"."term_size" =
+        (f.textwrap."${deps.clap."2.32.0".textwrap}"."term_size" or false) ||
         (clap."2.32.0"."wrap_help" or false) ||
         (f."clap"."2.32.0"."wrap_help" or false); }
+      { "${deps.clap."2.32.0".textwrap}".default = true; }
     ];
     unicode_width."${deps.clap."2.32.0".unicode_width}".default = true;
     vec_map."${deps.clap."2.32.0".vec_map}".default = true;
@@ -488,6 +523,9 @@ rec {
   ];
 
 
+# end
+# constant_time_eq-0.1.3
+
   crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate {
     crateName = "constant_time_eq";
     version = "0.1.3";
@@ -499,6 +537,9 @@ rec {
   }) [];
 
 
+# end
+# dirs-1.0.4
+
   crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate {
     crateName = "dirs";
     version = "1.0.4";
@@ -533,6 +574,9 @@ rec {
   ];
 
 
+# end
+# either-1.5.0
+
   crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate {
     crateName = "either";
     version = "1.5.0";
@@ -553,6 +597,9 @@ rec {
   }) [];
 
 
+# end
+# env_logger-0.5.13
+
   crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate {
     crateName = "env_logger";
     version = "0.5.13";
@@ -564,7 +611,7 @@ rec {
       (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps)
       (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps)
     ]
-      ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else []));
+      ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."${deps."env_logger"."0.5.13".regex}" deps) ] else []));
     features = mkFeatures (features."env_logger"."0.5.13" or {});
   };
   features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec {
@@ -592,6 +639,9 @@ rec {
   ];
 
 
+# end
+# error-chain-0.12.0
+
   crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate {
     crateName = "error-chain";
     version = "0.12.0";
@@ -599,7 +649,7 @@ rec {
     sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []));
+      ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."${deps."error_chain"."0.12.0".backtrace}" deps) ] else []));
     features = mkFeatures (features."error_chain"."0.12.0" or {});
   };
   features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec {
@@ -620,6 +670,9 @@ rec {
   ];
 
 
+# end
+# failure-0.1.3
+
   crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate {
     crateName = "failure";
     version = "0.1.3";
@@ -627,8 +680,8 @@ rec {
     sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])
-      ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else []));
+      ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.3".backtrace}" deps) ] else [])
+      ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.3".failure_derive}" deps) ] else []));
     features = mkFeatures (features."failure"."0.1.3" or {});
   };
   features_.failure."0.1.3" = deps: f: updateFeatures f (rec {
@@ -659,6 +712,9 @@ rec {
   ];
 
 
+# end
+# failure_derive-0.1.3
+
   crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate {
     crateName = "failure_derive";
     version = "0.1.3";
@@ -688,6 +744,9 @@ rec {
   ];
 
 
+# end
+# fuchsia-zircon-0.3.3
+
   crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon";
     version = "0.3.3";
@@ -708,6 +767,9 @@ rec {
   ];
 
 
+# end
+# fuchsia-zircon-sys-0.3.3
+
   crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon-sys";
     version = "0.3.3";
@@ -719,6 +781,9 @@ rec {
   }) [];
 
 
+# end
+# humantime-1.1.1
+
   crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate {
     crateName = "humantime";
     version = "1.1.1";
@@ -737,6 +802,9 @@ rec {
   ];
 
 
+# end
+# itertools-0.7.8
+
   crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate {
     crateName = "itertools";
     version = "0.7.8";
@@ -761,6 +829,9 @@ rec {
   ];
 
 
+# end
+# itoa-0.4.3
+
   crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate {
     crateName = "itoa";
     version = "0.4.3";
@@ -779,6 +850,9 @@ rec {
   }) [];
 
 
+# end
+# lazy_static-1.1.0
+
   crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate {
     crateName = "lazy_static";
     version = "1.1.0";
@@ -811,6 +885,9 @@ rec {
   ];
 
 
+# end
+# libc-0.2.43
+
   crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate {
     crateName = "libc";
     version = "0.2.43";
@@ -829,105 +906,8 @@ rec {
   }) [];
 
 
-  crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate {
-    crateName = "libsqlite3-sys";
-    version = "0.9.3";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021";
-    build = "build.rs";
-    dependencies = (if abi == "msvc" then mapFeatures features ([
-]) else []);
-
-    buildDependencies = mapFeatures features ([
-    ]
-      ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else []));
-    features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {});
-  };
-  features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec {
-    libsqlite3_sys = fold recursiveUpdate {} [
-      { "0.9.3".bindgen =
-        (f.libsqlite3_sys."0.9.3".bindgen or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); }
-      { "0.9.3".cc =
-        (f.libsqlite3_sys."0.9.3".cc or false) ||
-        (f.libsqlite3_sys."0.9.3".bundled or false) ||
-        (libsqlite3_sys."0.9.3"."bundled" or false); }
-      { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); }
-      { "0.9.3".min_sqlite_version_3_6_8 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (f.libsqlite3_sys."0.9.3".default or false) ||
-        (libsqlite3_sys."0.9.3"."default" or false); }
-      { "0.9.3".pkg-config =
-        (f.libsqlite3_sys."0.9.3".pkg-config or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
-      { "0.9.3".vcpkg =
-        (f.libsqlite3_sys."0.9.3".vcpkg or false) ||
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) ||
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); }
-    ];
-    pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true;
-  }) [
-    (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps)
-  ];
-
-
-  crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate {
-    crateName = "linked-hash-map";
-    version = "0.4.2";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
-    sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
-    dependencies = mapFeatures features ([
-]);
-    features = mkFeatures (features."linked_hash_map"."0.4.2" or {});
-  };
-  features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec {
-    linked_hash_map = fold recursiveUpdate {} [
-      { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); }
-      { "0.4.2".heapsize =
-        (f.linked_hash_map."0.4.2".heapsize or false) ||
-        (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
-        (linked_hash_map."0.4.2"."heapsize_impl" or false); }
-      { "0.4.2".serde =
-        (f.linked_hash_map."0.4.2".serde or false) ||
-        (f.linked_hash_map."0.4.2".serde_impl or false) ||
-        (linked_hash_map."0.4.2"."serde_impl" or false); }
-      { "0.4.2".serde_test =
-        (f.linked_hash_map."0.4.2".serde_test or false) ||
-        (f.linked_hash_map."0.4.2".serde_impl or false) ||
-        (linked_hash_map."0.4.2"."serde_impl" or false); }
-    ];
-  }) [];
-
+# end
+# log-0.4.5
 
   crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate {
     crateName = "log";
@@ -947,35 +927,8 @@ rec {
   ];
 
 
-  crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate {
-    crateName = "lru-cache";
-    version = "0.1.1";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ];
-    sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
-    dependencies = mapFeatures features ([
-      (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
-    ]);
-    features = mkFeatures (features."lru_cache"."0.1.1" or {});
-  };
-  features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec {
-    linked_hash_map = fold recursiveUpdate {} [
-      { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; }
-      { "0.4.2".heapsize_impl =
-        (f.linked_hash_map."0.4.2".heapsize_impl or false) ||
-        (lru_cache."0.1.1"."heapsize_impl" or false) ||
-        (f."lru_cache"."0.1.1"."heapsize_impl" or false); }
-    ];
-    lru_cache = fold recursiveUpdate {} [
-      { "0.1.1".default = (f.lru_cache."0.1.1".default or true); }
-      { "0.1.1".heapsize =
-        (f.lru_cache."0.1.1".heapsize or false) ||
-        (f.lru_cache."0.1.1".heapsize_impl or false) ||
-        (lru_cache."0.1.1"."heapsize_impl" or false); }
-    ];
-  }) [
-    (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps)
-  ];
-
+# end
+# memchr-1.0.2
 
   crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate {
     crateName = "memchr";
@@ -984,16 +937,16 @@ rec {
     sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
     dependencies = mapFeatures features ([
     ]
-      ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+      ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."${deps."memchr"."1.0.2".libc}" deps) ] else []));
     features = mkFeatures (features."memchr"."1.0.2" or {});
   };
   features_.memchr."1.0.2" = deps: f: updateFeatures f (rec {
     libc = fold recursiveUpdate {} [
-      { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
-      { "0.2.43".use_std =
-        (f.libc."0.2.43".use_std or false) ||
+      { "${deps.memchr."1.0.2".libc}"."use_std" =
+        (f.libc."${deps.memchr."1.0.2".libc}"."use_std" or false) ||
         (memchr."1.0.2"."use_std" or false) ||
         (f."memchr"."1.0.2"."use_std" or false); }
+      { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); }
     ];
     memchr = fold recursiveUpdate {} [
       { "1.0.2".default = (f.memchr."1.0.2".default or true); }
@@ -1013,6 +966,9 @@ rec {
   ];
 
 
+# end
+# memchr-2.1.0
+
   crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate {
     crateName = "memchr";
     version = "2.1.0";
@@ -1021,7 +977,7 @@ rec {
     dependencies = mapFeatures features ([
       (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps)
     ]
-      ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else []));
+      ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."${deps."memchr"."2.1.0".libc}" deps) ] else []));
 
     buildDependencies = mapFeatures features ([
       (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps)
@@ -1031,11 +987,11 @@ rec {
   features_.memchr."2.1.0" = deps: f: updateFeatures f (rec {
     cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true;
     libc = fold recursiveUpdate {} [
-      { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
-      { "0.2.43".use_std =
-        (f.libc."0.2.43".use_std or false) ||
+      { "${deps.memchr."2.1.0".libc}"."use_std" =
+        (f.libc."${deps.memchr."2.1.0".libc}"."use_std" or false) ||
         (memchr."2.1.0"."use_std" or false) ||
         (f."memchr"."2.1.0"."use_std" or false); }
+      { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); }
     ];
     memchr = fold recursiveUpdate {} [
       { "2.1.0".default = (f.memchr."2.1.0".default or true); }
@@ -1058,6 +1014,9 @@ rec {
   ];
 
 
+# end
+# nodrop-0.1.12
+
   crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate {
     crateName = "nodrop";
     version = "0.1.12";
@@ -1082,6 +1041,9 @@ rec {
   }) [];
 
 
+# end
+# nom-3.2.1
+
   crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate {
     crateName = "nom";
     version = "3.2.1";
@@ -1094,11 +1056,11 @@ rec {
   };
   features_.nom."3.2.1" = deps: f: updateFeatures f (rec {
     memchr = fold recursiveUpdate {} [
-      { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
-      { "1.0.2".use_std =
-        (f.memchr."1.0.2".use_std or false) ||
+      { "${deps.nom."3.2.1".memchr}"."use_std" =
+        (f.memchr."${deps.nom."3.2.1".memchr}"."use_std" or false) ||
         (nom."3.2.1"."std" or false) ||
         (f."nom"."3.2.1"."std" or false); }
+      { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); }
     ];
     nom = fold recursiveUpdate {} [
       { "3.2.1".compiler_error =
@@ -1132,16 +1094,8 @@ rec {
   ];
 
 
-  crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.14";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
-  };
-  features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec {
-    pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true);
-  }) [];
-
+# end
+# proc-macro2-0.4.20
 
   crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate {
     crateName = "proc-macro2";
@@ -1170,6 +1124,9 @@ rec {
   ];
 
 
+# end
+# quick-error-1.2.2
+
   crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate {
     crateName = "quick-error";
     version = "1.2.2";
@@ -1181,6 +1138,9 @@ rec {
   }) [];
 
 
+# end
+# quote-0.6.8
+
   crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate {
     crateName = "quote";
     version = "0.6.8";
@@ -1193,11 +1153,11 @@ rec {
   };
   features_.quote."0.6.8" = deps: f: updateFeatures f (rec {
     proc_macro2 = fold recursiveUpdate {} [
-      { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
-      { "0.4.20".proc-macro =
-        (f.proc_macro2."0.4.20".proc-macro or false) ||
+      { "${deps.quote."0.6.8".proc_macro2}"."proc-macro" =
+        (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}"."proc-macro" or false) ||
         (quote."0.6.8"."proc-macro" or false) ||
         (f."quote"."0.6.8"."proc-macro" or false); }
+      { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); }
     ];
     quote = fold recursiveUpdate {} [
       { "0.6.8".default = (f.quote."0.6.8".default or true); }
@@ -1211,6 +1171,9 @@ rec {
   ];
 
 
+# end
+# rand-0.4.3
+
   crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
     crateName = "rand";
     version = "0.4.3";
@@ -1221,7 +1184,7 @@ rec {
     ]) else [])
       ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
     ]
-      ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else [])
+      ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."${deps."rand"."0.4.3".libc}" deps) ] else [])) else [])
       ++ (if kernel == "windows" then mapFeatures features ([
       (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
     ]) else []);
@@ -1259,6 +1222,9 @@ rec {
   ];
 
 
+# end
+# redox_syscall-0.1.40
+
   crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate {
     crateName = "redox_syscall";
     version = "0.1.40";
@@ -1271,6 +1237,9 @@ rec {
   }) [];
 
 
+# end
+# redox_termios-0.1.1
+
   crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate {
     crateName = "redox_termios";
     version = "0.1.1";
@@ -1289,6 +1258,9 @@ rec {
   ];
 
 
+# end
+# redox_users-0.2.0
+
   crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate {
     crateName = "redox_users";
     version = "0.2.0";
@@ -1315,6 +1287,9 @@ rec {
   ];
 
 
+# end
+# regex-1.0.5
+
   crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate {
     crateName = "regex";
     version = "1.0.5";
@@ -1355,6 +1330,9 @@ rec {
   ];
 
 
+# end
+# regex-syntax-0.6.2
+
   crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate {
     crateName = "regex-syntax";
     version = "0.6.2";
@@ -1372,6 +1350,9 @@ rec {
   ];
 
 
+# end
+# remove_dir_all-0.5.1
+
   crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate {
     crateName = "remove_dir_all";
     version = "0.5.1";
@@ -1396,90 +1377,8 @@ rec {
   ];
 
 
-  crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate {
-    crateName = "rusqlite";
-    version = "0.14.0";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq";
-    dependencies = mapFeatures features ([
-      (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
-      (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
-      (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
-      (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps)
-    ]);
-    features = mkFeatures (features."rusqlite"."0.14.0" or {});
-  };
-  features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec {
-    bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true;
-    libsqlite3_sys = fold recursiveUpdate {} [
-      { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; }
-      { "0.9.3".buildtime_bindgen =
-        (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) ||
-        (rusqlite."0.14.0"."buildtime_bindgen" or false) ||
-        (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); }
-      { "0.9.3".bundled =
-        (f.libsqlite3_sys."0.9.3".bundled or false) ||
-        (rusqlite."0.14.0"."bundled" or false) ||
-        (f."rusqlite"."0.14.0"."bundled" or false); }
-      { "0.9.3".min_sqlite_version_3_6_11 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) ||
-        (rusqlite."0.14.0"."backup" or false) ||
-        (f."rusqlite"."0.14.0"."backup" or false); }
-      { "0.9.3".min_sqlite_version_3_6_23 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) ||
-        (rusqlite."0.14.0"."trace" or false) ||
-        (f."rusqlite"."0.14.0"."trace" or false); }
-      { "0.9.3".min_sqlite_version_3_7_3 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) ||
-        (rusqlite."0.14.0"."functions" or false) ||
-        (f."rusqlite"."0.14.0"."functions" or false); }
-      { "0.9.3".min_sqlite_version_3_7_4 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) ||
-        (rusqlite."0.14.0"."blob" or false) ||
-        (f."rusqlite"."0.14.0"."blob" or false); }
-      { "0.9.3".min_sqlite_version_3_7_7 =
-        (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) ||
-        (rusqlite."0.14.0"."vtab" or false) ||
-        (f."rusqlite"."0.14.0"."vtab" or false); }
-      { "0.9.3".sqlcipher =
-        (f.libsqlite3_sys."0.9.3".sqlcipher or false) ||
-        (rusqlite."0.14.0"."sqlcipher" or false) ||
-        (f."rusqlite"."0.14.0"."sqlcipher" or false); }
-      { "0.9.3".unlock_notify =
-        (f.libsqlite3_sys."0.9.3".unlock_notify or false) ||
-        (rusqlite."0.14.0"."unlock_notify" or false) ||
-        (f."rusqlite"."0.14.0"."unlock_notify" or false); }
-    ];
-    lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true;
-    rusqlite = fold recursiveUpdate {} [
-      { "0.14.0".bundled =
-        (f.rusqlite."0.14.0".bundled or false) ||
-        (f.rusqlite."0.14.0".array or false) ||
-        (rusqlite."0.14.0"."array" or false); }
-      { "0.14.0".csv =
-        (f.rusqlite."0.14.0".csv or false) ||
-        (f.rusqlite."0.14.0".csvtab or false) ||
-        (rusqlite."0.14.0"."csvtab" or false); }
-      { "0.14.0".default = (f.rusqlite."0.14.0".default or true); }
-      { "0.14.0".lazy_static =
-        (f.rusqlite."0.14.0".lazy_static or false) ||
-        (f.rusqlite."0.14.0".vtab or false) ||
-        (rusqlite."0.14.0"."vtab" or false); }
-      { "0.14.0".vtab =
-        (f.rusqlite."0.14.0".vtab or false) ||
-        (f.rusqlite."0.14.0".array or false) ||
-        (rusqlite."0.14.0"."array" or false) ||
-        (f.rusqlite."0.14.0".csvtab or false) ||
-        (rusqlite."0.14.0"."csvtab" or false); }
-    ];
-    time."${deps.rusqlite."0.14.0".time}".default = true;
-  }) [
-    (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps)
-    (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps)
-    (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps)
-    (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps)
-  ];
-
+# end
+# rustc-demangle-0.1.9
 
   crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate {
     crateName = "rustc-demangle";
@@ -1492,6 +1391,9 @@ rec {
   }) [];
 
 
+# end
+# ryu-0.2.6
+
   crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate {
     crateName = "ryu";
     version = "0.2.6";
@@ -1507,6 +1409,9 @@ rec {
   }) [];
 
 
+# end
+# scoped_threadpool-0.1.9
+
   crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate {
     crateName = "scoped_threadpool";
     version = "0.1.9";
@@ -1519,6 +1424,9 @@ rec {
   }) [];
 
 
+# end
+# serde-1.0.80
+
   crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate {
     crateName = "serde";
     version = "1.0.80";
@@ -1548,6 +1456,9 @@ rec {
   }) [];
 
 
+# end
+# serde_derive-1.0.80
+
   crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate {
     crateName = "serde_derive";
     version = "1.0.80";
@@ -1576,6 +1487,9 @@ rec {
   ];
 
 
+# end
+# serde_json-1.0.32
+
   crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate {
     crateName = "serde_json";
     version = "1.0.32";
@@ -1606,6 +1520,9 @@ rec {
   ];
 
 
+# end
+# strsim-0.7.0
+
   crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate {
     crateName = "strsim";
     version = "0.7.0";
@@ -1617,6 +1534,9 @@ rec {
   }) [];
 
 
+# end
+# syn-0.15.13
+
   crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate {
     crateName = "syn";
     version = "0.15.13";
@@ -1626,23 +1546,23 @@ rec {
       (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps)
       (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps)
     ]
-      ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else []));
+      ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."${deps."syn"."0.15.13".quote}" deps) ] else []));
     features = mkFeatures (features."syn"."0.15.13" or {});
   };
   features_.syn."0.15.13" = deps: f: updateFeatures f (rec {
     proc_macro2 = fold recursiveUpdate {} [
-      { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
-      { "0.4.20".proc-macro =
-        (f.proc_macro2."0.4.20".proc-macro or false) ||
+      { "${deps.syn."0.15.13".proc_macro2}"."proc-macro" =
+        (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}"."proc-macro" or false) ||
         (syn."0.15.13"."proc-macro" or false) ||
         (f."syn"."0.15.13"."proc-macro" or false); }
+      { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); }
     ];
     quote = fold recursiveUpdate {} [
-      { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
-      { "0.6.8".proc-macro =
-        (f.quote."0.6.8".proc-macro or false) ||
+      { "${deps.syn."0.15.13".quote}"."proc-macro" =
+        (f.quote."${deps.syn."0.15.13".quote}"."proc-macro" or false) ||
         (syn."0.15.13"."proc-macro" or false) ||
         (f."syn"."0.15.13"."proc-macro" or false); }
+      { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); }
     ];
     syn = fold recursiveUpdate {} [
       { "0.15.13".clone-impls =
@@ -1679,6 +1599,9 @@ rec {
   ];
 
 
+# end
+# synstructure-0.10.0
+
   crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate {
     crateName = "synstructure";
     version = "0.10.0";
@@ -1710,6 +1633,9 @@ rec {
   ];
 
 
+# end
+# tempdir-0.3.7
+
   crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate {
     crateName = "tempdir";
     version = "0.3.7";
@@ -1730,6 +1656,9 @@ rec {
   ];
 
 
+# end
+# termcolor-1.0.4
+
   crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate {
     crateName = "termcolor";
     version = "1.0.4";
@@ -1747,6 +1676,9 @@ rec {
   ];
 
 
+# end
+# termion-1.5.1
+
   crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate {
     crateName = "termion";
     version = "1.5.1";
@@ -1772,6 +1704,9 @@ rec {
   ];
 
 
+# end
+# textwrap-0.10.0
+
   crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate {
     crateName = "textwrap";
     version = "0.10.0";
@@ -1789,6 +1724,9 @@ rec {
   ];
 
 
+# end
+# thread_local-0.3.6
+
   crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate {
     crateName = "thread_local";
     version = "0.3.6";
@@ -1806,41 +1744,8 @@ rec {
   ];
 
 
-  crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate {
-    crateName = "time";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
-    dependencies = mapFeatures features ([
-      (crates."libc"."${deps."time"."0.1.40"."libc"}" deps)
-    ])
-      ++ (if kernel == "redox" then mapFeatures features ([
-      (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps)
-    ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([
-      (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps)
-    ]) else []);
-  };
-  features_.time."0.1.40" = deps: f: updateFeatures f (rec {
-    libc."${deps.time."0.1.40".libc}".default = true;
-    redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true;
-    time."0.1.40".default = (f.time."0.1.40".default or true);
-    winapi = fold recursiveUpdate {} [
-      { "${deps.time."0.1.40".winapi}"."minwinbase" = true; }
-      { "${deps.time."0.1.40".winapi}"."minwindef" = true; }
-      { "${deps.time."0.1.40".winapi}"."ntdef" = true; }
-      { "${deps.time."0.1.40".winapi}"."profileapi" = true; }
-      { "${deps.time."0.1.40".winapi}"."std" = true; }
-      { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; }
-      { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; }
-      { "${deps.time."0.1.40".winapi}".default = true; }
-    ];
-  }) [
-    (features_.libc."${deps."time"."0.1.40"."libc"}" deps)
-    (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps)
-    (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps)
-  ];
-
+# end
+# toml-0.4.8
 
   crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate {
     crateName = "toml";
@@ -1859,6 +1764,9 @@ rec {
   ];
 
 
+# end
+# ucd-util-0.1.1
+
   crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate {
     crateName = "ucd-util";
     version = "0.1.1";
@@ -1870,6 +1778,9 @@ rec {
   }) [];
 
 
+# end
+# unicode-width-0.1.5
+
   crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
     crateName = "unicode-width";
     version = "0.1.5";
@@ -1882,6 +1793,9 @@ rec {
   }) [];
 
 
+# end
+# unicode-xid-0.1.0
+
   crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate {
     crateName = "unicode-xid";
     version = "0.1.0";
@@ -1894,6 +1808,9 @@ rec {
   }) [];
 
 
+# end
+# utf8-ranges-1.0.1
+
   crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate {
     crateName = "utf8-ranges";
     version = "1.0.1";
@@ -1905,16 +1822,8 @@ rec {
   }) [];
 
 
-  crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate {
-    crateName = "vcpkg";
-    version = "0.2.6";
-    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
-    sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x";
-  };
-  features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec {
-    vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true);
-  }) [];
-
+# end
+# vec_map-0.8.1
 
   crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate {
     crateName = "vec_map";
@@ -1936,6 +1845,9 @@ rec {
   }) [];
 
 
+# end
+# version_check-0.1.5
+
   crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate {
     crateName = "version_check";
     version = "0.1.5";
@@ -1947,6 +1859,9 @@ rec {
   }) [];
 
 
+# end
+# winapi-0.3.6
+
   crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
     crateName = "winapi";
     version = "0.3.6";
@@ -1971,6 +1886,9 @@ rec {
   ];
 
 
+# end
+# winapi-i686-pc-windows-gnu-0.4.0
+
   crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-i686-pc-windows-gnu";
     version = "0.4.0";
@@ -1983,6 +1901,9 @@ rec {
   }) [];
 
 
+# end
+# winapi-util-0.1.1
+
   crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate {
     crateName = "winapi-util";
     version = "0.1.1";
@@ -2011,6 +1932,9 @@ rec {
   ];
 
 
+# end
+# winapi-x86_64-pc-windows-gnu-0.4.0
+
   crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-x86_64-pc-windows-gnu";
     version = "0.4.0";
@@ -2023,6 +1947,9 @@ rec {
   }) [];
 
 
+# end
+# wincolor-1.0.1
+
   crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate {
     crateName = "wincolor";
     version = "1.0.1";
@@ -2047,4 +1974,5 @@ rec {
   ];
 
 
+# end
 }

From db2cebbe7724e0c2eee91b6e03e06a2b5809e709 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 29 Nov 2018 17:22:02 -0500
Subject: [PATCH 010/199] pythonPackages.pywbem: 0.10.0 -> 0.12.6

---
 .../python-modules/pywbem/default.nix         |  77 +--
 .../make_cimdatetime_timezone_aware.patch     | 491 ------------------
 pkgs/top-level/python-packages.nix            |   3 +-
 3 files changed, 43 insertions(+), 528 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch

diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index 159e0ce15fb4..90a415060eb8 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,50 +1,57 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
-, m2crypto, ply, pyyaml, six
-, httpretty, lxml, mock, pytest, requests
+{ lib, buildPythonPackage, fetchPypi, libxml2
+, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37, python
+, httpretty, lxml, mock, pytest, requests, decorator, unittest2
 }:
 
 buildPythonPackage rec {
   pname = "pywbem";
-  version = "0.10.0";
+  version = "0.12.6";
 
-  src = fetchFromGitHub {
-    owner  = "pywbem";
-    repo   = "pywbem";
-    rev    = "v${version}";
-    sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
+  # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
+  disabled = isPy37;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dc6b745rrys600n05apdf6lb2vv5arlcwv7aiz9whgkbcd9qhki";
   };
 
-  patches = [
-    # fix timezone handling so the tests pass again. Can go when 0.10.1 is released
-    # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681
-    ./make_cimdatetime_timezone_aware.patch
+  propagatedBuildInputs = [
+    mock
+    pbr
+    ply
+    pyyaml
+    six
+  ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ];
+
+  checkInputs = [
+    decorator
+    httpretty
+    libxml2
+    lxml
+    pytest
+    requests
+    unittest2
   ];
 
-  propagatedBuildInputs = [ m2crypto ply pyyaml six ];
+  postPatch = ''
+    # Uses deprecated library yamlordereddictloader
+    rm testsuite/test_client.py
 
-  checkInputs = [ httpretty lxml mock pytest requests ];
-
-  # 1 test fails because it doesn't like running in our sandbox. Deleting the
-  # whole file is admittedly a little heavy-handed but at least the vast
-  # majority of tests are run.
-  checkPhase = ''
-    rm testsuite/testclient/networkerror.yaml
-
-    substituteInPlace makefile \
-      --replace "PYTHONPATH=." "" \
-      --replace '--cov $(package_name) --cov-config coveragerc' ""
-
-    for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
-      substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
-    done
-
-    make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
+    # Wants `wbemcli` in PATH
+    rm testsuite/test_wbemcli.py
+    
+    # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
+    rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
   '';
 
-  meta = with stdenv.lib; {
-    description = "Support for the WBEM standard for systems management.";
-    homepage = http://pywbem.github.io/pywbem/;
-    license = licenses.gpl2;
+  checkPhase = ''
+    pytest testsuite/
+  '';
+
+  meta = with lib; {
+    description = "Support for the WBEM standard for systems management";
+    homepage = https://pywbem.github.io;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ peterhoeg ];
   };
 }
diff --git a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch b/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
deleted file mode 100644
index 55fb9bbb12d7..000000000000
--- a/pkgs/development/python-modules/pywbem/make_cimdatetime_timezone_aware.patch
+++ /dev/null
@@ -1,491 +0,0 @@
-From bb7fa19d636d999bf844d80939e155b8f212ef3e Mon Sep 17 00:00:00 2001
-From: Andreas Maier <maiera@de.ibm.com>
-Date: Fri, 23 Jun 2017 19:13:51 +0200
-Subject: [PATCH] Made CIMDateTime always timezone-aware, re-enabled
- test_cim_types.py
-
-Details:
-- Ensured that 'CIMDateTime' objects for point in time values are
-  timezone-aware when supplied with a timezone-naive 'datetime'
-  object. This does not change the behavior, but increases code
-  clarity.
-- Clarified that in the documentation of 'CIMDateTime'.
-- Added testcases for CIMDateTime.
-- Re-enabled the testing of test_cim_types.py. Since its change
-  to using pytest it was not run because the test methods were
-  all static methods which apparently does not work. Not sure
-  this ever worked.
-
-Signed-off-by: Andreas Maier <maiera@de.ibm.com>
----
- docs/changes.rst            |   5 +
- pywbem/cim_types.py         |  22 +--
- testsuite/test_cim_types.py | 369 +++++++++++++++++++++++---------------------
- 3 files changed, 207 insertions(+), 189 deletions(-)
-
-diff --git a/docs/changes.rst b/docs/changes.rst
-index 272ed30d..6fdfbcf4 100644
---- a/docs/changes.rst
-+++ b/docs/changes.rst
-@@ -72,6 +72,11 @@ Enhancements
-
- * Added unit test for recorder. See issue #676
-
-+* Ensured that `CIMDateTime` objects for point in time values are
-+  timezone-aware when supplied with a timezone-naive `datetime` object.
-+  This does not change the behavior, but increases code clarity.
-+  Clarified that in the documentation of  `CIMDateTime`. See issue #698.
-+
- Bug fixes
- ^^^^^^^^^
-
-diff --git a/pywbem/cim_types.py b/pywbem/cim_types.py
-index 6d1f140c..5ecc7707 100644
---- a/pywbem/cim_types.py
-+++ b/pywbem/cim_types.py
-@@ -74,6 +74,7 @@
- import re
- import warnings
- import six
-+import copy
-
- from . import config
-
-@@ -294,9 +295,11 @@ def __init__(self, dtarg):
-             * A :term:`string` object will be
-               interpreted as CIM datetime format (see :term:`DSP0004`) and
-               will result in a point in time or a time interval.
--            * A :class:`py:datetime.datetime` object must be timezone-aware
--              (see :class:`~pywbem.MinutesFromUTC`) and will result in a point
--              in time.
-+            * A :class:`py:datetime.datetime` object will result in a point
-+              in time. If the :class:`py:datetime.datetime` object is
-+              timezone-aware (see :class:`~pywbem.MinutesFromUTC`), the
-+              specified timezone will be used. Otherwise, a default timezone
-+              of UTC will be assumed.
-             * A :class:`py:datetime.timedelta` object will result in a time
-               interval.
-             * Another :class:`~pywbem.CIMDateTime` object will be copied.
-@@ -342,14 +345,15 @@ def __init__(self, dtarg):
-                     raise ValueError('dtarg argument "%s" has an invalid CIM '
-                                      'datetime format' % dtarg)
-         elif isinstance(dtarg, datetime):
--            self.__datetime = dtarg
-+            if dtarg.tzinfo is None:
-+                self.__datetime = dtarg.replace(tzinfo=MinutesFromUTC(0))
-+            else:
-+                self.__datetime = copy.copy(dtarg)
-         elif isinstance(dtarg, timedelta):
--            self.__timedelta = dtarg
-+            self.__timedelta = copy.copy(dtarg)
-         elif isinstance(dtarg, CIMDateTime):
--            # pylint: disable=protected-access
--            self.__datetime = dtarg.__datetime
--            # pylint: disable=protected-access
--            self.__timedelta = dtarg.__timedelta
-+            self.__datetime = copy.copy(dtarg.datetime)
-+            self.__timedelta = copy.copy(dtarg.timedelta)
-         else:
-             raise TypeError('dtarg argument "%s" has an invalid type: %s '
-                             '(expected datetime, timedelta, string, or '
-diff --git a/testsuite/test_cim_types.py b/testsuite/test_cim_types.py
-index 4ae354d3..b1f54d06 100755
---- a/testsuite/test_cim_types.py
-+++ b/testsuite/test_cim_types.py
-@@ -43,105 +43,99 @@ def integer_tuple(request):
-     return request.param
-
-
--class TestIntegers:
--    """
--    Test CIM integer data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class(integer_tuple):
--        """Test class attrs via class level"""
--        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
--        assert obj_type.cimtype == exp_cimtype
--        assert obj_type.minvalue == exp_minvalue
--        assert obj_type.maxvalue == exp_maxvalue
--
--    @staticmethod
--    def test_class_attrs_inst(integer_tuple):
--        """Test class attrs via instance level"""
--        obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
--        obj = obj_type(42)
--        assert obj.cimtype == exp_cimtype
--        assert obj.minvalue == exp_minvalue
--        assert obj.maxvalue == exp_maxvalue
--
--    @staticmethod
--    def test_inheritance(integer_tuple):
--        """Test inheritance"""
--        obj_type = integer_tuple[0]
--        obj = obj_type(42)
--        assert isinstance(obj, obj_type)
--        assert isinstance(obj, CIMType)
--        assert isinstance(obj, CIMInt)
--        assert not isinstance(obj, CIMFloat)
--
--    @staticmethod
--    def test_init_int(integer_tuple):
--        """Test initialization from integer value"""
--        obj_type = integer_tuple[0]
--        obj = obj_type(42)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str(integer_tuple):
--        """Test initialization from string value"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('42')
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str_base10(integer_tuple):
--        """Test initialization from string value with base 10"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('42', 10)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_str_base16(integer_tuple):
--        """Test initialization from string value with base 16"""
--        obj_type = integer_tuple[0]
--        obj = obj_type('2A', 16)
--        assert obj == 42
--
--    @staticmethod
--    def test_init_minimum(integer_tuple):
--        """Test initialization from integer value at minimum"""
--        obj_type = integer_tuple[0]
--        exp_minvalue = integer_tuple[2]
--        obj = obj_type(exp_minvalue)
--        assert obj == exp_minvalue
--
--    @staticmethod
--    def test_init_maximum(integer_tuple):
--        """Test initialization from integer value at maximum"""
--        obj_type = integer_tuple[0]
--        exp_maxvalue = integer_tuple[3]
--        obj = obj_type(exp_maxvalue)
--        assert obj == exp_maxvalue
--
--    @staticmethod
--    def test_init_too_low(integer_tuple):
--        """Test initialization from integer value below minimum"""
--        obj_type = integer_tuple[0]
--        exp_minvalue = integer_tuple[2]
--        try:
--            obj_type(exp_minvalue - 1)
--        except ValueError:
--            pass
--        else:
--            raise AssertionError("ValueError was not raised.")
--
--    @staticmethod
--    def test_init_too_high(integer_tuple):
--        """Test initialization from integer value above maximum"""
--        obj_type = integer_tuple[0]
--        exp_maxvalue = integer_tuple[3]
--        try:
--            obj_type(exp_maxvalue + 1)
--        except ValueError:
--            pass
--        else:
--            raise AssertionError("ValueError was not raised.")
-+def test_integer_class_attrs_class(integer_tuple):
-+    """Test class attrs via class level"""
-+    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
-+    assert obj_type.cimtype == exp_cimtype
-+    assert obj_type.minvalue == exp_minvalue
-+    assert obj_type.maxvalue == exp_maxvalue
-+
-+
-+def test_integer_class_attrs_inst(integer_tuple):
-+    """Test class attrs via instance level"""
-+    obj_type, exp_cimtype, exp_minvalue, exp_maxvalue = integer_tuple
-+    obj = obj_type(42)
-+    assert obj.cimtype == exp_cimtype
-+    assert obj.minvalue == exp_minvalue
-+    assert obj.maxvalue == exp_maxvalue
-+
-+
-+def test_integer_inheritance(integer_tuple):
-+    """Test inheritance"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type(42)
-+    assert isinstance(obj, obj_type)
-+    assert isinstance(obj, CIMType)
-+    assert isinstance(obj, CIMInt)
-+    assert not isinstance(obj, CIMFloat)
-+
-+
-+def test_integer_init_int(integer_tuple):
-+    """Test initialization from integer value"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type(42)
-+    assert obj == 42
-+
-+
-+def test_integer_init_str(integer_tuple):
-+    """Test initialization from string value"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('42')
-+    assert obj == 42
-+
-+
-+def test_integer_init_str_base10(integer_tuple):
-+    """Test initialization from string value with base 10"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('42', 10)
-+    assert obj == 42
-+
-+
-+def test_integer_init_str_base16(integer_tuple):
-+    """Test initialization from string value with base 16"""
-+    obj_type = integer_tuple[0]
-+    obj = obj_type('2A', 16)
-+    assert obj == 42
-+
-+
-+def test_integer_init_minimum(integer_tuple):
-+    """Test initialization from integer value at minimum"""
-+    obj_type = integer_tuple[0]
-+    exp_minvalue = integer_tuple[2]
-+    obj = obj_type(exp_minvalue)
-+    assert obj == exp_minvalue
-+
-+
-+def test_integer_init_maximum(integer_tuple):
-+    """Test initialization from integer value at maximum"""
-+    obj_type = integer_tuple[0]
-+    exp_maxvalue = integer_tuple[3]
-+    obj = obj_type(exp_maxvalue)
-+    assert obj == exp_maxvalue
-+
-+
-+def test_integer_init_too_low(integer_tuple):
-+    """Test initialization from integer value below minimum"""
-+    obj_type = integer_tuple[0]
-+    exp_minvalue = integer_tuple[2]
-+    try:
-+        obj_type(exp_minvalue - 1)
-+    except ValueError:
-+        pass
-+    else:
-+        raise AssertionError("ValueError was not raised.")
-+
-+
-+def test_integer_init_too_high(integer_tuple):
-+    """Test initialization from integer value above maximum"""
-+    obj_type = integer_tuple[0]
-+    exp_maxvalue = integer_tuple[3]
-+    try:
-+        obj_type(exp_maxvalue + 1)
-+    except ValueError:
-+        pass
-+    else:
-+        raise AssertionError("ValueError was not raised.")
-
-
- #
-@@ -164,47 +158,41 @@ def real_tuple(request):
-     return request.param
-
-
--class TestReals:
--    """
--    Test CIM real data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class(real_tuple):
--        """Test class attrs via class level"""
--        obj_type, exp_cimtype = real_tuple
--        assert obj_type.cimtype == exp_cimtype
--
--    @staticmethod
--    def test_class_attrs_inst(real_tuple):
--        """Test class attrs via instance level"""
--        obj_type, exp_cimtype = real_tuple
--        obj = obj_type(42)
--        assert obj.cimtype == exp_cimtype
--
--    @staticmethod
--    def test_inheritance(real_tuple):
--        """Test inheritance"""
--        obj_type = real_tuple[0]
--        obj = obj_type(42)
--        assert isinstance(obj, obj_type)
--        assert isinstance(obj, CIMType)
--        assert isinstance(obj, CIMFloat)
--        assert not isinstance(obj, CIMInt)
--
--    @staticmethod
--    def test_init_float(real_tuple):
--        """Test initialization from floating point value"""
--        obj_type = real_tuple[0]
--        obj = obj_type(42.0)
--        assert obj == 42.0
--
--    @staticmethod
--    def test_init_str(real_tuple):
--        """Test initialization from string value"""
--        obj_type = real_tuple[0]
--        obj = obj_type('42.0')
--        assert obj == 42.0
-+def test_real_class_attrs_class(real_tuple):
-+    """Test class attrs via class level"""
-+    obj_type, exp_cimtype = real_tuple
-+    assert obj_type.cimtype == exp_cimtype
-+
-+
-+def test_real_class_attrs_inst(real_tuple):
-+    """Test class attrs via instance level"""
-+    obj_type, exp_cimtype = real_tuple
-+    obj = obj_type(42)
-+    assert obj.cimtype == exp_cimtype
-+
-+
-+def test_real_inheritance(real_tuple):
-+    """Test inheritance"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type(42)
-+    assert isinstance(obj, obj_type)
-+    assert isinstance(obj, CIMType)
-+    assert isinstance(obj, CIMFloat)
-+    assert not isinstance(obj, CIMInt)
-+
-+
-+def test_real_init_float(real_tuple):
-+    """Test initialization from floating point value"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type(42.0)
-+    assert obj == 42.0
-+
-+
-+def test_real_init_str(real_tuple):
-+    """Test initialization from string value"""
-+    obj_type = real_tuple[0]
-+    obj = obj_type('42.0')
-+    assert obj == 42.0
-
-
- #
-@@ -271,6 +259,26 @@ def test_init_str(real_tuple):
-         '20140924193040.654321+120'
-     ),
-     (
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        'timestamp',
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        None,
-+        0,
-+        '20140924193040.654321+000'
-+    ),
-+    (
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321),
-+        'timestamp',
-+        datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-+                 microsecond=654321, tzinfo=MinutesFromUTC(0)),
-+        None,
-+        0,
-+        '20140924193040.654321+000'
-+    ),
-+    (
-         '20140924193040.654321+120',
-         'timestamp',
-         datetime(year=2014, month=9, day=24, hour=19, minute=30, second=40,
-@@ -325,46 +333,47 @@ def datetime_init_tuple(request):
-     return request.param
-
-
--class TestDatetime:
--    """
--    Test CIM real data type classes.
--    """
--
--    @staticmethod
--    def test_class_attrs_class():
--        """Test class attrs via class level"""
--        assert CIMDateTime.cimtype == 'datetime'
--
--    @staticmethod
--    def test_class_attrs_inst():
--        """Test class attrs via instance level"""
--        obj = CIMDateTime('00000000000000.000000:000')
--        assert obj.cimtype == 'datetime'
--
--    @staticmethod
--    def test_inheritance():
--        """Test inheritance"""
--        obj = CIMDateTime('00000000000000.000000:000')
--        assert isinstance(obj, CIMDateTime)
--        assert isinstance(obj, CIMType)
--        assert not isinstance(obj, CIMFloat)
--        assert not isinstance(obj, CIMInt)
--
--    @staticmethod
--    def test_init(datetime_init_tuple):
--        """Test initialization from all input types"""
--        (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
--         exp_str) = datetime_init_tuple
--        try:
--            obj = CIMDateTime(dtarg)
--        except Exception as exc:
--            assert isinstance(exc, exp_kind)
--        else:
--            assert obj.is_interval == (exp_kind == 'interval')
--            assert obj.datetime == exp_datetime
--            assert obj.timedelta == exp_timedelta
--            assert obj.minutes_from_utc == exp_minutesfromutc
--            assert str(obj) == exp_str
-+def test_datetime_class_attrs_class():
-+    """Test class attrs via class level"""
-+    assert CIMDateTime.cimtype == 'datetime'
-+
-+
-+def test_datetime_class_attrs_inst():
-+    """Test class attrs via instance level"""
-+    obj = CIMDateTime('00000000000000.000000:000')
-+    assert obj.cimtype == 'datetime'
-+
-+
-+def test_datetime_inheritance():
-+    """Test inheritance"""
-+    obj = CIMDateTime('00000000000000.000000:000')
-+    assert isinstance(obj, CIMDateTime)
-+    assert isinstance(obj, CIMType)
-+    assert not isinstance(obj, CIMFloat)
-+    assert not isinstance(obj, CIMInt)
-+
-+
-+def test_datetime_init(datetime_init_tuple):
-+    """Test initialization from all input types"""
-+    (dtarg, exp_kind, exp_datetime, exp_timedelta, exp_minutesfromutc,
-+     exp_str) = datetime_init_tuple
-+    try:
-+        obj = CIMDateTime(dtarg)
-+    except Exception as exc:
-+        assert isinstance(exc, exp_kind)
-+    else:
-+        assert obj.is_interval == (exp_kind == 'interval')
-+        assert obj.datetime == exp_datetime
-+        if obj.datetime is not None:
-+            assert isinstance(obj.datetime, datetime)
-+            # We ensure that the datetime is always timezone-aware:
-+            assert obj.datetime.tzinfo is not None
-+        assert obj.timedelta == exp_timedelta
-+        if obj.timedelta is not None:
-+            assert isinstance(obj.timedelta, timedelta)
-+        assert obj.minutes_from_utc == exp_minutesfromutc
-+        assert str(obj) == exp_str
-+
-
- # TODO: Add testcases for get_local_utcoffset()
- # TODO: Add testcases for now()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f17e501e9ded..1812dcad7698 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4842,8 +4842,7 @@ in {
   ROPGadget = callPackage ../development/python-modules/ROPGadget { };
 
   # We need "normal" libxml2 and not the python package by the same name.
-  pywbem = disabledIf isPy36
-    (callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; });
+  pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
 
   unicorn = callPackage ../development/python-modules/unicorn { };
 

From 99512af9f5337e09f1bd9d88bc7ffe16c6affc00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 27 Nov 2018 15:25:01 +0100
Subject: [PATCH 011/199] balsa: use gtkspell3 instead of enchant

The build fails with enchant-1.6.1 and enchant2. use gtkspell instead.
---
 pkgs/applications/networking/mailreaders/balsa/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 571a48951477..8d9a685b444c 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
-  webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
+  webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
   libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection,
   hicolor-icon-theme, wrapGAppsHook
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     webkitgtk
     openssl
     libnotify
-    enchant
+    gtkspell3
     gpgme
     libcanberra-gtk3
     gtksourceview
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     "--with-ssl"
     "--with-unique"
     "--without-gnome"
+    "--with-spell-checker=gtkspell"
   ];
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

From 8d61b9d079de1460d9e1e73f73174bea30fd324d Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Fri, 30 Nov 2018 10:55:09 +0100
Subject: [PATCH 012/199] anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7

With recent switch to python 3.7 this was no longer building.

Upstream PR with the same patch: https://github.com/dae/anki/pull/266
---
 pkgs/games/anki/default.nix             |  5 +++--
 pkgs/games/anki/python-3.7-compat.patch | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/games/anki/python-3.7-compat.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index fb43640b2b12..c73afdd03934 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -25,7 +25,7 @@
 }:
 
 buildPythonApplication rec {
-    version = "2.1.6-beta1";
+    version = "2.1.6-beta2";
     name = "anki-${version}";
 
     src = fetchurl {
@@ -35,7 +35,7 @@ buildPythonApplication rec {
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "0yqn8qjx9dyf754jljhyyrk8mahii188nz0yifl1lr3py9sxzbsf";
+      sha256 = "0h71s1j1269x0b8481z8xf019caqglcjs32xlpzk72087ps169fa";
     };
 
     propagatedBuildInputs = [ pyqt5 sqlalchemy
@@ -53,6 +53,7 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
+      ./python-3.7-compat.patch
     ];
 
     buildPhase = ''
diff --git a/pkgs/games/anki/python-3.7-compat.patch b/pkgs/games/anki/python-3.7-compat.patch
new file mode 100644
index 000000000000..8545b39d08cb
--- /dev/null
+++ b/pkgs/games/anki/python-3.7-compat.patch
@@ -0,0 +1,23 @@
+commit 3d69aa9ce454a151ba75deafd7de117af2c7307d
+Author: Alexey Lebedeff <binarin@binarin.ru>
+Date:   Fri Nov 30 10:44:39 2018 +0100
+
+    Fix searching for python 3.7
+    
+    3.7 introduced a change to `re.escape()`, which no longer escapes
+    `%`. By using `re.escape("%")` instead of a literal, we can detect
+    a proper form at runtime.
+
+diff --git a/anki/find.py b/anki/find.py
+index 48d0dd1..213216d 100644
+--- a/anki/find.py
++++ b/anki/find.py
+@@ -440,7 +440,7 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
+             # nothing has that field
+             return
+         # gather nids
+-        regex = re.escape(val).replace("_", ".").replace("\\%", ".*")
++        regex = re.escape(val).replace("_", ".").replace(re.escape('%'), ".*")
+         nids = []
+         for (id,mid,flds) in self.col.db.execute("""
+ select id, mid, flds from notes

From 61bdaad9a9221f19a7c12d8b1b654e6e54d2be32 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 28 Nov 2018 22:10:15 -0500
Subject: [PATCH 013/199] sd-image: Slims the ext4 filesystem even more.

This is to try and squeeze more lost space from the image, so that hydra
starts building it again.

The fsck previous to the resize2fs is required so resize2fs works.

The one afterwards is a sanity check.

Using `-M` from resize2fs will not give much saved space due to a known
(in the manual) issue.

```
[samueldr@aarch64:~/nixpkgs]$ ls -lh result-*/*/*.img
-r--r--r-- 1 root root 2.2G Jan  1  1970 result-original/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 2.1G Jan  1  1970 result-M/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 1.9G Jan  1  1970 result-slimmed/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
```

```
[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-original
/nix/store/c8k9n78gylx293rjh762fr05a069kxp2-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3844125000

[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-slimmed
/nix/store/962238skj5mnzhrsmjy23dyzmxk77sp4-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3447473208
```
---
 nixos/lib/make-ext4-fs.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 88be8b73ab37..694142a5123a 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -94,5 +94,24 @@ pkgs.stdenv.mkDerivation {
         cat errorlog
         return 1
       fi
+
+      (
+        # Resizes **snugly** to its actual limits (or closer to)
+        free=$(dumpe2fs $out | grep '^Free blocks:')
+        blocksize=$(dumpe2fs $out | grep '^Block size:')
+        blocks=$(dumpe2fs $out | grep '^Block count:')
+        blocks=$((''${blocks##*:})) # format the number.
+        blocksize=$((''${blocksize##*:})) # format the number.
+        # System can't boot with 0 blocks free.
+        # Add 16MiB of free space
+        fudge=$(( 16 * 1024 * 1024 / blocksize ))
+        size=$(( blocks - ''${free##*:} + fudge ))
+
+        echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
+        EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
+      )
+
+      # And a final fsck, because of the previous truncating.
+      fsck.ext4 -n -f $out
     '';
 }

From 19bffeee70043b7e9f8f7287b632078c05996d35 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Sat, 1 Dec 2018 11:05:28 +0100
Subject: [PATCH 014/199] anki: Use `fetchpatch` for python compatibilty patch

---
 pkgs/games/anki/default.nix             | 12 +++++++++++-
 pkgs/games/anki/python-3.7-compat.patch | 23 -----------------------
 2 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/games/anki/python-3.7-compat.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c73afdd03934..3f837886116c 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -4,6 +4,7 @@
 , lib
 , python
 , fetchurl
+, fetchpatch
 , lame
 , mplayer
 , libpulseaudio
@@ -53,7 +54,16 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
-      ./python-3.7-compat.patch
+
+      # This is needed to fix python 3.7 compatibilty, where the
+      # behaviour of `re.escape()` was changed in a way that it no
+      # longer escapes `%`. This patch detects this difference at
+      # runtime and makes anki work with any python version.
+      # Upstream PR: https://github.com/dae/anki/pull/266
+      (fetchpatch {
+        url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
+        sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
+      })
     ];
 
     buildPhase = ''
diff --git a/pkgs/games/anki/python-3.7-compat.patch b/pkgs/games/anki/python-3.7-compat.patch
deleted file mode 100644
index 8545b39d08cb..000000000000
--- a/pkgs/games/anki/python-3.7-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 3d69aa9ce454a151ba75deafd7de117af2c7307d
-Author: Alexey Lebedeff <binarin@binarin.ru>
-Date:   Fri Nov 30 10:44:39 2018 +0100
-
-    Fix searching for python 3.7
-    
-    3.7 introduced a change to `re.escape()`, which no longer escapes
-    `%`. By using `re.escape("%")` instead of a literal, we can detect
-    a proper form at runtime.
-
-diff --git a/anki/find.py b/anki/find.py
-index 48d0dd1..213216d 100644
---- a/anki/find.py
-+++ b/anki/find.py
-@@ -440,7 +440,7 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
-             # nothing has that field
-             return
-         # gather nids
--        regex = re.escape(val).replace("_", ".").replace("\\%", ".*")
-+        regex = re.escape(val).replace("_", ".").replace(re.escape('%'), ".*")
-         nids = []
-         for (id,mid,flds) in self.col.db.execute("""
- select id, mid, flds from notes

From 7905c38c74a730951ec0a87ba45780e107f86cc5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Nov 2018 07:55:49 -0500
Subject: [PATCH 015/199] fedpkg: fix patch

---
 .../python-modules/fedpkg-buildfix.diff          | 14 --------------
 .../python-modules/fedpkg/default.nix            |  6 ++----
 .../python-modules/fedpkg/fix-paths.patch        | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fedpkg-buildfix.diff
 create mode 100644 pkgs/development/python-modules/fedpkg/fix-paths.patch

diff --git a/pkgs/development/python-modules/fedpkg-buildfix.diff b/pkgs/development/python-modules/fedpkg-buildfix.diff
deleted file mode 100644
index b9d46d7c7417..000000000000
--- a/pkgs/development/python-modules/fedpkg-buildfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py	2014-02-04 16:12:37.021993713 +0100
-+++ b/setup.py	2014-02-04 16:11:42.653995607 +0100
-@@ -13,8 +13,8 @@
-     package_dir = {'': 'src'},
-     packages = ['fedpkg'],
-     scripts = ['src/bin/fedpkg'],
--    data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
--                  ('/etc/rpkg', ['src/fedpkg.conf']),
--                  ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
-+    data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
-+                  ('etc/rpkg', ['src/fedpkg.conf']),
-+                  ('libexec/', ['src/fedpkg-fixbranches.py']),
-                  ]
- )
diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix
index 0230466e6e36..e23a3e4a0d6f 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/python-modules/fedpkg/default.nix
@@ -3,16 +3,14 @@
 buildPythonPackage rec {
   pname = "fedpkg";
   version = "1.29";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
+    url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
     sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
   };
-
-  #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+  patches = [ ./fix-paths.patch ];
   propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
 
   doCheck = false; # requires fedora_cert which isn't used anymore
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/python-modules/fedpkg/fix-paths.patch
new file mode 100644
index 000000000000..1831337a5851
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg/fix-paths.patch
@@ -0,0 +1,16 @@
+--- orig/setup.py
++++ new/setup.py
+@@ -27,10 +27,10 @@
+         'bin/fedpkg',
+         'bin/fedpkg-stage',
+     ],
+-    data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
+-                ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
++    data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
++                ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
+                                'conf/etc/rpkg/fedpkg-stage.conf']),
+-                ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
++                ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
+                 ],
+ 
+     tests_require=['nose', 'mock'],

From c220fe8e88b0869e2686de035f02585238e02228 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Dec 2018 10:59:34 -0500
Subject: [PATCH 016/199] fedpkg: promote to python application

---
 pkgs/development/{python-modules => tools}/fedpkg/default.nix | 4 ++--
 .../{python-modules => tools}/fedpkg/fix-paths.patch          | 0
 pkgs/top-level/all-packages.nix                               | 2 ++
 pkgs/top-level/python-packages.nix                            | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/{python-modules => tools}/fedpkg/default.nix (84%)
 rename pkgs/development/{python-modules => tools}/fedpkg/fix-paths.patch (100%)

diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
similarity index 84%
rename from pkgs/development/python-modules/fedpkg/default.nix
rename to pkgs/development/tools/fedpkg/default.nix
index e23a3e4a0d6f..7c82dc9d32aa 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+{ stdenv, buildPythonApplication, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "fedpkg";
   version = "1.29";
 
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/tools/fedpkg/fix-paths.patch
similarity index 100%
rename from pkgs/development/python-modules/fedpkg/fix-paths.patch
rename to pkgs/development/tools/fedpkg/fix-paths.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0ddf..7f0811fd4089 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8533,6 +8533,8 @@ with pkgs;
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };
 
+  fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
+
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be0cfdb6ce3c..2c1c772a7a25 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1655,8 +1655,6 @@ in {
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";
 
-  fedpkg = callPackage ../development/python-modules/fedpkg { };
-
   flit = callPackage ../development/python-modules/flit { };
 
   flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { };

From 2256273c6b453f626e7f4fd1317b9b332b45db6a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Dec 2018 17:09:05 -0500
Subject: [PATCH 017/199] fedpkg: add fedora_cert as dependency

[1: 1b9fd365819] Removed fedora_cert from nixpkgs, but fedpkg 1.29 still
it required at runtime.

1: 1b9fd36581951b8a8c51e6e1cc792c1589135717
   fedora_cert: remove package
---
 pkgs/development/tools/fedpkg/default.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix
index 7c82dc9d32aa..5548b20de83c 100644
--- a/pkgs/development/tools/fedpkg/default.nix
+++ b/pkgs/development/tools/fedpkg/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, buildPythonApplication, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }:
+{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
 
-buildPythonApplication rec {
+let
+  fedora_cert = buildPythonPackage rec {
+    name = "fedora-cert";
+    version = "0.6.0.2";
+    format = "other";
+
+    src = fetchurl {
+      url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2";
+      sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z";
+    };
+    propagatedBuildInputs = [ python_fedora pyopenssl ];
+    doCheck = false;
+  };
+in buildPythonApplication rec {
   pname = "fedpkg";
   version = "1.29";
 
@@ -11,9 +24,7 @@ buildPythonApplication rec {
     sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
   };
   patches = [ ./fix-paths.patch ];
-  propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
-
-  doCheck = false; # requires fedora_cert which isn't used anymore
+  propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ];
 
   meta = with stdenv.lib; {
     description = "Subclass of the rpkg project for dealing with rpm packaging";

From 35f6d1cda44842e07373824041feb2f27b3fa373 Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sat, 1 Dec 2018 19:51:49 +0100
Subject: [PATCH 018/199] loop: init at unstable-2018-10-02

---
 pkgs/tools/misc/loop/default.nix          | 24 +++++++++++++++++++++++
 pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ++++++++++++
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/misc/loop/default.nix
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
new file mode 100644
index 000000000000..f86f3041aba2
--- /dev/null
+++ b/pkgs/tools/misc/loop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "loop-unstable-2018-10-02";
+  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
+
+  src = fetchFromGitHub {
+    owner = "Miserlou";
+    repo  = "Loop";
+    rev   = version;
+    sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
+  };
+
+  cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
+
+  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+
+  meta = with stdenv.lib; {
+    description = "UNIX's missing `loop` command";
+    homepage = https://github.com/Miserlou/Loop;
+    maintainers = with maintainers; [ koral ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch
new file mode 100644
index 000000000000..f991a604f336
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_lock.patch
@@ -0,0 +1,12 @@
+diff --git a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+
+ [[package]]
+ name = "loop-rs"
+-version = "0.3.5"
++version = "0.4.0"
+ dependencies = [
+  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
new file mode 100644
index 000000000000..b95afac470f5
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_toml.patch
@@ -0,0 +1,18 @@
+diff --git a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -15,9 +15,9 @@ license = "MIT"
+-structopt = "0.2" 
++structopt = "0.2.10" 
+ humantime = "1.1.1"
+-atty = "0.2"
++atty = "0.2.11"
+-regex = "1.0.0"
++regex = "1.0.5"
+-subprocess = "0.1.12"
++subprocess = "0.1.14"
+-tempfile = "3.0.3"
++tempfile = "3.0.4"
+ 
+ [[bin]]
+ name = "loop"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719ff9a5d6b9..ca4312349ed4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22118,6 +22118,8 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
+  loop = callPackage ../tools/misc/loop { };
+
   mailcore2 = callPackage ../development/libraries/mailcore2 {
     icu = icu58;
   };

From 47f57712474944065d6bc562680400f159b58b1b Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sat, 1 Dec 2018 07:35:47 +0000
Subject: [PATCH 019/199] libtorrentRasterbar: 1.1.10 -> 1.1.11

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

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 6b5182fa992f..cd8192e34fb9 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.1.10";
+  version = "1.1.11";
   formattedVersion = lib.replaceChars ["."] ["_"] version;
 
   # Make sure we override python, so the correct version is chosen
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "libtorrent-${formattedVersion}";
-    sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms";
+    rev = "libtorrent_${formattedVersion}";
+    sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
   };
 
   enableParallelBuilding = true;

From 595c1e0a36ed6569676cdabc76c8784e76996ce9 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Sun, 2 Dec 2018 14:20:13 +0100
Subject: [PATCH 020/199] gitea: 1.5.3 -> 1.6.0

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.0
---
 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 8ee43dc16c1d..3af24ffe7596 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "1f8cbsd3kn4v2a6c57rwh9slgvss7gnxs96yhcy2ddwyycf6i04d";
+    sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''

From bf102825efa1deb8de1afca4ed7541c098f6b068 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Sun, 2 Dec 2018 15:24:17 +0100
Subject: [PATCH 021/199] nixos/containers: Add assertion for container name
 length

When privateNetwork is enabled, currently the container's interface name
is derived from the container name. However, there's a hard limit
on the size of interface names. To avoid conflicts and other issues,
we set a limit on the container name when privateNetwork is enabled.

Fixes #38509
---
 nixos/modules/virtualisation/containers.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 2fcc0f254256..fba69f7b42ba 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -457,6 +457,16 @@ in
                       { boot.isContainer = true;
                         networking.hostName = mkDefault name;
                         networking.useDHCP = false;
+                        assertions = [
+                          {
+                            assertion =  config.privateNetwork -> stringLength name < 12;
+                            message = ''
+                              Container name `${name}` is too long: When `privateNetwork` is enabled, container names can
+                              not be longer than 11 characters, because the container's interface name is derived from it.
+                              This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509
+                            '';
+                          }
+                        ];
                       };
                     in [ extraConfig ] ++ (map (x: x.value) defs);
                   prefix = [ "containers" name ];

From 22aac3b921c3856c7c64c1ff74a403e8281939bb Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 2 Dec 2018 19:24:49 +0100
Subject: [PATCH 022/199] all-packages.nix: Alias self to res, deprecating self

For historical reasons, self was ill-named. This removes its usages
from all-packages.nix and provides a deprecation message for those
who use a patched Nixpkgs.

Some packages seem to depend on the peculiarities of res, as can
be seen by making res into an alias of pkgs (normally "self").
The super variable doesn't have all that is needed.

Therefore the simple fix is not guaranteed to work and as such,
usages of res need to be changed to pkgs or super, case by case.
---
 pkgs/top-level/all-packages.nix | 95 +++++++++++++++++++--------------
 pkgs/top-level/stage.nix        |  2 +-
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c47fb0474483..4b9be0bcbeb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6,10 +6,23 @@
  * Hint: ### starts category names.
  */
 { lib, noSysDirs, config}:
-self: pkgs:
+res: pkgs: super:
 
 with pkgs;
 
+let
+  self =
+    builtins.trace ''
+        It seems that you are using a patched Nixpkgs that references the self
+        variable in pkgs/top-level/all-packages.nix. This variable was incorrectly
+        named, so its usage needs attention. Please use pkgs for packages or super
+        for functions.
+      ''
+      res; # Do *NOT* use res in your fork. It will be removed.
+
+  # TODO: turn self into an error
+
+in
 {
 
   # Allow callPackage to fill in the pkgs argument
@@ -813,7 +826,7 @@ with pkgs;
 
   androidsdk = androidenv.androidsdk_8_0;
 
-  androidsdk_extras = self.androidenv.androidsdk_8_0_extras;
+  androidsdk_extras = res.androidenv.androidsdk_8_0_extras;
 
   webos = recurseIntoAttrs {
     cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };
@@ -3532,7 +3545,7 @@ with pkgs;
 
   jid = callPackage ../development/tools/jid { };
 
-  jing = self.jing-trang;
+  jing = res.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
   jira-cli = callPackage ../development/tools/jira_cli { };
@@ -4825,23 +4838,23 @@ with pkgs;
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
-  pinentry_ncurses = self.pinentry.override {
+  pinentry_ncurses = res.pinentry.override {
     gtk2 = null;
   };
 
-  pinentry_emacs = self.pinentry.override {
+  pinentry_emacs = res.pinentry.override {
     enableEmacs = true;
   };
 
-  pinentry_gnome = self.pinentry.override {
+  pinentry_gnome = res.pinentry.override {
     gcr = gnome3.gcr;
   };
 
-  pinentry_qt4 = self.pinentry.override {
+  pinentry_qt4 = res.pinentry.override {
     qt = qt4;
   };
 
-  pinentry_qt5 = self.pinentry.override {
+  pinentry_qt5 = res.pinentry.override {
     qt = qt5.qtbase;
   };
 
@@ -8574,11 +8587,11 @@ with pkgs;
   gputils = callPackage ../development/tools/misc/gputils { };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
-  gradle = self.gradleGen.gradle_latest;
-  gradle_2_14 = self.gradleGen.gradle_2_14;
-  gradle_2_5 = self.gradleGen.gradle_2_5;
-  gradle_3_5 = self.gradleGen.gradle_3_5;
-  gradle_4_10 = self.gradleGen.gradle_4_10;
+  gradle = res.gradleGen.gradle_latest;
+  gradle_2_14 = res.gradleGen.gradle_2_14;
+  gradle_2_5 = res.gradleGen.gradle_2_5;
+  gradle_3_5 = res.gradleGen.gradle_3_5;
+  gradle_4_10 = res.gradleGen.gradle_4_10;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.
@@ -9059,7 +9072,7 @@ with pkgs;
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (darwin) xnu bootstrap_cmds cctools;
   };
-  valgrind-light = self.valgrind.override { gdb = null; };
+  valgrind-light = res.valgrind.override { gdb = null; };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
@@ -9645,7 +9658,7 @@ with pkgs;
     inherit (darwin) cf-private;
     inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
   };
-  fltk = self.fltk13;
+  fltk = res.fltk13;
 
   flyway = callPackage ../development/tools/flyway { };
 
@@ -9658,7 +9671,7 @@ with pkgs;
 
   freetts = callPackage ../development/libraries/freetts { };
 
-  frog = self.languageMachines.frog;
+  frog = res.languageMachines.frog;
 
   fstrcmp = callPackage ../development/libraries/fstrcmp { };
 
@@ -9726,11 +9739,11 @@ with pkgs;
   };
 
   gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   geoclue2 = callPackage ../development/libraries/geoclue {};
@@ -10128,7 +10141,7 @@ with pkgs;
   gumbo = callPackage ../development/libraries/gumbo { };
 
   gvfs = callPackage ../development/libraries/gvfs {
-    gnome = self.gnome3;
+    gnome = res.gnome3;
   };
 
   gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
@@ -11356,7 +11369,7 @@ with pkgs;
   libxml2 = callPackage ../development/libraries/libxml2 { };
 
   libxml2Python = pkgs.buildEnv { # slightly hacky
-    name = "libxml2+py-${self.libxml2.version}";
+    name = "libxml2+py-${res.libxml2.version}";
     paths = with libxml2; [ dev bin py ];
     inherit (libxml2) passthru;
     # the hook to find catalogs is hidden by buildEnv
@@ -11789,9 +11802,9 @@ with pkgs;
   };
 
   pcre = callPackage ../development/libraries/pcre { };
-  pcre16 = self.pcre.override { variant = "pcre16"; };
+  pcre16 = res.pcre.override { variant = "pcre16"; };
   # pcre32 seems unused
-  pcre-cpp = self.pcre.override { variant = "cpp"; };
+  pcre-cpp = res.pcre.override { variant = "cpp"; };
 
   pcre2 = callPackage ../development/libraries/pcre2 { };
 
@@ -12692,7 +12705,7 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6;
   });
 
-  v8_static = lowPrio (self.v8.override { static = true; });
+  v8_static = lowPrio (res.v8.override { static = true; });
 
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
 
@@ -15635,7 +15648,7 @@ with pkgs;
   inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
 
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
-    gtk = self.gtk2;
+    gtk = res.gtk2;
   };
 
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
@@ -15877,16 +15890,16 @@ with pkgs;
   libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
 
 
-  go-ethereum = self.altcoins.go-ethereum;
-  ethabi = self.altcoins.ethabi;
+  go-ethereum = res.altcoins.go-ethereum;
+  ethabi = res.altcoins.ethabi;
 
-  parity = self.altcoins.parity;
-  parity-beta = self.altcoins.parity-beta;
-  parity-ui = self.altcoins.parity-ui;
+  parity = res.altcoins.parity;
+  parity-beta = res.altcoins.parity-beta;
+  parity-ui = res.altcoins.parity-ui;
 
-  stellar-core = self.altcoins.stellar-core;
+  stellar-core = res.altcoins.stellar-core;
 
-  particl-core = self.altcoins.particl-core;
+  particl-core = res.altcoins.particl-core;
 
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
@@ -15981,7 +15994,7 @@ with pkgs;
   };
   bitwig-studio2 =  callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
     inherit (gnome3) zenity;
-    inherit (self) bitwig-studio1;
+    inherit (res) bitwig-studio1;
   };
   bitwig-studio = bitwig-studio2;
 
@@ -16661,7 +16674,7 @@ with pkgs;
   espeak-classic = callPackage ../applications/audio/espeak { };
 
   espeak-ng = callPackage ../applications/audio/espeak-ng { };
-  espeak = self.espeak-ng;
+  espeak = res.espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
@@ -16954,7 +16967,7 @@ with pkgs;
     inherit (pkgs.gnome3) defaultIconTheme;
   };
 
-  firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped {
+  firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
     browserName = "firefox";
     name = "firefox-beta-bin-" +
       (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version;
@@ -16969,7 +16982,7 @@ with pkgs;
     inherit (pkgs.gnome3) defaultIconTheme;
   };
 
-  firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped {
+  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
     browserName = "firefox";
     nameSuffix = "-devedition";
     name = "firefox-devedition-bin-" +
@@ -20860,7 +20873,7 @@ with pkgs;
 
   ut2004Packages = callPackage ../games/ut2004 { };
 
-  ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ];
+  ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
 
   vapor = callPackage ../games/vapor { love = love_0_8; };
 
@@ -20997,8 +21010,8 @@ with pkgs;
       # Included for backwards compatibility
       libsoup libwnck gtk-doc gnome-doc-utils;
 
-    gtk = self.gtk2;
-    gtkmm = self.gtkmm2;
+    gtk = res.gtk2;
+    gtkmm = res.gtkmm2;
   });
 
   gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
@@ -22051,7 +22064,7 @@ with pkgs;
 
   fakenes = callPackage ../misc/emulators/fakenes { };
 
-  faust = self.faust2;
+  faust = res.faust2;
 
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
@@ -22274,7 +22287,7 @@ with pkgs;
      parameter set to the right value for your deployment target.
   */
   nixos = configuration:
-    (import (self.path + "/nixos/lib/eval-config.nix") {
+    (import (res.path + "/nixos/lib/eval-config.nix") {
       inherit (pkgs.stdenv.hostPlatform) system;
       modules = [(
                   { lib, ... }: {
@@ -22553,7 +22566,7 @@ with pkgs;
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
   samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
   samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
-  samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17;
+  samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 1d412a6582cd..276350e56e60 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -91,7 +91,7 @@ let
   allPackages = self: super:
     let res = import ./all-packages.nix
       { inherit lib noSysDirs config; }
-      res self;
+      res self super;
     in res;
 
   aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);

From 15383e8403c311567ad516fe0f17a3dc4d0c1378 Mon Sep 17 00:00:00 2001
From: Julian Vassev <jvassev@gmail.com>
Date: Sun, 2 Dec 2018 15:37:56 -0800
Subject: [PATCH 023/199] vault: 0.11.2 -> 0.11.5

Update bash completion method as described in
https://www.vaultproject.io/docs/commands/#autocompletion
---
 pkgs/tools/security/vault/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 597047a679bb..84c35bd36a65 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
 
-let
-  # Deprecated since vault 0.8.2: use `vault -autocomplete-install` instead
-  # to install auto-complete for bash, zsh and fish
-  vaultBashCompletions = fetchFromGitHub {
-    owner = "iljaweis";
-    repo = "vault-bash-completion";
-    rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
-    sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.11.2";
+  version = "0.11.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa";
+    sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
@@ -39,7 +30,7 @@ in stdenv.mkDerivation rec {
     cp pkg/*/* $out/bin/
     find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
 
-    cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
+    echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
   '';
 
   meta = with stdenv.lib; {

From 6c22b5a1d786c4c2fdf009b87c83bb078237098b Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 3 Dec 2018 00:57:52 +0100
Subject: [PATCH 024/199] libnids: init at 1.24

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

diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix
new file mode 100644
index 000000000000..ef753127c67e
--- /dev/null
+++ b/pkgs/tools/networking/libnids/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, libpcap, glib, pkgconfig, libnet }:
+stdenv.mkDerivation {
+  pname = "libnids";
+  version = "1.24";
+  src = fetchzip {
+    url = "mirror://sourceforge/libnids/libnids-1.24.tar.gz";
+    sha256 = "1cblklfdfxcmy0an6xyyzx4l877xdawhjd28daqfsvrh81mb07k1";
+  };
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpcap glib libnet ];
+
+  /*
+  Quoting the documentation of glib: g_thread_init has been deprecated since
+  version 2.32 and should not be used in newly-written code.  This function is
+  no longer necessary. The GLib threading system is automatically initialized
+  at the start of your program.
+
+  this is necessary for dsniff to compile; otherwise g_thread_init is a missing
+  symbol when linking (?!?)
+  */
+  NIX_CFLAGS_COMPILE="-Dg_thread_init= ";
+
+  meta = with stdenv.lib; {
+    description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x";
+    homepage = http://libnids.sourceforge.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.symphorien ];
+    # probably also bsd and solaris
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a06111..6c58fa68abcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3959,6 +3959,8 @@ with pkgs;
 
   libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
 
+  libnids = callPackage ../tools/networking/libnids { };
+
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
   libmpack = callPackage ../development/libraries/libmpack { };

From 0a91d701340645d345594b8dd4223a756a722d3c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 3 Dec 2018 00:59:11 +0100
Subject: [PATCH 025/199] dsniff: init at 2.4b1

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

diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
new file mode 100644
index 000000000000..41acb533a3de
--- /dev/null
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl_1_1 }:
+let
+  /*
+  dsniff's build system unconditionnaly wants static libraries and does not
+  support multi output derivations. We do some overriding to give it
+  satisfaction.
+  */
+  staticdb = symlinkJoin {
+    inherit (db) name;
+    paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ];
+    postBuild = ''
+      rm $out/lib/*.so*
+    '';
+  };
+  pcap = symlinkJoin {
+    inherit (libpcap) name;
+    paths = [ libpcap ];
+    postBuild = ''
+      cp -rs $out/include/pcap $out/include/net
+      # prevent references to libpcap
+      rm $out/lib/*.so*
+    '';
+  };
+  net = symlinkJoin {
+    inherit (libnet) name;
+    paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ];
+    postBuild = ''
+      # prevent dynamic linking, now that we have a static library
+      rm $out/lib/*.so*
+    '';
+  };
+  nids = libnids.overrideAttrs(old: {
+    dontDisableStatic = true;
+  });
+  ssl = symlinkJoin {
+    inherit (openssl_1_1) name;
+    paths = with openssl_1_1.override { static = true; }; [ out dev ];
+  };
+in stdenv.mkDerivation {
+  pname = "dsniff";
+  version = "2.4b1";
+  # upstream is so old that nearly every distribution packages the beta version.
+  # Also, upstream only serves the latest version, so we use debian's sources.
+  # this way we can benefit the numerous debian patches to be able to build
+  # dsniff with recent libraries.
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "pkg-security-team";
+    repo = "dsniff";
+    rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/")
+    sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g";
+    name = "dsniff.tar.gz";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ glib pcap ];
+  NIX_CFLAGS_LINK = "-lglib-2.0";
+  postPatch = ''
+    for patch in debian/patches/*.patch; do
+      patch < $patch
+    done;
+  '';
+  configureFlags = [
+    "--with-db=${staticdb}"
+    "--with-libpcap=${pcap}"
+    "--with-libnet=${net}"
+    "--with-libnids=${nids}"
+    "--with-openssl=${ssl}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "collection of tools for network auditing and penetration testing";
+    longDescription = ''
+      dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI.
+    '';
+    homepage = https://www.monkey.org/~dugsong/dsniff/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.symphorien ];
+    # bsd and solaris should work as well
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c58fa68abcb..ecab87c027e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22975,6 +22975,8 @@ with pkgs;
     inherit (darwin) libresolv;
   };
 
+  dsniff = callPackage ../tools/networking/dsniff {};
+
   wal-g = callPackage ../tools/backup/wal-g {};
 
   tlwg = callPackage ../data/fonts/tlwg { };

From 7369c3a06d1e09dea7e93718429120c59c6179b8 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 2 Dec 2018 19:32:30 -0500
Subject: [PATCH 026/199] vscode-extensions.ms-python.python: 2018.10.1 ->
 2018.11.0

---
 pkgs/misc/vscode-extensions/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 39e1341e15e2..6860a0d2ad0b 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2018.10.1";
-    sha256 = "1j9nf09v31lmrjkxf7p1d78d064x6afzh0dvssmk3sjm2c5r432k";
+    version = "2018.11.0";
+    sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl";
   };
 
   postPatch = ''

From 70092febc4e66dfef7d545415e5e89baf13aab24 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 2 Dec 2018 19:34:22 -0500
Subject: [PATCH 027/199] vscode-extensions.WakaTime.vscode-wakatime: 1.2.3 ->
 1.2.4

---
 pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index fe7943dbefb3..48e7c9268ee6 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -7,8 +7,8 @@ in
     mktplcRef = {
       name = "vscode-wakatime";
       publisher = "WakaTime";
-      version = "1.2.3";
-      sha256 = "1n7bxkwgpip11k6d7zc3ifp9zb6p7f27f4x4g584wisrnfnqj1bp";
+      version = "1.2.4";
+      sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb";
     };
 
     postPatch = ''

From 53f1ffa4d3b47c0c30e67fd12ad47be1a74ac2cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 08:32:41 +0000
Subject: [PATCH 028/199] nix-review: 0.6.1 -> 1.0.1

- use nix build instead of nix-build
- writes per-build log in the current working directory
- symlinks the builds in the current working directory
- detects & deduplicates build aliases
- markdown reports
- filter builds by regex
- generate nix expression files that can be build by the user
---
 pkgs/tools/package-management/nix-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 2000bcb92d05..0409df7906c7 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "0.6.1";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "0ggw90zp40mms4hpphcn1vy1764rbvl2ix45h26v0wkn32cbqn49";
+    sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh";
   };
 
   makeWrapperArgs = [

From de23f0b9228af00aaa2ba29cab1ee0e863648b16 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 15 Nov 2018 23:10:00 +0100
Subject: [PATCH 029/199] iwd: 0.11 -> 0.12

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index a7a78be6a10b..acf28a1bca7a 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.14";
-     sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6";
+     rev = "0.15";
+     sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j";
+    sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn";
   };
 
   nativeBuildInputs = [
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
     "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
     "--with-systemd-unitdir=$(out)/lib/systemd/system/"
     "--localstatedir=/var/"
+    "--enable-wired"
   ];
 
   postUnpack = ''
@@ -59,6 +60,8 @@ in stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
+    substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
+                      --replace /bin/false ${coreutils}/bin/false
     substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
                       --replace /bin/false ${coreutils}/bin/false
   '';

From 57ec5d0edcd4bd89a9e152d88511dc89935423ef Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 3 Dec 2018 11:56:25 +0100
Subject: [PATCH 030/199] bloop: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 50b1d09ef933..c535740e5c82 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.0.0";
+  version = "1.1.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,7 +16,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
+    outputHash     = "090ig5k1bd3pv4i8x6byyf9wda1430xysnbcllflcz6cf2ccjy2k";
   };
 in
 stdenv.mkDerivation rec {

From d59498f653cdc00fad7116fa7160cc4efeba53c6 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 3 Dec 2018 09:44:39 +0100
Subject: [PATCH 031/199] vimPlugins: update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3f1147aa80e9..48a8a444db45 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -33,12 +33,12 @@
   };
 
   agda-vim = buildVimPluginFrom2Nix {
-    name = "agda-vim-2018-10-29";
+    name = "agda-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
-      rev = "75853188f15175728e938e1e69da8916148d7f7a";
-      sha256 = "1xv3il21fl602hilb3hk1r2bsbnf8brjyv61hprxsj8xd2s36a4d";
+      rev = "4fefe386a8a85161ace928e2f0e0ab4fe8581505";
+      sha256 = "1i61wvrpn15qs206rnq9bbwgv6wxf76p5j79v2fabh06lyw4dn3q";
     };
   };
 
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-10-31";
+    name = "ale-2018-11-30";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "4b841b55869e3ec5b02806f9b2fe962ffdca2750";
-      sha256 = "0wa8phv4b6n1akaii8qy9c0lr17vm4bqgz5chjx28zs73jfxsf2i";
+      rev = "1d4f98553852499e0f8ebd951db6ada2b1d973e3";
+      sha256 = "112i5722364xi8vsipwi9wvrxnzzvisfwbzwqmk01ag0lnlj2qg4";
     };
   };
 
@@ -113,12 +113,12 @@
   };
 
   base16-vim = buildVimPluginFrom2Nix {
-    name = "base16-vim-2018-10-08";
+    name = "base16-vim-2018-11-30";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
-      rev = "7e9af12d680d81cc1277c07ef5acee8c83828f3f";
-      sha256 = "1al00wf0bf61r0bfsfbq8g2qq8sbzj6z8c85787d3qfinvniz0cl";
+      rev = "2073e2dd9fa0172ccdba92b3f0df25642a69f7db";
+      sha256 = "1d6d2aca73rvhz7gpi2d1g2il9qy45pfw1kbrrqgvmik016i6l1y";
     };
   };
 
@@ -133,22 +133,22 @@
   };
 
   calendar-vim = buildVimPluginFrom2Nix {
-    name = "calendar-vim-2018-10-23";
+    name = "calendar-vim-2018-11-02";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "3c6a7677543824aab0eb9946d376fe5d45a935c5";
-      sha256 = "0jnk2hi9n1p7fqclifiyckrcady6fbkag6z29v7n6bbzhvz0qzzs";
+      rev = "8f6c29be2a20af974ff907876a4b6ba9581c346f";
+      sha256 = "14rvav878ya0a0j5jic9zap5r5ccwdhg26rypjnn8rqnkra2f99a";
     };
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-09-22";
+    name = "caw-vim-2018-11-07";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f";
-      sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4";
+      rev = "e186d64b6f5f8c39c15eb07f0e2798ce05d25fe3";
+      sha256 = "1wakgc5q2yj1gymn18ri660rwdwvrb1j5d6j8mr189gnhkr9isk4";
     };
   };
 
@@ -314,12 +314,12 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-10-28";
+    name = "ctrlp-vim-2018-11-22";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "5e40e555d31d9cce2188d9fa724d1debcad28aa6";
-      sha256 = "1skn8p527541w1kynk08dfpai2wlbmylw5sa4z2b7kmmnxa1lq47";
+      rev = "e953ee7a80dc96cd00c20ed6fe82e0e817d977ff";
+      sha256 = "1qnh4w9wb0r7lf5sw37kq29rq887hihga3cxw766mk8rwb2ad3kv";
     };
   };
 
@@ -344,12 +344,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-10-28";
+    name = "denite-nvim-2018-11-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "0a089bb122eb88e182420334a4f1df0c22917856";
-      sha256 = "1virb8lr591jbzmb91dhki32jx9g15a89dsxbh0vy9lcawaikypj";
+      rev = "db2d7c307e70a4575baea3097e0977b59696e855";
+      sha256 = "1l1ny781c1glqwkkhny5d80z186l485ixkwlshcyrmd8p8wnfb6m";
     };
   };
 
@@ -375,23 +375,23 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-10-20";
+    name = "deoplete-go-2018-11-23";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
-      rev = "8bb6d5f51ca825ef88d474c8aa9231692d6c2961";
-      sha256 = "15qwhkx24m7drahksrsvvpdzj9wpm0k1722ry6sdwgd40q8d3jrh";
+      rev = "75f3d42ef71a07c06778cab56e76b994a42a55c3";
+      sha256 = "1b42mcflc5fzi0fhgr99cyrdapbd79gcwgb4qnqg6b8bbn488kyv";
       fetchSubmodules = true;
     };
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-10-24";
+    name = "deoplete-jedi-2018-11-21";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "4ffb3a5ace39143813d63c7f78137bf8478b91e9";
-      sha256 = "1fik8snm6f7f337qidlkkhgri756rgyaswk3ndfiqw5vj673r4dw";
+      rev = "9d9796a53ae402e469fa5ea8766102ba40259230";
+      sha256 = "1dpczpzwvjlmszaia5i90bj4q62va3dckw6rjgy1j3lzj7w2izaf";
       fetchSubmodules = true;
     };
   };
@@ -417,83 +417,83 @@
   };
 
   deoplete-ternjs = buildVimPluginFrom2Nix {
-    name = "deoplete-ternjs-2018-06-05";
+    name = "deoplete-ternjs-2018-11-29";
     src = fetchFromGitHub {
       owner = "carlitux";
       repo = "deoplete-ternjs";
-      rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57";
-      sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i";
+      rev = "ebdc48ecd29f8cae0659e5cdd2c30bd869839ca8";
+      sha256 = "19zlgnavlqqq4rqwa1j1wglg921xdjhy8c71wfgh5492gmm1vr5x";
     };
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-10-28";
+    name = "deoplete-nvim-2018-11-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a2";
-      sha256 = "1ixjrf1rrdznfprd9w5fx86k0ni67c9amgvwwbbzhqz3i1zgwc3g";
+      rev = "acae3732524443ecb53af2f4c8078af47381a180";
+      sha256 = "0qm0plgri6bf4bm6mvhqkpl075gdr03n5939vi99v4wy3iymh5w5";
     };
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-10-25";
+    name = "dhall-vim-2018-12-02";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "aac9deeb695c810fee8a702fc5fca99a26f1d4bd";
-      sha256 = "17avn55dixv0rxhc3jzpnadkvldrbq7r81nwgnzi4xlr3fjxjwfc";
+      rev = "caec6efbfc537f1a3a7bf6c5b0f6ab9cffa6911c";
+      sha256 = "0r9jd6pq94sjrsppa1avm4x01y01m9vv64p89l32vrpkrczgxgfa";
     };
   };
 
   direnv-vim = buildVimPluginFrom2Nix {
-    name = "direnv-vim-2017-12-29";
+    name = "direnv-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "direnv";
       repo = "direnv.vim";
-      rev = "4d6271f0facd57a478c0d02895775dc01f577c5c";
-      sha256 = "1vfg4hrxbqc96w694cn9gzjvwkscd111fp6dqlh7wpd2z3ciw07h";
+      rev = "f93eac061ce211d701e2269418d7e55dc6bab5ca";
+      sha256 = "1nfizxzscyq8rqln3hfj648vzavlisgnjay2m6gnd29lnymqrr8l";
     };
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-10-20";
+    name = "echodoc-vim-2018-11-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "3fa121e0a0abee0762867a01b25f4e891594da6e";
-      sha256 = "17qckl9x1yd70zxgwvpkh5nwx8zs5f6d8xismd0rbpigd08qd06q";
+      rev = "1cad58aed10e999b64008fed12401d5919552863";
+      sha256 = "15ndcaypw10jrdmscgrh969lrhb6jhh43d6a4ymam16ljg5590z2";
     };
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
-    name = "editorconfig-vim-2018-10-14";
+    name = "editorconfig-vim-2018-11-15";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "736451ae203c5e3bcce39f1be11d68009b783d82";
-      sha256 = "01j2y02z23ylydkm7yij2m9nimk54m06ik2hyldj99yz8qi5vp18";
+      rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3";
+      sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza";
       fetchSubmodules = true;
     };
   };
 
   elm-vim = buildVimPluginFrom2Nix {
-    name = "elm-vim-2018-06-18";
+    name = "elm-vim-2018-11-13";
     src = fetchFromGitHub {
       owner = "elmcast";
       repo = "elm-vim";
-      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
-      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
+      rev = "d22c0ba13afb554257a8c176962e2216cc18edd1";
+      sha256 = "03lmbv4zkjdnyzrna7g9pqdgf3jqhi9g59fzjnay4af59hijs1v3";
     };
   };
 
   emmet-vim = buildVimPluginFrom2Nix {
-    name = "emmet-vim-2018-10-06";
+    name = "emmet-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
-      rev = "7a4bf3463ef1e2c08393218fc67a8729c00948a5";
-      sha256 = "15y5h7b6ll7nngaq9i44xb88rw2jg5ahbvybdn7kdf0nq1m3z409";
+      rev = "e6fb10d22a9bd2a02c386c81486a065e71c6a92d";
+      sha256 = "0fadqgvirmdl1acb39v05q2sw24fc40w4bcj05f4maj4lqbxkwqv";
       fetchSubmodules = true;
     };
   };
@@ -509,12 +509,12 @@
   };
 
   falcon = buildVimPluginFrom2Nix {
-    name = "falcon-2018-09-15";
+    name = "falcon-2018-11-30";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "0dbdbf568321bc29ac143370d1b75dc651fd083f";
-      sha256 = "0scds1fc433qcnghxplczama83w65iza9dhq3qnyhr085hyisck3";
+      rev = "070f2132266d85059f36496ed277527d5b8f00a1";
+      sha256 = "0jzibr1k0l4kbhlg7398fln6rmpwayjbj0hpy4v84gr51pa2di5r";
     };
   };
 
@@ -580,12 +580,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-10-22";
+    name = "fzf-vim-2018-11-27";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "50707b089b1c61fcdb300ec1ecbc4249ead4af11";
-      sha256 = "1h0x701jcj2zwyzaxlzzfax3z8jxrn255wawxcjw9fskz9kldd68";
+      rev = "95f025ef2dbc8fedf124521904a80c1879acd359";
+      sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc";
     };
   };
 
@@ -600,22 +600,22 @@
   };
 
   gist-vim = buildVimPluginFrom2Nix {
-    name = "gist-vim-2016-10-10";
+    name = "gist-vim-2018-11-09";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "gist-vim";
-      rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
-      sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
+      rev = "3abf2444bb6a7744a64b4a2c2b02d6761a7de072";
+      sha256 = "197j6bhyfggxka9mycyk3mr6sawf7rnaz74csk47d2qlkfs4zf0v";
     };
   };
 
   gitv = buildVimPluginFrom2Nix {
-    name = "gitv-2018-06-10";
+    name = "gitv-2018-11-24";
     src = fetchFromGitHub {
       owner = "gregsexton";
       repo = "gitv";
-      rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
-      sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
+      rev = "38daefcbb4375f79396c81860f077264fe9a3ae4";
+      sha256 = "19v1v1wb1shh50if1jgiqy4bvja1lv6zy1fald3c48zl9303x8gq";
     };
   };
 
@@ -750,33 +750,33 @@
   };
 
   jedi-vim = buildVimPluginFrom2Nix {
-    name = "jedi-vim-2018-10-14";
+    name = "jedi-vim-2018-11-08";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "b6dfc5fd49c26d4dbe9f54c814956567a7a9b3a8";
-      sha256 = "11wvynjl1m23vdp4wvirhmm7vnpji5affbyhwz67yjkvh6c42xqa";
+      rev = "2f65c636f83139b9982b1c1c90cb7f34915ad815";
+      sha256 = "02sdgczj7r19xvni1xd7kf3rhibxx36zsca42wjb605s6qgmkvph";
       fetchSubmodules = true;
     };
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    name = "Jenkinsfile-vim-syntax-2018-09-25";
+    name = "Jenkinsfile-vim-syntax-2018-11-25";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
-      rev = "030cd312f7de1786bb5a1f392fa59f7a105054df";
-      sha256 = "17lw8rd2fhybwkhrz8lg1p7b552ki669kr2wlpjb6agkgaiifj8q";
+      rev = "57c50f21de4a710d7f1c1e50d7ecc7e8d5301cec";
+      sha256 = "0my1zpw5g2bjyx0d027a8klys7kgqg51n9pi773bhk0smqwmfp2b";
     };
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-10-21";
+    name = "julia-vim-2018-11-23";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "934618a71bcf64ff0fb94780dc1aefa58e81470a";
-      sha256 = "1pw4snax7ibxhd8xff41lb86vk7a38yrcq85p89sis6nln6larq5";
+      rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d";
+      sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka";
     };
   };
 
@@ -801,12 +801,12 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-09-17";
+    name = "lightline-vim-2018-11-24";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "47765c787ddc981c2eab6105ade84067d164893c";
-      sha256 = "1r5xpss99jfkvc5dngg877dhmirwnrwppql7ysbab50wfx4hv5c6";
+      rev = "688240e0ef849cdc8457822658cedf10358c75d6";
+      sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv";
     };
   };
 
@@ -861,12 +861,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-10-15";
+    name = "ncm2-2018-11-17";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "4aaf9e1e313109d32fd2b64a5299416357d901b2";
-      sha256 = "09rg3pa0yirhsn1x558k3bzh6fyy4whnfqlm89wvmzxw6rm8xnpw";
+      rev = "07aaaaa143a1dff32c2fbc967f4bc574cf40cb03";
+      sha256 = "1vi6dprwzrknnmqxp47hacc9gaa9bafdzm5ihs09yg3rwi0drjbl";
     };
   };
 
@@ -921,12 +921,12 @@
   };
 
   neco-look = buildVimPluginFrom2Nix {
-    name = "neco-look-2018-01-21";
+    name = "neco-look-2018-11-09";
     src = fetchFromGitHub {
       owner = "ujihisa";
       repo = "neco-look";
-      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
-      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
+      rev = "8c3951acb93b72dda4572859928ef7b372485596";
+      sha256 = "1gd692yc1x3753rxg58hwc7nwmm4rjr03y1xaczy1qahq1bm9a40";
     };
   };
 
@@ -951,12 +951,12 @@
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix {
-    name = "neocomplete-vim-2018-03-28";
+    name = "neocomplete-vim-2018-11-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neocomplete.vim";
-      rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
-      sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
+      rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40";
+      sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq";
     };
   };
 
@@ -991,22 +991,22 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-10-29";
+    name = "neomake-2018-12-02";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "c15d51ea9f622b8bce469a18833a6ac64f6a1193";
-      sha256 = "1l15y0di6k4v0vrwpd86lp2n5ljfjnzncgpxwmbhqb2xznr7caq7";
+      rev = "bbdd0847ef06e3a1b7fe9ea2bec8dd9fbd9068f7";
+      sha256 = "17l15i9zgwv7m802k4zpv53116zbg0fsl6kqy83aql2xn8yr1amy";
     };
   };
 
   neomru-vim = buildVimPluginFrom2Nix {
-    name = "neomru-vim-2017-10-01";
+    name = "neomru-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
-      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
-      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
+      rev = "0126deb4d38b497e3c81e5226b275392c1dbce3a";
+      sha256 = "048avhjld8nwdvxcvxnwrbfyps4ialq8zbjmaj6qg06327wbwk89";
     };
   };
 
@@ -1021,22 +1021,22 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-10-23";
+    name = "neosnippet-vim-2018-11-10";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "32583e605ebe96bba805bdf0d526b951345c8b3e";
-      sha256 = "105jnnw35ffxwx6zqazh6rizwqdndqc3n656xhljfng33c0lr5mk";
+      rev = "9f87934708db75cfafd3ec957c11cfe190281c5f";
+      sha256 = "03frmqsxw047j4im2gacr8xiarck6dwpp32b0hza39bmsimc09m7";
     };
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-10-17";
+    name = "neoyank-vim-2018-11-08";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
-      rev = "ba337d80769c4f2f19c04df4349a196f52fe5094";
-      sha256 = "0sq595xlijz6xsil2z21kf4662cvmzzm6bsvysfz43wgl16dd5s6";
+      rev = "ecce36986f02358bd4377c52a61bfebe0287fce0";
+      sha256 = "0pf82pb3mm2pgi6nc6s3a3jzlfgi7c80qr9x7bc6ddzkhw1v92jn";
     };
   };
 
@@ -1051,22 +1051,22 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-10-31";
+    name = "nerdtree-2018-11-29";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "8d005db94f8d1a214d172aeb1008d016c3d201e2";
-      sha256 = "0f8dljl45ph668kwjf0py0891i3aqfdijplarxnblbkp2zn5ij7g";
+      rev = "c905a5d7b87051e574c2e72fae57e56c456ba2f4";
+      sha256 = "178nv2jbxn7a8m1amy075m1iwif9bnj9cfz278rzj7i5fr50gqp8";
     };
   };
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
-    name = "nerdtree-git-plugin-2017-03-12";
+    name = "nerdtree-git-plugin-2018-11-15";
     src = fetchFromGitHub {
       owner = "albfan";
       repo = "nerdtree-git-plugin";
-      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
-      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+      rev = "8931d911fac1b5958ef084accee43c03a8c72485";
+      sha256 = "1yv465afdf9wm65q335mx816wxmg1zzwj4gls2hsbxqymzm3l6br";
     };
   };
 
@@ -1111,12 +1111,12 @@
   };
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
-    name = "nvimdev-nvim-2018-10-05";
+    name = "nvimdev-nvim-2018-11-07";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "ef05db6817d8083f8daf9ddd99b79acc364d57a6";
-      sha256 = "1c44pwsjllhcmlabz9pc9qb5p6lgilfzdsx4rcjc8q8ixijc7w99";
+      rev = "2acfca2a9a55fd66a235cf2e6f602ba1d46add25";
+      sha256 = "164pmlnqkrbffkcx5fha40w75dq1ydx5226shrghwp9ag9kwdvav";
     };
   };
 
@@ -1131,12 +1131,12 @@
   };
 
   open-browser-vim = buildVimPluginFrom2Nix {
-    name = "open-browser-vim-2018-04-26";
+    name = "open-browser-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
-      rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
-      sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
+      rev = "b900ff9d39bb36891704bd0fe76737ee3a7ac2b9";
+      sha256 = "1sws0pzm13cgl7mf6938xjmh23hk02agf23zfx5rdb4d2lcn4ir3";
     };
   };
 
@@ -1261,12 +1261,12 @@
   };
 
   ranger-vim = buildVimPluginFrom2Nix {
-    name = "ranger-vim-2018-09-13";
+    name = "ranger-vim-2018-11-30";
     src = fetchFromGitHub {
       owner = "rafaqz";
       repo = "ranger.vim";
-      rev = "63e22fd424107579aaf782f3b2c83d76a691fdeb";
-      sha256 = "1337il7j45ydb432qnmaqcz8bigwny752nrl6c2vsc0qv3xd11ls";
+      rev = "9ba30ca2f219bc0eaa02102573de8f8ba33078f2";
+      sha256 = "0dccb5rsvazqlxiqcwxb8w4093j9c2klgd30d90nf7vaz40a4988";
     };
   };
 
@@ -1321,12 +1321,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-10-26";
+    name = "rust-vim-2018-11-29";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "039b7c7c4f0b9fec9879027d6700229c33daae3e";
-      sha256 = "09g9q91qvbrrb2hrybdw6p8jm3q3v9j9yffpm9q0nz6g8p6zi8xq";
+      rev = "fabad27559c5bde02e0f0a855d07d9dda9aef9a9";
+      sha256 = "0b05hn75ahhk2yz5mgjn2vr68391f53cdfdrav23zx0jfqibd4vf";
     };
   };
 
@@ -1421,12 +1421,12 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-10-18";
+    name = "syntastic-2018-11-24";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
-      rev = "89e485c7f8b1f285b43bb397394f22b79021aac1";
-      sha256 = "0xy54pllpr2bn1wp2fhq5nwrjpcclp61mhzls99cbzzpxfiwirlz";
+      rev = "0d25f4fb4203e600a28e776847d4beca254d3f84";
+      sha256 = "1c3icnpbl7wrgqs67dc1pl7942za01mhsl7fwrcb0njwqkhmkamp";
     };
   };
 
@@ -1481,12 +1481,12 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-10-24";
+    name = "targets-vim-2018-11-01";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
-      rev = "19586689fab6f1ff81743a675645f62adf745b0b";
-      sha256 = "0bvx3dynbsralywkhsi9yjr188ayczp263di3y00dzwymxh7m1p5";
+      rev = "4a5e9c09ec2ba63c8cd16b433453e41c22efab22";
+      sha256 = "1fi1mrbqk23i6vrm9i0y9b7hdvg90fpk3gr36lr7mmpqf3p902aj";
     };
   };
 
@@ -1591,42 +1591,42 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-09-26";
+    name = "unite-vim-2018-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
-      rev = "e68ccde4192b3faa3717897e65dc7dd8ab87524a";
-      sha256 = "1r22lwzs92ylzl0hs0ny36vr787jwkf65da9dv0zvz2p5ank5ykw";
+      rev = "77ae78f277896bc560a46a27a51c49f04b6d4ce1";
+      sha256 = "06asqf2hkszz4i9c676jvax6gbqzrcpqckjjb0dy175vifsiclnv";
     };
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-10-22";
+    name = "verilog_systemverilog-vim-2018-11-18";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "4809e36569363bc3b44c981cda842d5bb31e95ff";
-      sha256 = "124ak7596b19rz4vk2f05z6wkfhfrlawlz0y4am8fm4y1mdxsprm";
+      rev = "c1d30130cdf3420fa9043e4b875a63eebb868f02";
+      sha256 = "1hrlzqmpyvjciczcijaag53ms1wn4i2f10irjlm0c3wynsxx9khp";
     };
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-10-30";
+    name = "vim-2018-11-25";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "66755a9cb9bdea62720812a1165132de6ff62468";
-      sha256 = "0zca3spgnf00rxa0h5x79ydycz41b0xli7bgwpnbxannzxqswhiy";
+      rev = "f24e259073994b4f76d125332954d26748fcc581";
+      sha256 = "13xpw4b75ws5h2s5x2rahz39sl13pzz7h4yv3lq6azw9m2msy0v6";
     };
   };
 
   vim-abolish = buildVimPluginFrom2Nix {
-    name = "vim-abolish-2018-10-25";
+    name = "vim-abolish-2018-11-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "56a76a8c10ca91f3e8f0a2cd9afa2be32d262e24";
-      sha256 = "087l7mvb0rzcdfmrmng82s0abli6w2i4cbyiwps9k588sfcj0w7h";
+      rev = "b95463a1cffd8fc9aff2a1ff0ae9327944948699";
+      sha256 = "1cvhylz6hgvl63zhlrxqrjqqp07pm29i436xv33dzzhdp8dcj1mp";
     };
   };
 
@@ -1821,22 +1821,22 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-11-01";
+    name = "vim-airline-2018-11-22";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "6516b1b4dccef543d489177431050fe8a5c5c99c";
-      sha256 = "0x4vdxz31vqyd3qy8vr4gcdc649nz72axris5fxj8ln5zphlr6ll";
+      rev = "bd468dacfe874fd669ec69522b550d3e1371cf56";
+      sha256 = "0a92a42xnx0rif7r85mrp7jhzmlnbaiqafpc8bn1848bbq9wg880";
     };
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
-    name = "vim-airline-themes-2018-10-25";
+    name = "vim-airline-themes-2018-11-15";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "65217b41da31f05d305b819f2a42a803dd0db434";
-      sha256 = "1pv9plmbmygcnkbkdjp7gr3rp42zdh4qkmv2cfbndhdfx4yd331g";
+      rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9";
+      sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8";
     };
   };
 
@@ -1921,12 +1921,12 @@
   };
 
   vim-closetag = buildVimPluginFrom2Nix {
-    name = "vim-closetag-2018-09-03";
+    name = "vim-closetag-2018-11-07";
     src = fetchFromGitHub {
       owner = "alvan";
       repo = "vim-closetag";
-      rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb";
-      sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy";
+      rev = "6fe822a730d4a5774ce6ffbb3bd88062e18ada9a";
+      sha256 = "1pa0dpb6d20acvlkgpcjb358m658q23666m567lvs849bjzsdlwp";
     };
   };
 
@@ -1971,12 +1971,12 @@
   };
 
   vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "vim-colorschemes-2017-08-22";
+    name = "vim-colorschemes-2018-11-20";
     src = fetchFromGitHub {
       owner = "flazz";
       repo = "vim-colorschemes";
-      rev = "eab315701f4627967fd62582eefc4e37a3745786";
-      sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
+      rev = "2f532d0564534accf09cecfa9a1e3639865367ee";
+      sha256 = "0d96slqnnn1vahzham3syd904rk2iwn9py4brzas9x09k1qw2gb3";
     };
   };
 
@@ -2001,12 +2001,12 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-10-20";
+    name = "vim-css-color-2018-11-20";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "0ee02ec9753c74d356106f0a0c4ddb0dcf9705f0";
-      sha256 = "1fqngj2a4ky4z96vjryjfkblnr50jw99cfzc7xsjjpdy8j7wvrfk";
+      rev = "8d640e4c5d89dde55ef79d43fee1c8ecd12495b9";
+      sha256 = "17lmdvxnp1y6wvzfzv9yk962ixc549jc80g0zc820734dp27x0l3";
     };
   };
 
@@ -2051,12 +2051,12 @@
   };
 
   vim-dirvish = buildVimPluginFrom2Nix {
-    name = "vim-dirvish-2018-06-20";
+    name = "vim-dirvish-2018-11-15";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "c273c462d774ed2db5f6d382265cf5897e554de0";
-      sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d";
+      rev = "ba3be081de598878edf9624f5c4cb06961b6e842";
+      sha256 = "1bcwj0w5v67mba4m4abmcxncawxz6dpflz34flpcn8869rsghbgv";
     };
   };
 
@@ -2211,22 +2211,22 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-10-28";
+    name = "vim-fugitive-2018-11-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a";
-      sha256 = "1ma9zxqf0ybl6y6qd9wjp97lgrwvgzpqy5zca0c6da29gm03kb02";
+      rev = "2564c37d0a2ade327d6381fef42d84d9fad1d057";
+      sha256 = "1bwqyl644wv26ys27hxj9wx57mfp1090cmp7acd7inbxypd0bgdb";
     };
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-10-05";
+    name = "vim-ghost-2018-11-28";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "8a3acdde943688d52407b5da08988dfc528ea10c";
-      sha256 = "0x7mgziyx8gs5cc37c4rm0hrzgzpg4klnkfviyj2k3h4qqj9hkaj";
+      rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa";
+      sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw";
     };
   };
 
@@ -2251,12 +2251,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-10-18";
+    name = "vim-gitgutter-2018-11-26";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "0597380f6b22f43a3ea6ff8364d5c239bb2504ea";
-      sha256 = "18v4y616q29al2lx62gkcv5q9ka8042dk8y6i9b5jmyjfwps0q53";
+      rev = "c2651aefbd92dca05de1943619df965b848f9b4f";
+      sha256 = "1wsmmym3l3r57r8s972iflv1pcsidk8yjb9w4y2rh7dbgf6rkbqr";
     };
   };
 
@@ -2271,12 +2271,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-10-23";
+    name = "vim-go-2018-12-01";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "d5ce080c25806d68189be641e19996898138f1a4";
-      sha256 = "09kq1zjq98vzy8gjgxiqkb7ibl3wpjz8lkzqjm110axxmx01b317";
+      rev = "3577e475ac6f1089e0a32d2921989a4279e9867b";
+      sha256 = "10i3jzwp0rgdyyzmkdvpxfxq2i1dk3hdcxanbi4gm0xh8zs1c0h2";
     };
   };
 
@@ -2291,22 +2291,22 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-10-30";
+    name = "vim-grepper-2018-11-08";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "a55a14b97dc8ac848eeb95e71d095b75197ba665";
-      sha256 = "08p5dp43z9bxllr5fvl3hgnyqyxlvpbfczw1ydncmzvrqqccrx08";
+      rev = "4a47e20c98eee758b905a2cd7ca29f433c08e7e7";
+      sha256 = "14lwf5fmpqd0d6gywld6jmvis1r73i9ib4zlxlb3xkzx6di8kp5a";
     };
   };
 
   vim-gutentags = buildVimPluginFrom2Nix {
-    name = "vim-gutentags-2018-06-13";
+    name = "vim-gutentags-2018-11-17";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
-      rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e";
-      sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4";
+      rev = "93616e4c0ccfafe52ae329c7dd220d7b5c7d5f80";
+      sha256 = "12qcf34fxgzsilx1wkh219avvkq7a5q9x3kdcqy3ai8g05fpx619";
     };
   };
 
@@ -2341,12 +2341,12 @@
   };
 
   vim-hdevtools = buildVimPluginFrom2Nix {
-    name = "vim-hdevtools-2017-03-11";
+    name = "vim-hdevtools-2018-11-19";
     src = fetchFromGitHub {
       owner = "bitc";
       repo = "vim-hdevtools";
-      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
-      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
+      rev = "ab33578bbdbcbd80050faf43e4adee1653fe34dc";
+      sha256 = "1xvjz6yidcywn1xmdqlxsz68lmkx6rmiqf6q2gfz56pzq1mfmski";
     };
   };
 
@@ -2471,12 +2471,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-10-09";
+    name = "vim-javacomplete2-2018-11-14";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "a3af9721afcd3ce8972dd4ab0f40da947245c2fa";
-      sha256 = "0pgfgf82dv0dys2d4dq48d0n4gnbmxbqpvsy3fwmqdrw9zn9bw79";
+      rev = "cc9eb84b43b455ed61e647eac577fd6b850f0e8b";
+      sha256 = "0xxashigb3jifhwcsbi8mdzhd049mi1naaaih69cmmvzwrs3ik1p";
     };
   };
 
@@ -2562,12 +2562,12 @@
   };
 
   vim-lawrencium = buildVimPluginFrom2Nix {
-    name = "vim-lawrencium-2017-01-11";
+    name = "vim-lawrencium-2018-11-04";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-lawrencium";
-      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
-      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+      rev = "2e09de2ab8ac7a11387340647670ea6c1e4ef08c";
+      sha256 = "17j3wy15rkfx7xwgnmipmg7skmf57rw4xndkjgws6jqm9xgvj6jb";
     };
   };
 
@@ -2592,12 +2592,12 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-10-29";
+    name = "vim-localvimrc-2018-11-06";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "109962b3b7359ee2978417264b168ac6842db9cf";
-      sha256 = "13jpp5g91bynl91n8i8q8ldicii3ns42fq3hlnjcrhz5ml734wlf";
+      rev = "e84959d05472ce2000883b1f73ea34302894bdb9";
+      sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw";
     };
   };
 
@@ -2642,12 +2642,12 @@
   };
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
-    name = "vim-monokai-pro-2018-06-14";
+    name = "vim-monokai-pro-2018-12-03";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
-      rev = "75b2794a057f0ea6b2485ae622e92bb0687d4c9b";
-      sha256 = "1l9cdsilpzyg9y0az7627gi10qyfyjxn9dvi571q7n1vrv6nhl2d";
+      rev = "6c96cbc25e48de53b2b984863ab8bb722ee52d3e";
+      sha256 = "1nsr3n0rz0rwsk92hwg9391plkpilcnv159q4ag4fdrjv1n2v16d";
     };
   };
 
@@ -2822,12 +2822,12 @@
   };
 
   vim-plug = buildVimPluginFrom2Nix {
-    name = "vim-plug-2018-09-12";
+    name = "vim-plug-2018-11-03";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "b6050d6f03f3e2792589535249e3c997d3e94461";
-      sha256 = "11x10l75q6k4z67yyk5ll25fqpgb2ma88vplrakw3k41g79xn9d9";
+      rev = "734d9a11b5a6354e6a66e152dee5d311233e033c";
+      sha256 = "07j8wyqvqamr2dr1vdk84913jihw7arm4drnd2zmy0d7g00ngyzn";
     };
   };
 
@@ -2882,12 +2882,12 @@
   };
 
   vim-puppet = buildVimPluginFrom2Nix {
-    name = "vim-puppet-2018-09-24";
+    name = "vim-puppet-2018-11-15";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
-      rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b";
-      sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v";
+      rev = "4793b074ddbfc05ed0189e19de343870611e4bdc";
+      sha256 = "0q24dmbdsskz97xhdig9r9m7l8hyyzsmza1b0m7bc2y269fsiim0";
     };
   };
 
@@ -2902,12 +2902,12 @@
   };
 
   vim-quickrun = buildVimPluginFrom2Nix {
-    name = "vim-quickrun-2018-10-16";
+    name = "vim-quickrun-2018-11-27";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
-      rev = "9dbda9dcdc8ef3150c414b9b1ea347b04b942665";
-      sha256 = "06ssvyk84097vqzyrnrmxsr63diy8mjy8mv8xkhq5cmvqhavz91s";
+      rev = "875253cf98415de2aef411a50f35e2d7cb94aeac";
+      sha256 = "0l6f2m840c74md0799gch6l6m6nax30q8blpg2xrqmm7v0lrl50q";
     };
   };
 
@@ -2932,12 +2932,12 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-10-31";
+    name = "vim-rhubarb-2018-11-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "42072cc349c46db79c0a4411d399a2fe31cfda7e";
-      sha256 = "020fshfrwbycs4saci58k625330i2ndfh6lqnxz5h0pp2m5y6jp8";
+      rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324";
+      sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr";
     };
   };
 
@@ -2982,12 +2982,12 @@
   };
 
   vim-scriptease = buildVimPluginFrom2Nix {
-    name = "vim-scriptease-2018-07-27";
+    name = "vim-scriptease-2018-11-03";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-scriptease";
-      rev = "2619a1f5f63b670578ed0a504a6f844807804436";
-      sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl";
+      rev = "c443ccb2bc8a0e460753a45b9ed44d7722d1a070";
+      sha256 = "11r8nhjydjinqffqfdb6pn1pkh4yqckjazckn9m7j4r6r2hga10h";
     };
   };
 
@@ -3012,12 +3012,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-10-31";
+    name = "vim-signify-2018-11-16";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "4e7faba8d32d56d80090dedc5328849a7128b73a";
-      sha256 = "0wm1kgklvd4b52lrqb9l7n511p8kaw8y9707962l4nrp8cbrbs31";
+      rev = "ea87e05e6fcbbaece63aac4e9c1c23adb881b86c";
+      sha256 = "11d2xlc8j2mqx8s6h1z1pgr5dq0k2xr010qg8viw34z0pnfkah25";
     };
   };
 
@@ -3052,12 +3052,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-10-27";
+    name = "vim-snippets-2018-11-27";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "06161e65cd238d5f462f21e3f549c61860db85d1";
-      sha256 = "10n94s90jjwsg58cm5lrcs553mwsdyvy34rmf6xsa2mq9ql21vy1";
+      rev = "97e4ae4fe8d4e8af8c7d1a1d0c41e34ac81cf636";
+      sha256 = "1spf9bvn0a5cx3nhgzj6i5aqrh47v27a8rjxi3im2n1is0gyar7r";
     };
   };
 
@@ -3092,12 +3092,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-10-31";
+    name = "vim-startify-2018-11-28";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "356562270684d8d1647daf0faaf76ac90740990c";
-      sha256 = "0qc9ifq4blixda0kyc0zhmqi6cqz44xnk9x17p0p9qqidf1s1l1r";
+      rev = "e25fbe1c0d6f8cda83c0e300d70f9b8009e4134f";
+      sha256 = "0j3yr5g97s8lb9z68rx5clbg7af74r5y3rlgj5jx0mxlxx3yysyc";
     };
   };
 
@@ -3172,22 +3172,22 @@
   };
 
   vim-terraform = buildVimPluginFrom2Nix {
-    name = "vim-terraform-2018-08-02";
+    name = "vim-terraform-2018-11-19";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "7c11252da45c6508524e022d1f2588134902d8d1";
-      sha256 = "1qnjjcin934i7yd2fd0xapraindrpavnik1fasv10x5dw8yzxyrs";
+      rev = "9e40fa4f0c38bd4b008a720b3e86c6726846378f";
+      sha256 = "0m5bcmilz6dn67gkka183vkqakpppwgpa8zbwg8qz03fs0mdb98r";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-10-24";
+    name = "vim-test-2018-11-22";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "cecb28e55a29ecde7cea926852998c47027bd759";
-      sha256 = "1av9fmva2ki180wikfik3yl83hzirj43rwhwwms65bk590cf4h95";
+      rev = "c4b732003d120d60a2fc009423e34d80fb212651";
+      sha256 = "1s3y44lgxfivhnjkm8xx6gnqs2xqf53p1l3hbs04z07v57xfg0ml";
     };
   };
 
@@ -3212,22 +3212,22 @@
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
-    name = "vim-tmux-navigator-2018-10-19";
+    name = "vim-tmux-navigator-2018-11-03";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "7eb75a10e3ab0504673a0e7eb32af6e5521b80ec";
-      sha256 = "0kafk2b8zxwx354p8inww0cyrw9w4arbiixbvvhrhxks7cccfxx6";
+      rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466";
+      sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc";
     };
   };
 
   vim-toml = buildVimPluginFrom2Nix {
-    name = "vim-toml-2018-09-25";
+    name = "vim-toml-2018-11-27";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "2069e7413d8eaab567fa320723c4af24bb437f3a";
-      sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i";
+      rev = "06f6c1346be834c7c971d6d1d4f876e5699119bf";
+      sha256 = "12sp45p2ixkvrs9sdyx0m8bc6yn1c2qr0vqbr04c5ac94km1rdar";
     };
   };
 
@@ -3282,22 +3282,22 @@
   };
 
   vim-vue = buildVimPluginFrom2Nix {
-    name = "vim-vue-2018-10-08";
+    name = "vim-vue-2018-11-11";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
-      rev = "720ca48e0207f2aca331b9d949ce9d4ff5702737";
-      sha256 = "1cqny4vppyaw29g6bx1qlfdjb5fa0avpy41jkidazv76ym4ahi2x";
+      rev = "e306929b27bea08ab505de7a4617e642b56b6dcd";
+      sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16";
     };
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-10-27";
+    name = "vim-wakatime-2018-11-25";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "656853504feb4aab3168e007aab5a1aee355bff5";
-      sha256 = "1dpi6dc1gdwq4smsis9nxd2p3cq9jm88yj3kn12gfrsb5w1j9k7q";
+      rev = "fe33dfaf90d339ef54310c154e66970ef08c8611";
+      sha256 = "1wnsld5fy464s8wfz78d27hdlmk3bimyawmvvqg7h8drm3b24zbx";
     };
   };
 
@@ -3372,12 +3372,12 @@
   };
 
   vimpreviewpandoc = buildVimPluginFrom2Nix {
-    name = "vimpreviewpandoc-2018-05-12";
+    name = "vimpreviewpandoc-2018-11-05";
     src = fetchFromGitHub {
       owner = "tex";
       repo = "vimpreviewpandoc";
-      rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
-      sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
+      rev = "61d34f27b6d47da6523b682e32a155f65867d46e";
+      sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm";
     };
   };
 
@@ -3402,12 +3402,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-11-01";
+    name = "vimtex-2018-12-02";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "2aae07e67034f4806d45500a967bf5775ab22baf";
-      sha256 = "1ng1ps5f2vh7xs5lfkid7zwvcjglynw53xvd301zpjbgln2gv3fz";
+      rev = "c3d40a9bc136bbe01739b193e188f3ad450edaa5";
+      sha256 = "1mgji6w1630npqps3mysapqg08zd7abvkr3vvdl4ns7f582rm2b6";
     };
   };
 
@@ -3523,12 +3523,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-10-14";
+    name = "youcompleteme-2018-11-27";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6ba";
-      sha256 = "14v7kqv4d2013imc5qkh22lwl5d9x419jjfj5qinld04n56banmv";
+      rev = "75bf1738dcac502fa2d04e87116a3ce65249be8c";
+      sha256 = "19mdhpiqkn9zr23b55cpx66lwmm2a6kdss98dwzib3swr3dgcvcg";
       fetchSubmodules = true;
     };
   };
@@ -3564,12 +3564,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-09-21";
+    name = "zig-vim-2018-11-17";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2";
-      sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g";
+      rev = "0479c0ade7c27210e3a7982d36bd2673d560ffa9";
+      sha256 = "1ndbrzvkiyy55avmk6z7x7qd5b9v4ylc7i8n9xlcas90q6cjw9ga";
     };
   };
 

From 3b2bf761df5d1c75f4b5a26ec72c373562289ee9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 07:43:04 -0500
Subject: [PATCH 032/199] linux: 4.20-rc4 -> 4.20-rc5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 0c4158790bdc..6c06354f3943 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.20-rc4";
-  modDirVersion = "4.20.0-rc4";
+  version = "4.20-rc5";
+  modDirVersion = "4.20.0-rc5";
   extraMeta.branch = "4.20";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kni1l1gk9mva7ym091mrkn9f2bdbh80i7589ahk6j5blpj9m3ns";
+    sha256 = "0dixig8vismk40x4a719psyi39nqcv7yrisjdnj3s2ym9rljyypz";
   };
 
   # Should the testing kernels ever be built on Hydra?

From ee1f6e20b2a1b7d28e8d3ae949ab0fd98cd85818 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 08:11:39 -0500
Subject: [PATCH 033/199] slack: Add dark-mode version

---
 .../instant-messengers/slack/default.nix        | 17 ++++++++++++++++-
 pkgs/top-level/all-packages.nix                 |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 529a530a4a36..51b6fb1d69c9 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, makeWrapper
+{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
 , systemd, xorg }:
@@ -88,6 +88,21 @@ in stdenv.mkDerivation {
     substituteInPlace $out/share/applications/slack.desktop \
       --replace /usr/bin/ $out/bin/ \
       --replace /usr/share/ $out/share/
+  '' + stdenv.lib.optionalString darkMode ''
+    cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
+    document.addEventListener('DOMContentLoaded', function() {
+    let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
+    $.ajax({
+        url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css',
+        success: function(css) {
+            \$("<style></style>").appendTo('head').html(css + tt__customCss);
+            \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}');
+            \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}');
+            \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}');
+        }
+      });
+    });
+    EOF
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73de74dd9b04..3f83f1fd9e9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17350,6 +17350,7 @@ with pkgs;
   jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
+  slack-dark = self.slack.override { darkMode = true; };
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 

From caed71efb655d0a73ba6355e0292541de381cf69 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Mon, 3 Dec 2018 16:14:16 +0100
Subject: [PATCH 034/199] nvidia_legacy_340: Remove unneeded/failing patch

The patch is not applying and no longer needed after upgrade in
045575e744cd581a20929c63590d9b555099c22d. Now the same result is
achieved by the following lines in the driver package itself:

    #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
    #define nv_drm_pci_init drm_legacy_pci_init
    #define nv_drm_pci_exit drm_legacy_pci_exit
    #else
    #define nv_drm_pci_init drm_pci_init
    #define nv_drm_pci_exit drm_pci_exit
    #endif
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 016d03a61f87..aa604cd97764 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -47,7 +47,7 @@ rec {
     persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
     useGLVND = false;
 
-    patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
+    patches = [ ./vm_operations_struct-fault.patch ];
   };
 
   legacy_304 = generic {

From 84a2463499d7e67350277e0f02cdb4412d0262cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Dec 2018 07:40:29 +0100
Subject: [PATCH 035/199] jpeginfo: init at 1.6.1

jpeginfo prints information and tests integrity of JPEG/JFIF files.
---
 .../graphics/jpeginfo/default.nix             | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/graphics/jpeginfo/default.nix

diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix
new file mode 100644
index 000000000000..f438bf6f7ed8
--- /dev/null
+++ b/pkgs/applications/graphics/jpeginfo/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "jpeginfo-${version}";
+  version = "1.6.1";
+
+  src = fetchurl {
+    url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    sha256 = "0lvn3pnylyj56158d3ix9w1gas1s29klribw9bz1xym03p7k37k2";
+  };
+
+  buildInputs = [ libjpeg ];
+
+  meta = with stdenv.lib; {
+    description = "Prints information and tests integrity of JPEG/JFIF files";
+    homepage = "https://www.kokkonen.net/tjko/projects.html";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.bjornfor ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f83f1fd9e9c..2ba9ac670cd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3558,6 +3558,8 @@ with pkgs;
 
   jp2a = callPackage ../applications/misc/jp2a { };
 
+  jpeginfo = callPackage ../applications/graphics/jpeginfo { };
+
   jpegoptim = callPackage ../applications/graphics/jpegoptim { };
 
   jpegrescan = callPackage ../applications/graphics/jpegrescan { };

From 8ebfd5c45cd25e5bce147467c5946eb76ee1d154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Nov 2018 07:03:19 +0100
Subject: [PATCH 036/199] nixos/jenkins-job-builder: stop reloadScript on error

Currently there are two calls to curl in the reloadScript, neither which
check for errors. If something is misconfigured (like wrong authToken),
the only trace that something wrong happened is this log message:

  Asking Jenkins to reload config
  <h1>Bad Message 400</h1><pre>reason: Illegal character VCHAR='<'</pre>

The service isn't marked as failed, so it's easy to miss.

Fix it by passing --fail to curl.

While at it:
* Add $curl_opts and $jenkins_url variables to keep the curl command
  lines DRY.
* Add --show-error to curl to show short error message explanation when
  things go wrong (like HTTP 401 error).
* Lower-case the $CRUMB variable as upper case is for exported environment
  variables.

The new behaviour, when having wrong accessToken:

  Asking Jenkins to reload config
  curl: (22) The requested URL returned error: 401

And the service is clearly marked as failed in `systemctl --failed`.
---
 .../services/continuous-integration/jenkins/job-builder.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 861b46a2d642..682586b83e34 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -128,8 +128,10 @@ in {
           ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
           reloadScript = ''
             echo "Asking Jenkins to reload config"
-            CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
-            curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
+            curl_opts="--silent --fail --show-error"
+            jenkins_url="http://${cfg.accessUser}:${accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
+            crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
+            curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
           '';
         in
           ''

From bb94d419fb2ae6f03d66fd590cdf2632d9097b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Nov 2018 07:04:10 +0100
Subject: [PATCH 037/199] nixos/jenkins-job-builder: add accessTokenFile option

The new option allows storing the secret access token outside the world
readable Nix store.
---
 .../jenkins/job-builder.nix                   | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 682586b83e34..5d1bfe4ec407 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -42,6 +42,18 @@ in {
         type = types.str;
         description = ''
           User token in Jenkins used to reload config.
+          WARNING: This token will be world readable in the Nix store. To keep
+          it secret, use the <option>accessTokenFile</option> option instead.
+        '';
+      };
+
+      accessTokenFile = mkOption {
+        default = "";
+        type = types.str;
+        example = "/run/keys/jenkins-job-builder-access-token";
+        description = ''
+          File containing the API token for the <option>accessUser</option>
+          user.
         '';
       };
 
@@ -103,6 +115,21 @@ in {
   };
 
   config = mkIf (jenkinsCfg.enable && cfg.enable) {
+    assertions = [
+      { assertion =
+          if cfg.accessUser != ""
+          then (cfg.accessToken != "" && cfg.accessTokenFile == "") ||
+               (cfg.accessToken == "" && cfg.accessTokenFile != "")
+          else true;
+        message = ''
+          One of accessToken and accessTokenFile options must be non-empty
+          strings, but not both. Current values:
+            services.jenkins.jobBuilder.accessToken = "${cfg.accessToken}"
+            services.jenkins.jobBuilder.accessTokenFile = "${cfg.accessTokenFile}"
+        '';
+      }
+    ];
+
     systemd.services.jenkins-job-builder = {
       description = "Jenkins Job Builder Service";
       # JJB can run either before or after jenkins. We chose after, so we can
@@ -129,7 +156,10 @@ in {
           reloadScript = ''
             echo "Asking Jenkins to reload config"
             curl_opts="--silent --fail --show-error"
-            jenkins_url="http://${cfg.accessUser}:${accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
+            access_token=${if cfg.accessTokenFile != ""
+                           then "$(cat '${cfg.accessTokenFile}')"
+                           else cfg.accessToken}
+            jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
             crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
             curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
           '';

From 0c029635cd27ed861f3a126758f6c09720be08ac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 3 Dec 2018 11:01:22 +0100
Subject: [PATCH 038/199] qlcplus: fix udev rules path

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

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 2fa4887a0f0f..eae3216c964f 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
     patchShebangs .
     sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
             -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
-            -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \
+            -e "s@/etc/udev/rules.d@''${out}/lib/udev/rules.d@" \
       variables.pri
   '';
 

From 4cf1d88d12ff894968a6a406d6ee62f26f998625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Dec 2018 17:18:07 +0000
Subject: [PATCH 039/199] chrome-token-signing: fix path to opensc-pkcs11

---
 pkgs/tools/security/chrome-token-signing/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix
index b9e42bb6fa74..2dc9336bb329 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/tools/security/chrome-token-signing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig }:
+{ stdenv, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }:
 
 stdenv.mkDerivation rec {
   name = "chrome-token-signing-${version}";
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace host-linux/ee.ria.esteid.json --replace /usr $out
+    # TODO: macos
+    substituteInPlace host-shared/PKCS11Path.cpp \
+      --replace opensc-pkcs11.so ${opensc}/lib/pkcs11/opensc-pkcs11.so
   '';
 
   installPhase = ''

From e42d10957d87a5837085cd3273f97e50b67e987d Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Mon, 3 Dec 2018 13:46:22 -0500
Subject: [PATCH 040/199] Add disable core optimizations (#51464)

haskell.lib.disableOptimization: new function

Adds a utility function for disabling GHC core optimizations.
Significantly reduces build times.
---
 pkgs/development/haskell-modules/lib.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 3d67ac213993..e3b73641989a 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -259,6 +259,9 @@ rec {
    */
   buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg);
 
+  /* Disable core optimizations, significantly speeds up build time */
+  disableOptimization = pkg: appendConfigureFlag pkg "--disable-optimization";
+
   /* Turn on most of the compiler warnings and fail the build if any
      of them occur. */
   failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror";

From 7357949e3ce5966480d758800c164582ae1990a5 Mon Sep 17 00:00:00 2001
From: "Andy Chun @noneucat" <andy@lolc.at>
Date: Mon, 3 Dec 2018 12:14:56 -0800
Subject: [PATCH 041/199] polar-bookshelf: 1.0.13 -> 1.1.0

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

diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 157c1158ac63..f1325a6c6ac9 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "polar-bookshelf-${version}";
-  version = "1.0.13";
+  version = "1.1.0";
 
   # fetching a .deb because there's no easy way to package this Electron app
   src = fetchurl {
     url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
-    sha256 = "0dh7pw8ncm8kr9anb6jqw7rr4lxgmq8a40c9zlrhzyswdpvnp1g7";
+    sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw";
   };
 
   buildInputs = [

From 846aeabdc43f11f1ec39b4530b3d3b6615310309 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 3 Dec 2018 14:53:23 +0100
Subject: [PATCH 042/199] dmrconfig: 2018-11-07 -> 1.0

---
 pkgs/applications/misc/dmrconfig/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
index 5d02eb937ffe..7e20b87eb983 100644
--- a/pkgs/applications/misc/dmrconfig/default.nix
+++ b/pkgs/applications/misc/dmrconfig/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "dmrconfig-${version}";
-  version = "2018-11-07";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
-    rev = "b58985d3c848b927e91699d97f96d9de014c3fc7";
-    sha256 = "083f21hz6vqjpndkn27nsjnhnc5a4bw0cr26ryfqcvz275rj4k18";
+    rev = version;
+    sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9";
   };
 
   buildInputs = [
@@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
+    substituteInPlace Makefile \
+      --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \
+      --replace "\$(shell git describe --tags --abbrev=0)" ${version} \
+      --replace "\$(shell git rev-list HEAD --count)" 0
   '';
 
   installPhase = ''

From 4173b845cae89fb527d85eb5a60145fc5085055c Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Mon, 3 Dec 2018 21:04:08 +0000
Subject: [PATCH 043/199] mediawiki: 1.29.1 -> 1.31.1

1.29.1 is out of support and has security vulnerabilities. 1.31.1 is current LTS.
---
 .../services/web-servers/apache-httpd/mediawiki.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 4269f6cfb088..e871ae6ff15a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.29.1";
+    name= "mediawiki-1.31.1";
 
     src = pkgs.fetchurl {
-      url = "https://releases.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
-      sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
+      url = "https://releases.wikimedia.org/mediawiki/1.31/${name}.tar.gz";
+      sha256 = "13x48clij21cmysjkpnx68vggchrdasqp7b290j87xlfgjhdhnnf";
     };
 
     skins = config.skins;
@@ -111,7 +111,7 @@ let
         sed -i \
         -e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \
         -e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \
-          $out/includes/limit.sh \
+          $out/includes/shell/limit.sh \
           $out/includes/GlobalFunctions.php
       '';
   };

From 08c75aaedc45ee15fc7e8f9f5967606d6d0f997f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 3 Dec 2018 22:10:29 +0000
Subject: [PATCH 044/199] libffi: swap src URL from FTP to HTTPS

HTTPS is never worse and often better than FTP, since it's faster, more secure,
and more likely to be accessible through firewalls.

This does not change the tarball sha, as confirmed by `nix-prefetch-url`.
---
 pkgs/development/libraries/libffi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 215f587bb6b4..384e3370ec9c 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "libffi-3.2.1";
 
   src = fetchurl {
-    url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
+    url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
     sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 

From 23de7958bff140f68d19f5282eeea3ce7c7ced66 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Dec 2018 22:35:07 +0100
Subject: [PATCH 045/199] =?UTF-8?q?sublime3-dev:=203176=20=E2=86=92=203183?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sublime finally switched to GTK 3!
---
 .../applications/editors/sublime/3/common.nix | 29 +++++++++++++++----
 .../editors/sublime/3/packages.nix            |  6 ++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index eb282b1be3a8..cf6802eb9a93 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -1,14 +1,14 @@
 {buildVersion, x32sha256, x64sha256}:
 
-{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
+{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2,
   pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
   gksuSupport ? false, gksu, unzip, zip, bash}:
 
 assert gksuSupport -> gksu != null;
 
 let
-
-  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
+  legacy = stdenv.lib.versionOlder buildVersion "3181";
+  libPath = stdenv.lib.makeLibraryPath [ glib xorg.libX11 (if legacy then gtk2 else gtk3) cairo pango ];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
     ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
 in let
@@ -36,11 +36,14 @@ in let
 
     dontStrip = true;
     dontPatchELF = true;
-    buildInputs = [ makeWrapper zip unzip ];
+    buildInputs = stdenv.lib.optionals (!legacy) [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
+    nativeBuildInputs = [ makeWrapper zip unzip ] ++ stdenv.lib.optional (!legacy) wrapGAppsHook;
 
     # make exec.py in Default.sublime-package use own bash with
     # an LD_PRELOAD instead of "/bin/bash"
     patchPhase = ''
+      runHook prePatch
+
       mkdir Default.sublime-package-fix
       ( cd Default.sublime-package-fix
         unzip -q ../Packages/Default.sublime-package
@@ -50,9 +53,13 @@ in let
         zip -q ../Packages/Default.sublime-package **/*
       )
       rm -r Default.sublime-package-fix
+
+      runHook postPatch
     '';
 
     buildPhase = ''
+      runHook preBuild
+
       for i in sublime_text plugin_host crash_reporter; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -62,9 +69,13 @@ in let
 
       # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
       sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text
+
+      runHook postBuild
     '';
 
     installPhase = ''
+      runHook preInstall
+
       # Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
       sed -e "s,/opt/sublime_text/sublime_text,$out/sublime_text," -i sublime_text.desktop
 
@@ -74,12 +85,20 @@ in let
       # We can't just call /usr/bin/env bash because a relocation error occurs
       # when trying to run a build from within Sublime Text
       ln -s ${bash}/bin/bash $out/sublime_bash
+
+      runHook postInstall
+    '';
+
+    dontWrapGApps = true; # non-standard location, need to wrap the executables manually
+
+    postFixup = ''
       wrapProgram $out/sublime_bash \
         --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
 
       wrapProgram $out/sublime_text \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-        --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
+        --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
+        ${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''}
 
       # Without this, plugin_host crashes, even though it has the rpath
       wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 8ab7c8144079..f9a6f1cb6dc9 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,9 +5,9 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3176";
-      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
-      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
+      buildVersion = "3183";
+      x32sha256 = "0rgah7iq9y3afbawcb723d2b7m56lz0ji5l8klxvkp59c9rphqxh";
+      x64sha256 = "1n3zarkhs22p2vi32fswb0fvcn9fzivmziw6zcvjy02c0rmxmdkz";
     } {};
 
     sublime3 = common {

From 83f782f1754c511d647056ea426dd82e9d51633f Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Mon, 3 Dec 2018 12:40:27 -0800
Subject: [PATCH 046/199] Add mock to the list of whisper's test inputs.

This was required as the versiof whisper was upgraded from
1.1.3 to 1.1.4 and mock was added as a test dependency in
that release:
https://github.com/graphite-project/whisper/commit/703dd9d3a60a0f79383c03a541ee66bd50966a01#diff-62849af500c571aa4532da7be8833e73R14
---
 pkgs/development/python-modules/whisper/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index 1fb9dd6da16a..0f8178e17f2b 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage, fetchPypi, mock, six }:
 
 buildPythonPackage rec {
   pname = "whisper";
@@ -10,6 +10,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ six ];
+  checkInputs           = [ mock ];
 
   meta = with stdenv.lib; {
     homepage = http://graphite.wikidot.com/;

From 330fbbeb7399bb6d18d0fd317b68d5a56cd03ae8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 2 Dec 2018 13:16:36 +0100
Subject: [PATCH 047/199] pyflame: init at 1.6.7

---
 .../tools/profiling/pyflame/default.nix       | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/profiling/pyflame/default.nix

diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix
new file mode 100644
index 000000000000..31ecbcaacbf0
--- /dev/null
+++ b/pkgs/development/tools/profiling/pyflame/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig
+# pyflame needs one python version per ABI
+# are currently supported 
+# * 2.6 or 2.7 for 2.x ABI
+# * 3.4 or 3.5 for 3.{4,5} ABI
+# * 3.6        for 3.6+ ABI
+# if you want to disable support for some ABI, make the corresponding argument null
+, python2, python35, python36
+}:
+stdenv.mkDerivation rec {
+  pname = "pyflame";
+  version = "1.6.7"; 
+  src = fetchFromGitHub {
+    owner = "uber";
+    repo = "pyflame";
+    rev = "v${version}";
+    sha256 = "0hz1ryimh0w8zyxx4y8chcn54d6b02spflj5k9rcg26an2chkg2w";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ python36 python2 python35 ];
+
+  postPatch = ''
+    patchShebangs .
+    # some tests will fail in the sandbox
+    substituteInPlace tests/test_end_to_end.py \
+      --replace 'skipif(IS_DOCKER' 'skipif(True'
+  '';
+
+  doCheck = true;
+  # reproduces the logic of their test script, but without downloading pytest
+  # from the internet with pip
+  checkPhase = with stdenv.lib; concatMapStringsSep "\n" (python: ''
+    set -x
+    PYMAJORVERSION=${head (strings.stringToCharacters python.version)} \
+      PATH=${makeBinPath [ coreutils ]}\
+      PYTHONPATH= \
+      ${python.pkgs.pytest}/bin/pytest tests/
+    set +x
+  '') (filter (x: x!=null) buildInputs);
+
+  meta = with stdenv.lib; {
+    description = "A ptracing profiler for Python ";
+    longDescription = ''
+      Pyflame is a high performance profiling tool that generates flame graphs for
+      Python. Pyflame uses the Linux ptrace(2) system call to collect profiling
+      information. It can take snapshots of the Python call stack without
+      explicit instrumentation, meaning you can profile a program without
+      modifying its source code.
+    '';
+    homepage = https://github.com/uber/pyflame;
+    license = licenses.asl20;
+    maintainers = [ maintainers.symphorien ];
+    # arm: https://github.com/uber/pyflame/issues/136
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc18e0a06111..fedc9282b179 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8850,6 +8850,8 @@ with pkgs;
 
   puppet-lint = callPackage ../development/tools/puppet/puppet-lint { };
 
+  pyflame = callPackage ../development/tools/profiling/pyflame { };
+
   pyrseas = callPackage ../development/tools/database/pyrseas { };
 
   qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };

From 58700be336390ae7001d3c224f986e05e8deaa52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 22:29:22 +0000
Subject: [PATCH 048/199] radare2: 3.1.1 -> 3.1.2

---
 .../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 aa8741989f48..e8bec4184b8d 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20285";
-    gittap = "3.1.1";
-    gittip = "b143e1b1b5622ef2f41a90f4c0f7ed4c477caf40";
-    rev = "3.1.1";
-    version = "3.1.1";
-    sha256 = "09kn25ijqhk3x9f3k6mw1g0wvwym8ys6qz53ybx3qizy4fzln0hw";
+    version_commit = "20299";
+    gittap = "3.1.2";
+    gittip = "b453df6acc6742d709bd238cd9cd63ede2534b1b";
+    rev = "3.1.2";
+    version = "3.1.2";
+    sha256 = "1cvfkxp8vj8f6ghhin71lynvq3zpc311y5b9c2sg9g7h4j3647nq";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20285";
+    version_commit = "20299";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From dc9bb48a736709dba46a9be54cdd826376214cd6 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 4 Dec 2018 01:20:02 +0200
Subject: [PATCH 049/199] loop: cleanup

---
 pkgs/tools/misc/loop/default.nix          | 11 +++++++----
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 ------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index f86f3041aba2..acb88d9773c8 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,19 +1,22 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   name = "loop-unstable-2018-10-02";
-  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
     repo  = "Loop";
-    rev   = version;
+    rev   = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
     sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
   };
 
   cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
 
-  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+  cargoPatches = [
+    # Upstream includes mismatched Cargo.lock file.
+    # See https://github.com/Miserlou/Loop/pull/40
+    ./fix_cargo_lock.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "UNIX's missing `loop` command";
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
deleted file mode 100644
index b95afac470f5..000000000000
--- a/pkgs/tools/misc/loop/fix_cargo_toml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,9 +15,9 @@ license = "MIT"
--structopt = "0.2" 
-+structopt = "0.2.10" 
- humantime = "1.1.1"
--atty = "0.2"
-+atty = "0.2.11"
--regex = "1.0.0"
-+regex = "1.0.5"
--subprocess = "0.1.12"
-+subprocess = "0.1.14"
--tempfile = "3.0.3"
-+tempfile = "3.0.4"
- 
- [[bin]]
- name = "loop"

From fae81f322e045a996c2108aa61996e31b2af64d1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 00:19:37 +0100
Subject: [PATCH 050/199] cowsay: fix cross

The install.sh script looks for all perls in $PATH, tries to execute
these to test whether that perl is "good", if it is, takes it and
puts it into the shebang.

This obviously can't work for cross. As installation seems to be pretty
trivial, do it in a custom install phase.
---
 pkgs/tools/misc/cowsay/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index 4d55b70d007b..6b5c9c513944 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -11,8 +11,18 @@ stdenv.mkDerivation rec{
 
   buildInputs = [ perl ];
 
+  postBuild = ''
+    substituteInPlace cowsay --replace "%BANGPERL%" "!${perl}/bin/perl" \
+      --replace "%PREFIX%" "$out"
+  '';
+
   installPhase = ''
-    bash ./install.sh $out
+    mkdir -p $out/{bin,man/man1,share/cows}
+    install -m755 cowsay $out/bin/cowsay
+    ln -s cowsay $out/bin/cowthink
+    install -m644 cowsay.1 $out/man/man1/cowsay.1
+    ln -s cowsay.1 $out/man/man1/cowthink.1
+    install -m644 cows/* -t $out/share/cows/
   '';
 
   meta = with stdenv.lib; {

From 1f5c851967fe3365804b6e61f72f1738e00baf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Dec 2018 22:26:36 +0000
Subject: [PATCH 051/199] radare: remove

This project has been deprecated in 2016.
Radare2 should been used intead: https://github.com/radare/radare
---
 .../tools/analysis/radare/default.nix         | 38 -------------------
 .../tools/analysis/radare/ired.nix            | 22 -----------
 pkgs/top-level/all-packages.nix               | 11 ------
 3 files changed, 71 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/radare/default.nix
 delete mode 100644 pkgs/development/tools/analysis/radare/ired.nix

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
deleted file mode 100644
index b9b9b8abfb92..000000000000
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
-gtk2 ? null, vte ? null, gtkdialog ? null,
-python ? null,
-ruby ? null,
-useX11, rubyBindings, pythonBindings, luaBindings}:
-
-assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
-assert rubyBindings -> ruby != null;
-assert pythonBindings -> python != null;
-
-let
-  inherit (stdenv.lib) optional;
-in
-stdenv.mkDerivation rec {
-  name = "radare-1.5.2";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ readline libusb perl]
-    ++ optional useX11 [gtkdialog vte gtk2]
-    ++ optional rubyBindings [ruby]
-    ++ optional pythonBindings [python]
-    ++ optional luaBindings [lua];
-
-  meta = {
-    description = "Free advanced command line hexadecimal editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix
deleted file mode 100644
index aec13296bdaa..000000000000
--- a/pkgs/development/tools/analysis/radare/ired.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "ired-0.4";
-
-  src = fetchurl {
-    url = "https://radare.org/get/${name}.tar.gz";
-    sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm";
-  };
-  
-  installPhase = ''
-    make install PREFIX=$out
-  '';
-
-  meta = {
-    description = "Interactive Raw Editor";
-    homepage = http://radare.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c43db49ad8b6..5ef3d430b137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8657,8 +8657,6 @@ in
 
   iozone = callPackage ../development/tools/misc/iozone { };
 
-  ired = callPackage ../development/tools/analysis/radare/ired.nix { };
-
   itstool = callPackage ../development/tools/misc/itstool { };
 
   jam = callPackage ../development/tools/build-managers/jam { };
@@ -8874,15 +8872,6 @@ in
 
   r10k = callPackage ../tools/system/r10k { };
 
-  radare = callPackage ../development/tools/analysis/radare {
-    inherit (gnome2) vte;
-    lua = lua5;
-    useX11 = config.radare.useX11 or false;
-    pythonBindings = config.radare.pythonBindings or false;
-    rubyBindings = config.radare.rubyBindings or false;
-    luaBindings = config.radare.luaBindings or false;
-  };
-
   inherit (callPackages ../development/tools/analysis/radare2 {
     inherit (gnome2) vte;
     lua = lua5;

From b057ac71eaffb98784cf9cfbf76e6dac83644e64 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 3 Dec 2018 16:11:45 +0200
Subject: [PATCH 052/199] mythes: fix link error on missed `tinfo` library
 (ncurses)

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

diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index 28888e551ef6..01bf863bbbb1 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hunspell, pkgconfig, perl }:
+{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
   name = "mythes-1.2.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ hunspell ];
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ ncurses pkgconfig perl ];
 
   meta = {
     homepage = http://hunspell.sourceforge.net/;

From e9ecd7f87256d6c669413da3a02f1873663cdcf6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 4 Dec 2018 01:54:37 +0100
Subject: [PATCH 053/199] nix-index: Wrap with nix-env in PATH (#51165)

This fixes an impurity in nix-index: Previously it would take the nix-env
binary from the users PATH. I discovered this while trying to run nix-index in a
systemd service, which by default doesn't have nix-env in its path. The
errors it threw were not informative at all and it took me hours to
finally figure out the reason.
---
 pkgs/tools/package-management/nix-index/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index c20e3142104a..a7cebe8d1c83 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
-, Security
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl
+, nix, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
   };
   cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl curl ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
 
@@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec {
     cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
     substituteInPlace $out/etc/profile.d/command-not-found.sh \
       --replace "@out@" "$out"
+    wrapProgram $out/bin/nix-index \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}"
   '';
 
   meta = with stdenv.lib; {

From c4177f4e5ba5e1b29c3b51ff02697dc1437cfb91 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 02:09:22 +0100
Subject: [PATCH 054/199] zoom-us: 2.4.129780.0915 -> 2.5.146186.1130

fixes [CVE-2018-15715](https://nvd.nist.gov/vuln/detail/CVE-2018-15715)
---
 .../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 d271d5d48491..069d37a4c7f1 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "2.4.129780.0915";
+  version = "2.5.146186.1130";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0s4014ymc92rwpagcwjhmwwfz0vq35wiq2nhh6nlxcrr6jl4wd78";
+      sha256 = "1644xs7xg8a27xg7bgb7856hvlvfh2lin749alds782i52p9rsjr";
     };
   };
 

From da511852c153c8ca2395867dc60ac262bd603586 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 4 Dec 2018 02:57:28 +0100
Subject: [PATCH 055/199] leiningen: move leiningen-x.x-standalone.jar out of
 share/java

fixes #51448
---
 .../tools/build-managers/leiningen/default.nix           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 30531c980b0b..4faf524af117 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -24,11 +24,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = [ jdk ];
 
+  # the jar is not in share/java, because it's a standalone jar and should
+  # never be picked up by set-java-classpath.sh
+
   installPhase = ''
-    mkdir -p $out/bin $out/share/java
+    mkdir -p $out/bin $out/share
 
     cp -v $src $out/bin/lein
-    cp -v $jarsrc $out/share/java/$JARNAME
+    cp -v $jarsrc $out/share/$JARNAME
   '';
 
   fixupPhase = ''
@@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
     patchShebangs $out/bin/lein
 
     substituteInPlace $out/bin/lein \
-      --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME"
+      --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
 
     wrapProgram $out/bin/lein \
       --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \

From f1dd6faaaa163160697376484f29f8d25da8effb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 3 Dec 2018 21:16:10 -0500
Subject: [PATCH 056/199] docs: Remove nix-repl references

nix-repl has been deprecated
---
 doc/languages-frameworks/texlive.xml          | 12 ++++++------
 nixos/doc/manual/configuration/modularity.xml |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index e42d0a811111..5792a16963a9 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -49,12 +49,12 @@ texlive.combine {
    </listitem>
    <listitem>
     <para>
-     You can list packages e.g. by <command>nix-repl</command>.
-<programlisting>
-$ nix-repl
-nix-repl> :l &lt;nixpkgs>
-nix-repl> texlive.collection-&lt;TAB>
-      </programlisting>
+     You can list packages e.g. by <command>nix repl</command>.
+<programlisting><![CDATA[
+$ nix repl
+nix-repl> :l <nixpkgs>
+nix-repl> texlive.collection-<TAB>
+]]></programlisting>
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index cda36eba25c1..5ff5bc22c85e 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -113,12 +113,10 @@ $ nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
   Interactive exploration of the configuration is possible using
-  <command
-xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
-  a read-eval-print loop for Nix expressions. It’s not installed by default;
-  run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
+  <command>nix repl</command>, a read-eval-print loop for Nix expressions.
+  A typical use:
 <screen>
-$ nix-repl '&lt;nixpkgs/nixos>'
+$ nix repl '&lt;nixpkgs/nixos>'
 
 nix-repl> config.<xref linkend="opt-networking.hostName"/>
 "mandark"

From 5bc0270211570cf46936e4c95900bdd0a19119a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 08:32:29 +0100
Subject: [PATCH 057/199] nix-zsh-completions: 0.4.1 -> 0.4.2

---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 861a6d05df69..122a44dcd17c 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.4.1";
+  version = "0.4.2";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "1p2y1sg6jghixv2j3fwxnkyl3idj44gcm71bbn25mnqfhm0z25hr";
+    sha256 = "1pfyn8kd9fc9fyy77imzg6xj00nzddkjagwjs2594db8ynp6cfil";
   };
 
   installPhase = ''

From ad8f5ca2bbb898098c87c44109dde9f214602327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 4 Dec 2018 08:34:23 +0100
Subject: [PATCH 058/199] nix-bash-completions: 0.6.6 -> 0.6.7

---
 pkgs/shells/bash/nix-bash-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index b76e65ca8719..5ac117cf1e5e 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.6";
+  version = "0.6.7";
   name = "nix-bash-completions-${version}";
 
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
     rev = "v${version}";
-    sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw";
+    sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
   };
 
   # To enable lazy loading via. bash-completion we need a symlink to the script

From 50069a0eeafbd815e7296c15ad25f50c6d9d8505 Mon Sep 17 00:00:00 2001
From: Kyle Lacy <kylelacy+git@pm.me>
Date: Tue, 4 Dec 2018 00:11:48 -0800
Subject: [PATCH 059/199] plex-media-player: 2.14.1 -> 2.23.0

---
 .../video/plex-media-player/default.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix
index 7386d95d0c2b..ceba62b6f607 100644
--- a/pkgs/applications/video/plex-media-player/default.nix
+++ b/pkgs/applications/video/plex-media-player/default.nix
@@ -9,41 +9,41 @@ let
   # plex-media-player is updated, the versions for these files are changed,
   # so the build IDs (and SHAs) below will need to be updated!
   depSrcs = rec {
-    webClientBuildId = "56-23317d81e49651";
-    webClientDesktopBuildId = "3.57.1-1e49651";
-    webClientTvBuildId = "3.60.1-23317d8";
+    webClientBuildId = "85-88b3ac67015f76";
+    webClientDesktopBuildId = "3.77.2-7015f76";
+    webClientTvBuildId = "3.78.0-88b3ac6";
 
     webClient = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake";
-      sha256 = "1a48a65zzdx347kfnxriwkb0yjlhvn2g8jkda5pz10r3lwja0gbi";
+      sha256 = "0j7i4yr95ljw9cwyaygld41j7yvndj3dza3cbydv4x8mh2hn05v1";
     };
     webClientDesktopHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1";
-      sha256 = "04wdgpsh33y8hyjhjrfw6ymf9g002jny7hvhld4xp33lwxhd2j5w";
+      sha256 = "106kx9ahz7jgskpjraff2g235n1whwvf18yw0nmp5dwr9ys9h8jp";
     };
     webClientDesktop = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz";
-      sha256 = "1asw9f84z9sm3w7ifnc7j631j84rgx23c6msmn2dnw48ckv3bj2z";
+      sha256 = "0h23h3fd3w43glvnhrg9qiajs0ql490kb00g3i4cpi29hy1ky45r";
     };
     webClientTvHash = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1";
-      sha256 = "0d1hsvmpwczwx442f8qdvfr8c3w84630j9qwpg2y4qm423sgdvja";
+      sha256 = "05zk2zpmcdf276ys5zyirsmvhvyvz99fa6hlgymma8ql6w67133r";
     };
     webClientTv = fetchurl {
       url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz";
-      sha256 = "1ih3l5paf1jl68b1xq3iqqmvs3m07fybz57hcz4f78v0gwq2kryq";
+      sha256 = "1cflpgaf4kyj6ccqa11j28rkp8s7zlbnid7s00m5n2c907dihmw2";
     };
   };
 in stdenv.mkDerivation rec {
   name = "plex-media-player-${version}";
-  version = "2.14.1.880";
-  vsnHash = "301a4b6c";
+  version = "2.23.0.920";
+  vsnHash = "5bc1a2e5";
 
   src = fetchFromGitHub {
     owner = "plexinc";
     repo = "plex-media-player";
     rev = "v${version}-${vsnHash}";
-    sha256 = "0xz41r697vl6s3qvy6jwriv3pb9cfy61j6sydvdq121x5a0jnh9a";
+    sha256 = "1jzlyj32gr3ar89qnk8slazrbchqkjfx9dchzkzfvpi6742v9igm";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3 ];

From 21de751e742685b86a78ff2251bb1fc1692aee4a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 4 Dec 2018 11:41:23 +0100
Subject: [PATCH 060/199] python.pkgs.pygraphviz: add graphviz path

---
 .../python-modules/pygraphviz/default.nix          | 14 ++++++++++++--
 .../python-modules/pygraphviz/graphviz-path.patch  | 13 +++++++++++++
 pkgs/top-level/python-packages.nix                 |  4 +++-
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygraphviz/graphviz-path.patch

diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 7ba62c4f2eb4..8ca84e9b7c0e 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -13,8 +13,18 @@ buildPythonPackage rec {
   buildInputs = [ doctest-ignore-unicode mock nose ];
   propagatedBuildInputs = [ graphviz pkgconfig ];
 
-  # the tests are currently failing:
-  # check status of pygraphviz/pygraphviz#129
+  patches = [
+    # pygraphviz depends on graphviz being in PATH. This patch always prepends
+    # graphviz to PATH.
+    ./graphviz-path.patch
+  ];
+  postPatch = ''
+    substituteInPlace pygraphviz/agraph.py --subst-var-by graphvizPath '${graphviz}/bin'
+  '';
+
+  # The tests are currently failing because of a bug in graphviz 2.40.1.
+  # Upstream does not want to skip the relevant tests:
+  # https://github.com/pygraphviz/pygraphviz/pull/129
   doCheck = false;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
new file mode 100644
index 000000000000..dde6df967f0d
--- /dev/null
+++ b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
@@ -0,0 +1,13 @@
+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
+index 8f72024..2d8358e 100644
+--- a/pygraphviz/agraph.py
++++ b/pygraphviz/agraph.py
+@@ -1557,7 +1557,7 @@ class AGraph(object):
+         import os
+         import glob
+ 
+-        paths = os.environ["PATH"]
++        paths = '@graphvizPath@:' + os.environ["PATH"]
+         if os.name == "nt":
+             exe = ".exe"
+         else:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be0cfdb6ce3c..0e9becdde378 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3033,7 +3033,9 @@ in {
 
   graphviz = callPackage ../development/python-modules/graphviz { };
 
-  pygraphviz = callPackage ../development/python-modules/pygraphviz { };
+  pygraphviz = callPackage ../development/python-modules/pygraphviz {
+    graphviz = pkgs.graphviz; # not the python package
+  };
 
   pymc3 = callPackage ../development/python-modules/pymc3 { };
 

From d9eb8c760ea776a5d175e02f92abbca02f7aea9b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 4 Dec 2018 12:04:03 +0000
Subject: [PATCH 061/199] doc: reminder to upgrade linux-libre with linux

https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444061264
---
 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 c4354acf0ca8..40bfffe8b4de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14602,7 +14602,9 @@ in
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
-  # Don't forget to update linuxPackages_latest!
+  # When adding to this list:
+  # - Update linuxPackages_latest to the latest version
+  # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one.
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
   linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;

From d13f9de5ef7479cd727d343b212f3731f8ec3054 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 4 Dec 2018 00:49:31 -0800
Subject: [PATCH 062/199] noto-fonts: update 2017-10-24 -> 2018-11-30

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>
---
 pkgs/data/fonts/noto-fonts/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index ae8d358164f4..5043e031c08f 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -2,11 +2,14 @@
 
 let
   mkNoto = { name, weights, sha256, }:
-    let version = "2017-10-24-phase3-second-cleanup"; in
+    let
+      version = "2018-11-30";
+      ref = "85e78f831469323c85847e23f95026c894159135";
+    in
     fetchzip {
       name = "${name}-${version}";
       inherit sha256;
-      url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
+      url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip";
       postFetch = ''
         unzip $downloadedFile
         mkdir -p $out/share/fonts/noto
@@ -47,12 +50,12 @@ rec {
   noto-fonts = mkNoto {
     name = "noto-fonts";
     weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
-    sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb";
+    sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d";
   };
   noto-fonts-extra = mkNoto {
     name = "noto-fonts-extra";
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
-    sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc";
+    sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
   };
   noto-fonts-cjk = let version = "1.004"; in fetchzip {
     name = "noto-fonts-cjk-${version}";

From fa749ac8589eb95732f989ad5debf1a6e0ec4ebc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 4 Dec 2018 12:08:30 +0000
Subject: [PATCH 063/199] linux_latest-libre: document finding latest rev

https://github.com/NixOS/nixpkgs/pull/51403#issuecomment-444064006
---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index c240bdc364d7..104dc457d6c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,6 +1,9 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/";
+    
+    # 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 = "15715";
     sha256 = "1mz1xv860ddxz7dfp4l6q25hlsh532aapvylq703jskgbzsfinxh";
   }

From 2f98b1c112f7db28b487e53e0a66e44a61d60cfa Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 4 Dec 2018 13:33:34 +0100
Subject: [PATCH 064/199] spotify: 1.0.93.242.gc2341a27-15 ->
 1.0.94.262.g3d5c231c-9

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 15aaab40a678..c5c3724df2ad 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,14 +5,14 @@
 let
   # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
   # "rev" decides what is actually being downloaded
-  version = "1.0.93.242.gc2341a27-15";
+  version = "1.0.94.262.g3d5c231c-9";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "24";
+  rev = "28";
 
 
   deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "920d55b3dcad4ac6acd9bc73c8ad8eb1668327a175da465ce3d8bba2430da47aaefa5218659315fab43b5182611eb03047d4e2679c1345c57380b7def7a1212d";
+    sha512 = "ca8e2eb45ea7ef6396382298822969994aca86cca8ba122ec1521c593e621161267943fe5515bb8747037ecbbfbd05cffbbca017f8f4b1c9fbd216e1d6a9e8cb";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];

From 5fc63b32f7ba2da95b332136ab55d1de05d64f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 00:44:07 -0200
Subject: [PATCH 065/199] nordic-polar: init at 1.3.0

---
 pkgs/data/themes/nordic-polar/default.nix | 35 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/data/themes/nordic-polar/default.nix

diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
new file mode 100644
index 000000000000..305f59529479
--- /dev/null
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "nordic-polar-${version}";
+  version = "1.3.0";
+
+  srcs = [
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
+      sha256 = "1c5zgymkwd89fr680c49siwbkhfbay56iq9vlyqkj1dp0xnc528s";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
+      sha256 = "0nxzcgqzc42qvnhafranz6rwanqb4wzf9ychm5m4yrlp3ngw38p4";
+    })
+  ];
+
+  sourceRoot = ".";
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Nordic-Polar* $out/share/themes
+    rm $out/share/themes/*/{LICENSE,README.md}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gtk theme created using the awesome Nord color pallete";
+    homepage = https://github.com/EliverLara/Nordic-Polar;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca8..40f36a4b3510 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15478,6 +15478,8 @@ in
 
   nafees = callPackage ../data/fonts/nafees { };
 
+  nordic-polar = callPackage ../data/themes/nordic-polar { };
+
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra;
 

From eff0cf020fa5fe93b7ee8ac968537cbbd34d85a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 00:30:12 -0200
Subject: [PATCH 066/199] materia-theme: 20181115 -> 20181125

---
 pkgs/misc/themes/materia-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index e96e3ce895f3..f081078d3afd 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20181115";
+  version = "20181125";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "1vfwzvzbs4336vjg6y4asm21p64xc5f7cfsld5l159174ikcz5fp";
+    sha256 = "17gsgll2m534lwvpffqisdmhhmn0da419wnpq39wv5cjnmk0q3by";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];

From c46915c9c1604c057026547a64014f430bbc15ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 10:56:57 -0200
Subject: [PATCH 067/199] materia-theme: move to pkgs/data/themes

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

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
similarity index 100%
rename from pkgs/misc/themes/materia-theme/default.nix
rename to pkgs/data/themes/materia-theme/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca8..e2e08ee676d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15438,6 +15438,8 @@ in
 
   man-pages = callPackage ../data/documentation/man-pages { };
 
+  materia-theme = callPackage ../data/themes/materia-theme { };
+
   material-icons = callPackage ../data/fonts/material-icons { };
 
   meslo-lg = callPackage ../data/fonts/meslo-lg {};
@@ -22197,9 +22199,6 @@ in
 
   matcha = callPackage ../misc/themes/matcha { };
 
-  # previously known as flat-plat
-  materia-theme = callPackage ../misc/themes/materia-theme { };
-
   mess = callPackage ../misc/emulators/mess {
     inherit (pkgs.gnome2) GConf;
   };

From 995defbb9bd488a5d540f8420d3277644fed9aef Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 2 Dec 2018 00:56:16 +0100
Subject: [PATCH 068/199] build-support writers: content can be string or file

---
 pkgs/build-support/writers/default.nix | 147 ++++++++++++++-----------
 pkgs/build-support/writers/test.nix    |  21 +++-
 2 files changed, 105 insertions(+), 63 deletions(-)

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 8aa3e52f5e8b..ef520f68320a 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -8,19 +8,54 @@ rec {
   # Examples:
   #   writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; }
   #   makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
-  makeScriptWriter = { interpreter, check ? "" }: name: text:
-    assert lib.or (types.path.check name) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" name != null);
+  makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
+    assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
+    assert lib.or (types.path.check content) (types.string.check content);
+    let
+      name = last (builtins.split "/" nameOrPath);
+    in
 
-    pkgs.writeTextFile {
-      name = last (builtins.split "/" name);
-      executable = true;
-      destination = if types.path.check name then name else "";
-      text = ''
-        #! ${interpreter}
-        ${text}
-        '';
-      checkPhase = check;
-    };
+    pkgs.runCommand name (if (types.string.check content) then {
+      inherit content interpreter;
+      passAsFile = [ "content" ];
+    } else {
+      inherit interpreter;
+      contentPath = content;
+    }) ''
+      echo "#! $interpreter" > $out
+      cat "$contentPath" >> $out
+      chmod +x $out
+      ${optionalString (types.path.check nameOrPath) ''
+        mv $out tmp
+        mkdir -p $out/$(dirname "${nameOrPath}")
+        mv tmp $out/${nameOrPath}
+      ''}
+    '';
+
+  # Base implementation for compiled executables.
+  # Takes a compile script, which in turn takes the name as an argument.
+  #
+  # Examples:
+  #   writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
+  makeBinWriter = { compileScript }: nameOrPath: content:
+    assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
+    assert lib.or (types.path.check content) (types.string.check content);
+    let
+      name = last (builtins.split "/" nameOrPath);
+    in
+    pkgs.runCommand name (if (types.string.check content) then {
+      inherit content;
+      passAsFile = [ "content" ];
+    } else {
+      contentPath = content;
+    }) ''
+      ${compileScript}
+      ${optionalString (types.path.check nameOrPath) ''
+        mv $out tmp
+        mkdir -p $out/$(dirname "${nameOrPath}")
+        mv tmp $out/${nameOrPath}
+      ''}
+    '';
 
   # Like writeScript but the first line is a shebang to bash
   #
@@ -48,41 +83,33 @@ rec {
   #        return 0;
   #      }
   #    ''
-  writeC = name: {
-    libraries ? [],
-  }: text: pkgs.runCommand name {
-    inherit text;
-    buildInputs = [ pkgs.pkgconfig ] ++ libraries;
-    passAsFile = [ "text" ];
-  } ''
-    PATH=${makeBinPath [
-      pkgs.binutils-unwrapped
-      pkgs.coreutils
-      pkgs.gcc
-      pkgs.pkgconfig
-    ]}
-    mkdir -p "$(dirname "$out")"
-    gcc \
-        ${optionalString (libraries != [])
-          "$(pkg-config --cflags --libs ${
-            concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
-          })"
-        } \
-        -O \
-        -o "$out" \
-        -Wall \
-        -x c \
-        "$textPath"
-    strip --strip-unneeded "$out"
-  '';
+  writeC = name: { libraries ? [] }:
+    makeBinWriter {
+      compileScript = ''
+        PATH=${makeBinPath [
+          pkgs.binutils-unwrapped
+          pkgs.coreutils
+          pkgs.gcc
+          pkgs.pkgconfig
+        ]}
+        gcc \
+            ${optionalString (libraries != [])
+              "$(pkgs.pkgconfig}/bin/pkg-config --cflags --libs ${
+                concatMapStringsSep " " (lib: escapeShellArg (builtins.parseDrvName lib.name).name) (libraries)
+              })"
+            } \
+            -O \
+            -o "$out" \
+            -Wall \
+            -x c \
+            "$contentPath"
+        strip --strip-unneeded "$out"
+      '';
+    } name;
 
   # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin)
-  writeCBin = name: spec: text:
-    pkgs.runCommand name {
-    } ''
-      mkdir -p $out/bin
-      ln -s ${writeC name spec text} $out/bin/${name}
-    '';
+  writeCBin = name:
+    writeC "/bin/${name}";
 
   # Like writeScript but the first line is a shebang to dash
   #
@@ -103,29 +130,25 @@ rec {
   #
   # Example:
   #   writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
-  #     Import Acme.Missiles
+  #     import Acme.Missiles
   #
   #     main = launchMissiles
   #   '';
   writeHaskell = name: {
     libraries ? [],
     ghc ? pkgs.ghc
-  }: text: pkgs.runCommand name {
-    inherit text;
-    passAsFile = [ "text" ];
-  } ''
-    cp $textPath ${name}.hs
-    ${ghc.withPackages (_: libraries )}/bin/ghc ${name}.hs
-    cp ${name} $out
-  '';
+  }:
+    makeBinWriter {
+      compileScript = ''
+        cp $contentPath tmp.hs
+        ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs
+        mv tmp $out
+      '';
+    } name;
 
   # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin)
-  writeHaskellBin = name: spec: text:
-    pkgs.runCommand name {
-    } ''
-      mkdir -p $out/bin
-      ln -s ${writeHaskell name spec text} $out/bin/${name}
-    '';
+  writeHaskellBin = name:
+    writeHaskell "/bin/${name}";
 
   # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and
   # returns an executable
@@ -137,7 +160,7 @@ rec {
   #     var result = UglifyJS.minify(code);
   #     console.log(result.code);
   #   ''
-  writeJS = name: { libraries ? [] }: text:
+  writeJS = name: { libraries ? [] }: content:
   let
     node-env = pkgs.buildEnv {
       name = "node";
@@ -148,7 +171,7 @@ rec {
     };
   in writeDash name ''
     export NODE_PATH=${node-env}/lib/node_modules
-    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" text}
+    exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content}
   '';
 
   # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin)
diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 68b7b27e6130..80e9543f9c85 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers}:
+{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }:
 with writers;
 let
 
@@ -128,6 +128,24 @@ let
     '';
   };
 
+
+  path = {
+    bash = writeBash "test_bash" (writeText "test" ''
+      if [[ "test" == "test" ]]; then echo "success"; fi
+    '');
+    haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" ''
+      import Data.Default
+
+      int :: Int
+      int = def
+
+      main :: IO ()
+      main = case int of
+        18871 -> putStrLn $ id "success"
+        _ -> print "fail"
+    '');
+  };
+
   writeTest = expectedValue: test:
     writeDash "test-writers" ''
       if test "$(${test})" != "${expectedValue}"; then
@@ -142,6 +160,7 @@ in runCommand "test-writers" {
 } ''
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)}
   ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)}
+  ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)}
 
   echo 'nix-writers successfully tested' >&2
   touch $out

From fca4fbeba957ec6bc72c98c019bbc5f01712d15b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 4 Dec 2018 17:50:45 +0100
Subject: [PATCH 069/199] Revert "libgit2: 0.26.6 -> 0.26.8"

This reverts commit 28b4b4b1e49309e465e0c35adb655007a08c2f23.

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

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 925e253b606f..48d595137b3d 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation (rec {
   name = "libgit2-${version}";
-  version = "0.26.8";
+  version = "0.26.6";
   # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "0wmjgvz8nrpk2dsn5bcc87nl0j5hb6pah2hzrj0b6jkk9mnin9fl";
+    sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
   };
 
   cmakeFlags = [ "-DTHREADSAFE=ON" ];

From 7f06f36ffb00e7d9206692649356f9f8c7acb2a7 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jot@internetgruppen.dk>
Date: Tue, 4 Dec 2018 18:02:34 +0100
Subject: [PATCH 070/199] kubernetes: 1.12.2 -> 1.12.3 (#51482)

---
 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 c3ed2d16df18..bf42fb7da16e 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 {
   name = "kubernetes-${version}";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "14w77yw8pd2y5d764byh31vv9203y38zlvcr1a9wylrs00kgzwfw";
+    sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];

From a995836356dfb7518d7d262a56350294c9cecf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Dec 2018 17:17:14 +0000
Subject: [PATCH 071/199] dino: enable parallel building

---
 .../applications/networking/instant-messengers/dino/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 2c5d7005ef8c..d2cbf7bbdfc6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
     gettext
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Modern Jabber/XMPP Client using GTK+/Vala";
     homepage = https://github.com/dino/dino;

From 445f79af1cde9af86aaea092006e5aff2c69d998 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 4 Dec 2018 20:22:26 +0300
Subject: [PATCH 072/199] pythonPackages.python-fontconfig: regenerate sources
 using cython

---
 .../python-modules/python-fontconfig/default.nix           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix
index 872fffb7576a..dbfde18a8741 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/pkgs/development/python-modules/python-fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }:
+{ lib, buildPythonPackage, fetchPypi, fontconfig, python, cython, freefont_ttf, makeFontsConf }:
 
 let
   fontsConf = makeFontsConf {
@@ -14,6 +14,11 @@ in buildPythonPackage rec {
   };
 
   buildInputs = [ fontconfig ];
+  nativeBuildInputs = [ cython ];
+
+  preBuild = ''
+    ${python.interpreter} setup.py build_ext -i
+  '';
 
   checkPhase = ''
     export FONTCONFIG_FILE=${fontsConf};

From e728ff5ade7e79333f35dd1319c2acb3f492e8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Dec 2018 17:45:41 -0200
Subject: [PATCH 073/199] zafiro-icons: 0.7.2 -> 0.7.3

---
 pkgs/data/icons/zafiro-icons/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index ac52d70bbc8a..dd8695232676 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -3,21 +3,21 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zafiro-icons";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rs3wazmvidlkig5q7x1n9nz7jhfq18wps3wsplax9zcdy0hv248";
+    sha256 = "02q3wcklmqdy4ycyly7477q98y3mkgnpr7c78jqxvy2yr486wwyx";
   };
 
   nativeBuildInputs = [ gtk3 ];
 
   installPhase = ''
-    mkdir -p $out/share/icons/Zafiro
-    cp -a * $out/share/icons/Zafiro
-    gtk-update-icon-cache "$out"/share/icons/Zafiro
+    mkdir -p $out/share/icons/Zafiro-icons
+    cp -a * $out/share/icons/Zafiro-icons
+    gtk-update-icon-cache "$out"/share/icons/Zafiro-icons
   '';
 
   meta = with stdenv.lib; {

From eaef9bc7d6f35d0b9464a29676b4fef2dee99af7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 13 Nov 2018 14:12:09 +0100
Subject: [PATCH 074/199] pythonPackages.arelle: 2017-08-24 -> 18.3

---
 .../python-modules/arelle/default.nix         | 35 ++++++++++++-------
 .../python-modules/arelle/tests.patch         | 20 +----------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 862564dbcd15..78cd2fca8376 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -1,13 +1,12 @@
 { gui ? true,
   buildPythonPackage, fetchFromGitHub, lib,
-  sphinx_1_2, lxml, isodate, numpy, pytest,
-  tkinter ? null, py3to2, isPy3k,
+  sphinx, lxml, isodate, numpy, pytest, openpyxl,
+  tkinter ? null, py3to2, isPy3k, python,
   ... }:
 
 buildPythonPackage rec {
-  pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
-  version = "2017-08-24";
-  name = pname + "-" + version;
+  pname = "arelle${lib.optionalString (!gui) "-headless"}";
+  version = "18.3";
 
   disabled = !isPy3k;
 
@@ -16,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Arelle";
     repo = "Arelle";
-    rev = "cb24e35d57b562a864ae3dd4542c4d9fcf3865fe";
-    sha256 = "1sbvhb3xlfnyvf1xj9dxwpcrfiaf7ikkdwvvap7aaxfxgiz85ip2";
+    rev = "edgr${version}";
+    sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33";
   };
   outputs = ["out" "doc"];
   patches = [
@@ -25,7 +24,7 @@ buildPythonPackage rec {
   ];
   postPatch = "rm testParser2.py";
   buildInputs = [
-    sphinx_1_2
+    sphinx
     pytest
     py3to2
   ];
@@ -33,6 +32,7 @@ buildPythonPackage rec {
     lxml
     isodate
     numpy
+    openpyxl
   ] ++ lib.optional gui [
     tkinter
   ];
@@ -40,6 +40,12 @@ buildPythonPackage rec {
   # arelle-gui is useless without gui dependencies, so delete it when !gui.
   postInstall = lib.optionalString (!gui) ''
     find $out/bin -name "*arelle-gui*" -delete
+  '' +
+  # By default, not the entirety of the src dir is copied. This means we don't
+  # copy the `images` dir, which is needed for the gui version.
+  lib.optionalString (gui) ''
+    targetDir=$out/${python.sitePackages}
+    cp -vr $src/arelle $targetDir
   '';
 
   # Documentation
@@ -49,11 +55,14 @@ buildPythonPackage rec {
 
   doCheck = if gui then true else false;
 
-  meta = {
-    description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface";
+  meta = with lib; {
+    description = ''
+      An open source facility for XBRL, the eXtensible Business Reporting
+      Language supporting various standards, exposed through a Python or
+      REST API'' + lib.optionalString gui " and a graphical user interface";
     homepage = http://arelle.org/;
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ roberth ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ roberth ];
   };
 }
diff --git a/pkgs/development/python-modules/arelle/tests.patch b/pkgs/development/python-modules/arelle/tests.patch
index 3e4aa0cd94a7..e34cda99b251 100644
--- a/pkgs/development/python-modules/arelle/tests.patch
+++ b/pkgs/development/python-modules/arelle/tests.patch
@@ -3,7 +3,7 @@ index a64bb1b..dc0299d 100644
 --- c/arelle/CntlrProfiler.py
 +++ i/arelle/CntlrProfiler.py
 @@ -1,5 +1,6 @@
- 
+
 -import Cntlr, ModelManager, FileSource, time
 +from arelle import Cntlr, ModelManager, FileSource
 +import time
@@ -12,21 +12,3 @@ index a64bb1b..dc0299d 100644
  import gettext
 diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py
 index 12dbbbb..c0e98c3 100644
---- c/arelle/ValidateFilingText.py
-+++ i/arelle/ValidateFilingText.py
-@@ -16,7 +16,7 @@ XMLdeclaration = re.compile(r"<\?xml.*\?>", re.DOTALL)
- XMLpattern = re.compile(r".*(<|&lt;|&#x3C;|&#60;)[A-Za-z_]+[A-Za-z0-9_:]*[^>]*(/>|>|&gt;|/&gt;).*", re.DOTALL)
- CDATApattern = re.compile(r"<!\[CDATA\[(.+)\]\]")
- #EFM table 5-1 and all &xxx; patterns
--docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\m\f]") # won't match &#nnn;
-+docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\f]") # won't match &#nnn;
- namedEntityPattern = re.compile("&[_A-Za-z\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]"
-                                 r"[_\-\.:" 
-                                 "\xB7A-Za-z0-9\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u0300-\u036F\u203F-\u2040]*;")
-@@ -904,4 +904,4 @@ def referencedFiles(modelXbrl, localFilesOnly=True):
-     # footnote or other elements
-     for elt in modelXbrl.modelDocument.xmlRootElement.iter("{http://www.w3.org/1999/xhtml}a", "{http://www.w3.org/1999/xhtml}img"):
-         addReferencedFile(elt, elt)
--    return referencedFiles
-\ No newline at end of file
-+    return referencedFiles

From 315b4c4543e7084cec3db1ec775dfd7f0cc7fec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 4 Dec 2018 21:12:10 +0100
Subject: [PATCH 075/199] pythonPackages.sphinx_1_2: remove

---
 pkgs/top-level/python-packages.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ff6217ad342..eb54778936a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3904,18 +3904,6 @@ in {
 
   sphinx = callPackage ../development/python-modules/sphinx { };
 
-  sphinx_1_2 = self.sphinx.overridePythonAttrs rec {
-    name = "sphinx-1.2.3";
-    version = "1.2.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
-      sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
-    };
-    postPatch = '''';
-    # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
-    doCheck = false;
-  };
-
   sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
 
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };

From 88b63b2505f787ba223ad39f3f35d7cc736a38fa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 4 Dec 2018 20:06:09 +0100
Subject: [PATCH 076/199] gitlab: 11.5.0 -> 11.5.1

---
 .../version-management/gitlab/data.json       |  28 ++--
 .../gitlab/gitlab-workhorse/default.nix       |   4 +-
 .../gitlab/rubyEnv-ce/Gemfile                 |  28 ++--
 .../gitlab/rubyEnv-ce/Gemfile.lock            |  82 +++-------
 .../gitlab/rubyEnv-ce/gemset.nix              | 154 +++++-------------
 .../gitlab/rubyEnv-ee/Gemfile                 |  28 ++--
 .../gitlab/rubyEnv-ee/Gemfile.lock            |  82 +++-------
 .../gitlab/rubyEnv-ee/gemset.nix              | 154 +++++-------------
 8 files changed, 158 insertions(+), 402 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index e2be6fb2a908..b748e7c49bd2 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,32 +1,32 @@
 {
   "ce": {
-    "version": "11.5.0",
-    "repo_hash": "0cjkkap3n9g9zahrxk99a330ahyb6cvx97dsnrxcdsn0cbrsxsrb",
-    "deb_hash": "0kn7mg1lk4gvc3x76z4rbh0j03b0wk6x1p5938wx8sc50k0bgrcp",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.0-ce.0_amd64.deb/download.deb",
+    "version": "11.5.1",
+    "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5",
+    "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ce",
-    "rev": "v11.5.0",
+    "rev": "v11.5.1",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
-      "GITLAB_PAGES_VERSION": "1.3.0",
+      "GITLAB_PAGES_VERSION": "1.3.1",
       "GITLAB_SHELL_VERSION": "8.4.1",
-      "GITLAB_WORKHORSE_VERSION": "7.1.0"
+      "GITLAB_WORKHORSE_VERSION": "7.1.3"
     }
   },
   "ee": {
-    "version": "11.5.0",
-    "repo_hash": "1s2jr7vhbpklpcfjxgxnmq0zq14hh2aa6akdsb7ld7fj5lmzp00z",
-    "deb_hash": "108mgmlf947h200qrwg71ilhq5ihr4awxns6lqs2wa90ph9yq25c",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.0-ee.0_amd64.deb/download.deb",
+    "version": "11.5.1",
+    "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp",
+    "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ee",
-    "rev": "v11.5.0-ee",
+    "rev": "v11.5.1-ee",
     "passthru": {
       "GITALY_SERVER_VERSION": "0.129.0",
-      "GITLAB_PAGES_VERSION": "1.3.0",
+      "GITLAB_PAGES_VERSION": "1.3.1",
       "GITLAB_SHELL_VERSION": "8.4.1",
-      "GITLAB_WORKHORSE_VERSION": "7.1.0"
+      "GITLAB_WORKHORSE_VERSION": "7.1.3"
     }
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index e77dbc323a3c..b0d282e8799c 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "gitlab-workhorse-${version}";
 
-  version = "7.1.0";
+  version = "7.1.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1jq28z2kf58wnbv8jkwfx2bm8ki22hpm9ssdy2ymza22gq0zx00g";
+    sha256 = "1r75jj0xb4jv5fq2ihxk0vlv43gsk523zx86076mwph1g75gi1nz";
   };
 
   buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index ecbfba0827d2..c7efa790cfd8 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -79,13 +79,6 @@ gem 'gpgme'
 gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
-# Git Wiki
-# Only used to compute wiki page slugs
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-
-# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-
 # API
 gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
@@ -146,6 +139,7 @@ gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
+gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
 gem 'icalendar'
@@ -159,6 +153,11 @@ group :unicorn do
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
+group :puma do
+  gem 'puma', '~> 3.12', require: false
+  gem 'puma_worker_killer', require: false
+end
+
 # State machine
 gem 'state_machines-activerecord', '~> 0.5.1'
 
@@ -212,7 +211,7 @@ gem 'hipchat', '~> 1.5.0'
 gem 'jira-ruby', '~> 1.4'
 
 # Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'flowdock', '~> 0.7'
 
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
@@ -245,9 +244,6 @@ gem 'rack-attack', '~> 4.4.1'
 # Ace editor
 gem 'ace-rails-ap', '~> 4.1.0'
 
-# Keyboard shortcuts
-gem 'mousetrap-rails', '~> 1.4.6'
-
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.5'
 
@@ -420,11 +416,10 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
+gem 'grpc', '~> 1.15.0'
 
-# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.6'
 
 gem 'toml-rb', '~> 1.0.0', require: false
 
@@ -436,6 +431,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
 # Structured logging
 gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
-
-# Asset synchronization
-gem 'asset_sync', '~> 2.4'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index e215f12bbe6e..db8cc34060e4 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -58,11 +58,6 @@ GEM
     asciidoctor (1.5.6.2)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
-    asset_sync (2.4.0)
-      activemodel (>= 4.1.0)
-      fog-core
-      mime-types (>= 2.99)
-      unf
     ast (2.4.0)
     atomic (1.1.99)
     attr_encrypted (3.1.0)
@@ -274,32 +269,9 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.118.1)
-      google-protobuf (~> 3.1)
-      grpc (~> 1.10)
-    github-linguist (5.3.3)
-      charlock_holmes (~> 0.7.5)
-      escape_utils (~> 1.1.0)
-      mime-types (>= 1.19)
-      rugged (>= 0.25.1)
+    gitaly-proto (0.123.0)
+      grpc (~> 1.0)
     github-markup (1.7.0)
-    gitlab-flowdock-git-hook (1.0.1)
-      flowdock (~> 0.7)
-      gitlab-grit (>= 2.4.1)
-      multi_json
-    gitlab-gollum-lib (4.2.7.5)
-      gemojione (~> 3.2)
-      github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
-      nokogiri (>= 1.6.1, < 2.0)
-      rouge (~> 3.1)
-      sanitize (~> 4.6.4)
-      stringex (~> 2.6)
-    gitlab-grit (2.8.2)
-      charlock_holmes (~> 0.6)
-      diff-lcs (~> 1.1)
-      mime-types (>= 1.16)
-      posix-spawn (~> 0.3)
     gitlab-markup (1.6.4)
     gitlab-sidekiq-fetcher (0.3.0)
       sidekiq (~> 5)
@@ -314,8 +286,6 @@ GEM
       rubyntlm (~> 0.5)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    gollum-grit_adapter (1.0.1)
-      gitlab-grit (~> 2.7, >= 2.7.1)
     gon (6.2.0)
       actionpack (>= 3.0)
       multi_json
@@ -327,16 +297,15 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.5.1)
-    googleapis-common-protos-types (1.0.1)
+    google-protobuf (3.6.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    googleauth (0.6.2)
+    googleauth (0.6.6)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
@@ -360,10 +329,9 @@ GEM
       railties
       sprockets-rails
     graphql (1.8.1)
-    grpc (1.11.0)
+    grpc (1.15.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
@@ -465,11 +433,7 @@ GEM
       xml-simple
     licensee (8.9.2)
       rugged (~> 0.24)
-    little-plugger (1.1.4)
     locale (2.1.2)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     lograge (0.10.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -493,7 +457,6 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
-    mousetrap-rails (1.4.6)
     msgpack (1.2.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -575,9 +538,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
@@ -605,7 +568,6 @@ GEM
     pg (0.18.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
-    posix-spawn (0.3.13)
     powerpack (0.1.1)
     premailer (1.10.4)
       addressable
@@ -629,6 +591,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    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)
     rack (1.6.11)
     rack-accept (0.4.5)
@@ -797,7 +763,7 @@ GEM
     rubyzip (1.2.2)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.4)
+    rugged (0.27.5)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -843,7 +809,7 @@ GEM
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    signet (0.8.1)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -876,7 +842,6 @@ GEM
     state_machines-activerecord (0.5.1)
       activerecord (>= 4.1, < 6.0)
       state_machines-activemodel (>= 0.5.0)
-    stringex (2.8.4)
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
@@ -968,7 +933,6 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print
   babosa (~> 1.0.2)
@@ -1006,6 +970,7 @@ DEPENDENCIES
   ed25519 (~> 1.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  escape_utils (~> 1.1)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   fast_blank
@@ -1013,6 +978,7 @@ DEPENDENCIES
   flipper (~> 0.13.0)
   flipper-active_record (~> 0.13.0)
   flipper-active_support_cache_store (~> 0.13.0)
+  flowdock (~> 0.7)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
@@ -1027,18 +993,15 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
+  gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
-  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-gollum-lib (~> 4.2)
   gitlab-markup (~> 1.6.4)
   gitlab-sidekiq-fetcher
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (= 3.5.1)
+  google-protobuf (~> 3.6)
   gpgme
   grape (~> 1.1)
   grape-entity (~> 0.7.1)
@@ -1046,7 +1009,7 @@ DEPENDENCIES
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.8.0)
-  grpc (~> 1.11.0)
+  grpc (~> 1.15.0)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.8.8)
   hangouts-chat (~> 0.0.5)
@@ -1075,7 +1038,6 @@ DEPENDENCIES
   method_source (~> 0.8)
   mini_magick
   minitest (~> 5.7.0)
-  mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
   net-ssh (~> 5.0)
@@ -1109,6 +1071,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
@@ -1187,4 +1151,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index dfbd535aaa82..64fbac6d4373 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -164,15 +164,6 @@
     };
     version = "0.0.8";
   };
-  asset_sync = {
-    dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
-      type = "gem";
-    };
-    version = "2.4.0";
-  };
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1066,22 +1057,13 @@
     version = "1.3.0";
   };
   gitaly-proto = {
-    dependencies = ["google-protobuf" "grpc"];
+    dependencies = ["grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
+      sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
       type = "gem";
     };
-    version = "0.118.1";
-  };
-  github-linguist = {
-    dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
-      type = "gem";
-    };
-    version = "5.3.3";
+    version = "0.123.0";
   };
   github-markup = {
     source = {
@@ -1091,33 +1073,6 @@
     };
     version = "1.7.0";
   };
-  gitlab-flowdock-git-hook = {
-    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  gitlab-gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
-      type = "gem";
-    };
-    version = "4.2.7.5";
-  };
-  gitlab-grit = {
-    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
-      type = "gem";
-    };
-    version = "2.8.2";
-  };
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1162,15 +1117,6 @@
     };
     version = "0.4.1";
   };
-  gollum-grit_adapter = {
-    dependencies = ["gitlab-grit"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
   gon = {
     dependencies = ["actionpack" "multi_json" "request_store"];
     source = {
@@ -1192,28 +1138,28 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
+      sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.6.1";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   googleauth = {
-    dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
+      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.6";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1278,13 +1224,13 @@
     version = "1.8.1";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
+      sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.15.0";
   };
   haml = {
     dependencies = ["temple" "tilt"];
@@ -1649,14 +1595,6 @@
     };
     version = "8.9.2";
   };
-  little-plugger = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
-      type = "gem";
-    };
-    version = "1.1.4";
-  };
   locale = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1665,15 +1603,6 @@
     };
     version = "2.1.2";
   };
-  logging = {
-    dependencies = ["little-plugger" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
-      type = "gem";
-    };
-    version = "2.2.2";
-  };
   lograge = {
     dependencies = ["actionpack" "activesupport" "railties" "request_store"];
     source = {
@@ -1791,14 +1720,6 @@
     };
     version = "5.7.0";
   };
-  mousetrap-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
-      type = "gem";
-    };
-    version = "1.4.6";
-  };
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2114,10 +2035,10 @@
   os = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
       type = "gem";
     };
-    version = "0.9.6";
+    version = "1.0.0";
   };
   parallel = {
     source = {
@@ -2131,10 +2052,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.3.0";
   };
   parslet = {
     source = {
@@ -2215,14 +2136,6 @@
     };
     version = "1.0.1";
   };
-  posix-spawn = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
-      type = "gem";
-    };
-    version = "0.3.13";
-  };
   powerpack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2309,6 +2222,23 @@
     };
     version = "3.0.3";
   };
+  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"];
@@ -2916,10 +2846,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
+      sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
       type = "gem";
     };
-    version = "0.27.4";
+    version = "0.27.5";
   };
   safe_yaml = {
     source = {
@@ -3075,10 +3005,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.11.0";
   };
   simple_po_parser = {
     source = {
@@ -3199,14 +3129,6 @@
     };
     version = "0.5.1";
   };
-  stringex = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
-      type = "gem";
-    };
-    version = "2.8.4";
-  };
   sys-filesystem = {
     dependencies = ["ffi"];
     source = {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index ef14aace277e..fc31db6278df 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -82,13 +82,6 @@ gem 'gpgme'
 gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
-# Git Wiki
-# Only used to compute wiki page slugs
-gem 'gitlab-gollum-lib', '~> 4.2', require: false
-
-# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-
 # API
 gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
@@ -156,6 +149,7 @@ gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
+gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
 gem 'icalendar'
@@ -169,6 +163,11 @@ group :unicorn do
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
+group :puma do
+  gem 'puma', '~> 3.12', require: false
+  gem 'puma_worker_killer', require: false
+end
+
 # State machine
 gem 'state_machines-activerecord', '~> 0.5.1'
 
@@ -222,7 +221,7 @@ gem 'hipchat', '~> 1.5.0'
 gem 'jira-ruby', '~> 1.4'
 
 # Flowdock integration
-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+gem 'flowdock', '~> 0.7'
 
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
@@ -255,9 +254,6 @@ gem 'rack-attack', '~> 4.4.1'
 # Ace editor
 gem 'ace-rails-ap', '~> 4.1.0'
 
-# Keyboard shortcuts
-gem 'mousetrap-rails', '~> 1.4.6'
-
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.5'
 
@@ -435,11 +431,10 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
+gem 'grpc', '~> 1.15.0'
 
-# Locked until https://github.com/google/protobuf/issues/4210 is closed
-gem 'google-protobuf', '= 3.5.1'
+gem 'google-protobuf', '~> 3.6'
 
 gem 'toml-rb', '~> 1.0.0', require: false
 
@@ -451,6 +446,3 @@ gem 'flipper-active_support_cache_store', '~> 0.13.0'
 # Structured logging
 gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
-
-# Asset synchronization
-gem 'asset_sync', '~> 2.4'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index 28018c6c5c22..7c52bc32632c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -58,11 +58,6 @@ GEM
     asciidoctor (1.5.6.2)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
-    asset_sync (2.4.0)
-      activemodel (>= 4.1.0)
-      fog-core
-      mime-types (>= 2.99)
-      unf
     ast (2.4.0)
     atomic (1.1.99)
     attr_encrypted (3.1.0)
@@ -298,32 +293,9 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.118.1)
-      google-protobuf (~> 3.1)
-      grpc (~> 1.10)
-    github-linguist (5.3.3)
-      charlock_holmes (~> 0.7.5)
-      escape_utils (~> 1.1.0)
-      mime-types (>= 1.19)
-      rugged (>= 0.25.1)
+    gitaly-proto (0.123.0)
+      grpc (~> 1.0)
     github-markup (1.7.0)
-    gitlab-flowdock-git-hook (1.0.1)
-      flowdock (~> 0.7)
-      gitlab-grit (>= 2.4.1)
-      multi_json
-    gitlab-gollum-lib (4.2.7.5)
-      gemojione (~> 3.2)
-      github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
-      nokogiri (>= 1.6.1, < 2.0)
-      rouge (~> 3.1)
-      sanitize (~> 4.6.4)
-      stringex (~> 2.6)
-    gitlab-grit (2.8.2)
-      charlock_holmes (~> 0.6)
-      diff-lcs (~> 1.1)
-      mime-types (>= 1.16)
-      posix-spawn (~> 0.3)
     gitlab-license (1.0.0)
     gitlab-markup (1.6.4)
     gitlab-sidekiq-fetcher (0.3.0)
@@ -339,8 +311,6 @@ GEM
       rubyntlm (~> 0.5)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    gollum-grit_adapter (1.0.1)
-      gitlab-grit (~> 2.7, >= 2.7.1)
     gon (6.2.0)
       actionpack (>= 3.0)
       multi_json
@@ -352,16 +322,15 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.5.1)
-    googleapis-common-protos-types (1.0.1)
+    google-protobuf (3.6.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    googleauth (0.6.2)
+    googleauth (0.6.6)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
@@ -385,10 +354,9 @@ GEM
       railties
       sprockets-rails
     graphql (1.8.1)
-    grpc (1.11.0)
+    grpc (1.15.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     haml (5.0.4)
@@ -493,11 +461,7 @@ GEM
       xml-simple
     licensee (8.9.2)
       rugged (~> 0.24)
-    little-plugger (1.1.4)
     locale (2.1.2)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     lograge (0.10.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -521,7 +485,6 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
-    mousetrap-rails (1.4.6)
     msgpack (1.2.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -604,9 +567,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    os (0.9.6)
+    os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
@@ -634,7 +597,6 @@ GEM
     pg (0.18.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
-    posix-spawn (0.3.13)
     powerpack (0.1.1)
     premailer (1.10.4)
       addressable
@@ -658,6 +620,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    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)
     rack (1.6.11)
     rack-accept (0.4.5)
@@ -826,7 +792,7 @@ GEM
     rubyzip (1.2.2)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.4)
+    rugged (0.27.5)
     safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
@@ -872,7 +838,7 @@ GEM
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    signet (0.8.1)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -905,7 +871,6 @@ GEM
     state_machines-activerecord (0.5.1)
       activerecord (>= 4.1, < 6.0)
       state_machines-activemodel (>= 0.5.0)
-    stringex (2.8.4)
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
@@ -997,7 +962,6 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print
   aws-sdk
@@ -1039,6 +1003,7 @@ DEPENDENCIES
   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
@@ -1047,6 +1012,7 @@ DEPENDENCIES
   flipper (~> 0.13.0)
   flipper-active_record (~> 0.13.0)
   flipper-active_support_cache_store (~> 0.13.0)
+  flowdock (~> 0.7)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
@@ -1061,11 +1027,8 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.118.1)
-  github-linguist (~> 5.3.3)
+  gitaly-proto (~> 0.123.0)
   github-markup (~> 1.7.0)
-  gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-gollum-lib (~> 4.2)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.6.4)
   gitlab-sidekiq-fetcher
@@ -1073,7 +1036,7 @@ DEPENDENCIES
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
   google-api-client (~> 0.23)
-  google-protobuf (= 3.5.1)
+  google-protobuf (~> 3.6)
   gpgme
   grape (~> 1.1)
   grape-entity (~> 0.7.1)
@@ -1081,7 +1044,7 @@ DEPENDENCIES
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.8.0)
-  grpc (~> 1.11.0)
+  grpc (~> 1.15.0)
   gssapi
   haml_lint (~> 0.26.0)
   hamlit (~> 2.8.8)
@@ -1111,7 +1074,6 @@ DEPENDENCIES
   method_source (~> 0.8)
   mini_magick
   minitest (~> 5.7.0)
-  mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
   net-ntp
@@ -1146,6 +1108,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
@@ -1224,4 +1188,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index 32fc41235f43..a15dae06fc0a 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -164,15 +164,6 @@
     };
     version = "0.0.8";
   };
-  asset_sync = {
-    dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
-      type = "gem";
-    };
-    version = "2.4.0";
-  };
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1154,22 +1145,13 @@
     version = "1.3.0";
   };
   gitaly-proto = {
-    dependencies = ["google-protobuf" "grpc"];
+    dependencies = ["grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
+      sha256 = "16b9sdaimhcda401z2s7apf0nz6y0lxs74xhkwlz4jzf6ms44mgg";
       type = "gem";
     };
-    version = "0.118.1";
-  };
-  github-linguist = {
-    dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
-      type = "gem";
-    };
-    version = "5.3.3";
+    version = "0.123.0";
   };
   github-markup = {
     source = {
@@ -1179,33 +1161,6 @@
     };
     version = "1.7.0";
   };
-  gitlab-flowdock-git-hook = {
-    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  gitlab-gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
-      type = "gem";
-    };
-    version = "4.2.7.5";
-  };
-  gitlab-grit = {
-    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
-      type = "gem";
-    };
-    version = "2.8.2";
-  };
   gitlab-license = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1258,15 +1213,6 @@
     };
     version = "0.4.1";
   };
-  gollum-grit_adapter = {
-    dependencies = ["gitlab-grit"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
   gon = {
     dependencies = ["actionpack" "multi_json" "request_store"];
     source = {
@@ -1288,28 +1234,28 @@
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
+      sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.6.1";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   googleauth = {
-    dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
+      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.6";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1374,13 +1320,13 @@
     version = "1.8.1";
   };
   grpc = {
-    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
+    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
+      sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.15.0";
   };
   gssapi = {
     dependencies = ["ffi"];
@@ -1762,14 +1708,6 @@
     };
     version = "8.9.2";
   };
-  little-plugger = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
-      type = "gem";
-    };
-    version = "1.1.4";
-  };
   locale = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1778,15 +1716,6 @@
     };
     version = "2.1.2";
   };
-  logging = {
-    dependencies = ["little-plugger" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
-      type = "gem";
-    };
-    version = "2.2.2";
-  };
   lograge = {
     dependencies = ["actionpack" "activesupport" "railties" "request_store"];
     source = {
@@ -1904,14 +1833,6 @@
     };
     version = "5.7.0";
   };
-  mousetrap-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
-      type = "gem";
-    };
-    version = "1.4.6";
-  };
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2235,10 +2156,10 @@
   os = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
       type = "gem";
     };
-    version = "0.9.6";
+    version = "1.0.0";
   };
   parallel = {
     source = {
@@ -2252,10 +2173,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.3.0";
   };
   parslet = {
     source = {
@@ -2336,14 +2257,6 @@
     };
     version = "1.0.1";
   };
-  posix-spawn = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
-      type = "gem";
-    };
-    version = "0.3.13";
-  };
   powerpack = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2430,6 +2343,23 @@
     };
     version = "3.0.3";
   };
+  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"];
@@ -3037,10 +2967,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
+      sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
       type = "gem";
     };
-    version = "0.27.4";
+    version = "0.27.5";
   };
   safe_yaml = {
     source = {
@@ -3196,10 +3126,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.11.0";
   };
   simple_po_parser = {
     source = {
@@ -3320,14 +3250,6 @@
     };
     version = "0.5.1";
   };
-  stringex = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
-      type = "gem";
-    };
-    version = "2.8.4";
-  };
   sys-filesystem = {
     dependencies = ["ffi"];
     source = {

From c2b54dcee585480811a10b8e1dd0dd0b46139caa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 4 Dec 2018 21:26:24 +0100
Subject: [PATCH 077/199] gitlab-shell: fix hard-coded path

---
 .../gitlab/gitlab-shell/remove-hardcoded-locations.patch        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3d381404c63b..7819c863a359 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
@@ -25,7 +25,7 @@ index 435cb29..078c1df 100644
  
  func NewFromDir(dir string) (*Config, error) {
 -	return newFromFile(path.Join(dir, configFile))
-+	return newFromFile(path.Join(dir, "shell-config.yml"))
++	return newFromFile("/run/gitlab/shell-config.yml")
  }
  
  func newFromFile(filename string) (*Config, error) {

From 187e892a61d1855f1df9a99dd947a2b13c0f066e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 19:34:50 +0100
Subject: [PATCH 078/199] LTS Haskell 12.21

---
 .../configuration-hackage2nix.yaml            | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82ecd05b266c..979e105c1bcb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -45,7 +45,7 @@ default-package-overrides:
   - base-compat-batteries ==0.10.1
   # Newer versions don't work in LTS-12.x
   - cassava-megaparsec < 2
-  # LTS Haskell 12.20
+  # LTS Haskell 12.21
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -337,8 +337,8 @@ default-package-overrides:
   - cabal-doctest ==1.0.6
   - cabal-rpm ==0.12.6
   - cache ==0.1.1.1
-  - cachix ==0.1.2
-  - cachix-api ==0.1.0.2
+  - cachix ==0.1.3
+  - cachix-api ==0.1.0.3
   - cairo ==0.13.5.0
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.1.0
@@ -361,7 +361,7 @@ default-package-overrides:
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
-  - chan ==0.0.3
+  - chan ==0.0.4
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.4
@@ -433,7 +433,7 @@ default-package-overrides:
   - composition-prelude ==1.5.3.1
   - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.6.1.0
+  - concurrency ==1.6.2.0
   - concurrent-extra ==0.7.0.12
   - concurrent-output ==1.10.9
   - concurrent-split ==0.0.1.1
@@ -535,7 +535,7 @@ default-package-overrides:
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==4.6.0.0
   - data-diverse-lens ==4.3.0.0
-  - datadog ==0.2.2.0
+  - datadog ==0.2.3.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -732,8 +732,8 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - fin ==0.0.1
   - Fin ==0.2.6.0
+  - fin ==0.0.1
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
@@ -982,7 +982,7 @@ default-package-overrides:
   - histogram-fill ==0.9.1.0
   - hjsmin ==0.2.0.2
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.7.0
+  - hlibsass ==0.1.8.0
   - hmatrix ==0.19.0.0
   - hmatrix-backprop ==0.1.2.3
   - hmatrix-gsl ==0.19.0.1
@@ -1097,7 +1097,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.6.2.20
+  - hw-prim ==0.6.2.22
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1198,7 +1198,7 @@ default-package-overrides:
   - json-rpc-server ==0.2.6.0
   - json-schema ==0.7.4.2
   - JuicyPixels ==3.2.9.5
-  - JuicyPixels-blp ==0.1.0.1
+  - JuicyPixels-blp ==0.1.1.0
   - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.2
   - justified-containers ==0.3.0.0
@@ -1294,7 +1294,7 @@ default-package-overrides:
   - log-postgres ==0.7.0.2
   - long-double ==0.1
   - loop ==0.3.0
-  - lrucache ==1.2.0.0
+  - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
   - lucid ==2.9.11
   - lucid-extras ==0.1.0.1
@@ -1785,7 +1785,7 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.5.0.0
   - safe ==0.3.17
-  - safecopy ==0.9.4.1
+  - safecopy ==0.9.4.2
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
@@ -2130,7 +2130,7 @@ default-package-overrides:
   - transformers-fix ==1.0
   - transformers-lift ==0.2.0.1
   - traverse-with-class ==1.0.0.0
-  - tree-diff ==0.0.1
+  - tree-diff ==0.0.2
   - tree-fun ==0.8.1.0
   - trifecta ==2
   - triplesec ==0.1.2.0
@@ -2323,7 +2323,7 @@ default-package-overrides:
   - x509-validation ==1.6.11
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.4
+  - xeno ==0.3.5.1
   - xenstore ==0.1.1
   - xhtml ==3000.2.2.1
   - xls ==0.1.1

From 752b1484e477aba680aa4267a9ed9a1e90b06816 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Nov 2018 02:30:56 +0100
Subject: [PATCH 079/199] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-4-g121c563 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b55c0469b413c329f721a29d85ae55e706fe8672.
---
 .../haskell-modules/hackage-packages.nix      | 1633 +++++++++++------
 1 file changed, 1079 insertions(+), 554 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c6e9204372bf..c85cc3a422c3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4624,6 +4624,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_13_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.13.0.0";
+       sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -7214,11 +7236,12 @@ self: {
      }) {};
 
   "HCL" = callPackage
-    ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
+    ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck, random
+     }:
      mkDerivation {
        pname = "HCL";
-       version = "1.5.1";
-       sha256 = "1l9ychhml91zvr6zdrzyd8pvlbycyrdjvn95vgdyal0p5r7b3plf";
+       version = "1.7";
+       sha256 = "0f61kj9c58s06w882zxmv0s5yc0zxh3f5nx7gnx2dx8p7d3f4y34";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -7226,6 +7249,9 @@ self: {
        executableHaskellDepends = [
          base containers mtl QuickCheck random
        ];
+       testHaskellDepends = [
+         base containers HUnit mtl QuickCheck random
+       ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10706,29 +10732,6 @@ self: {
      }) {};
 
   "JuicyPixels-blp" = callPackage
-    ({ mkDerivation, attoparsec, base, binary, bytestring, directory
-     , filepath, hashable, JuicyPixels, optparse-simple, text-show
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "JuicyPixels-blp";
-       version = "0.1.0.1";
-       sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base binary bytestring hashable JuicyPixels text-show
-         vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath JuicyPixels optparse-simple
-         text-show unordered-containers
-       ];
-       description = "BLP format decoder/encoder over JuicyPixels library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-blp_0_1_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, directory
      , filepath, hashable, JuicyPixels, optparse-simple, text-show
      , unordered-containers, vector
@@ -10749,7 +10752,6 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -15283,6 +15285,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "RLP" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec }:
+     mkDerivation {
+       pname = "RLP";
+       version = "1.0.0";
+       sha256 = "15m872ys5jzn21psqccgz24f5zchvj5hcz1kll18v0pivh2c4hd0";
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [ base binary bytestring hspec ];
+       description = "RLP serialization as defined in Ethereum Yellow Paper";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "RMP" = callPackage
     ({ mkDerivation, allocated-processor, base, canlib, cv-combinators
      , ftd2xx, HOpenCV, vector-space
@@ -16481,6 +16495,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SecureHash-SHA3" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "SecureHash-SHA3";
+       version = "0.1.0.2";
+       sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
+       libraryHaskellDepends = [ base bytestring ];
+       description = "simple static linked SHA3 using private symbols and the ref impl";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "SegmentTree" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -16584,8 +16609,8 @@ self: {
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.5.0";
-       sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b";
+       version = "0.6.0";
+       sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process ];
@@ -23333,6 +23358,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "algebraic-graphs_0_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, containers
+     , deepseq, extra, inspection-testing, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "algebraic-graphs";
+       version = "0.3";
+       sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl";
+       libraryHaskellDepends = [
+         array base base-compat containers deepseq mtl
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans containers extra
+         inspection-testing QuickCheck
+       ];
+       description = "A library for algebraic graph construction and transformation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "algebraic-prelude" = callPackage
     ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
      mkDerivation {
@@ -27507,8 +27552,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.6.0.0";
-       sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9";
+       version = "0.7.0";
+       sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
        libraryHaskellDepends = [
          base containers mtl template-haskell vector
        ];
@@ -27520,14 +27565,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs-gloss" = callPackage
+    ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
+     , linear
+     }:
+     mkDerivation {
+       pname = "apecs-gloss";
+       version = "0.1.1";
+       sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
+       libraryHaskellDepends = [
+         apecs apecs-physics base containers gloss linear
+       ];
+       description = "Simple gloss renderer for apecs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "apecs-physics" = callPackage
     ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
      , template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs-physics";
-       version = "0.2.0.0";
-       sha256 = "17mbf06785mdn8pmy90hw92240zq889rh2dlv1sh45p44grr2h5c";
+       version = "0.3.1";
+       sha256 = "0ij8wv9vrard7nfh8hhzrs9j7w5jlw3353w396alwnbb40hvk7gj";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          apecs base containers inline-c linear template-haskell vector
@@ -28466,6 +28526,47 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arbor-monad-metric" = callPackage
+    ({ mkDerivation, arbor-datadog, base, bytestring, containers
+     , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens, mtl
+     , network, resourcet, stm, transformers
+     }:
+     mkDerivation {
+       pname = "arbor-monad-metric";
+       version = "0.0.2";
+       sha256 = "0c8734nf8zgkwqgjphdqb0fa6p3qvc6cj0n16k22v8ri5ziyha76";
+       libraryHaskellDepends = [
+         base containers generic-lens lens mtl resourcet stm transformers
+       ];
+       testHaskellDepends = [
+         arbor-datadog base bytestring containers generic-lens hedgehog
+         hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "arbor-monad-metric-datadog" = callPackage
+    ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
+     , bytestring, containers, generic-lens, hedgehog, hspec
+     , hw-hspec-hedgehog, lens, mtl, network, resourcet, stm, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "arbor-monad-metric-datadog";
+       version = "0.0.1";
+       sha256 = "0padn66j6hxpndnakkd1hvf2jkhab1djr20c2hvp1m9kim5c3cz9";
+       libraryHaskellDepends = [
+         arbor-datadog arbor-monad-metric base bytestring containers
+         generic-lens lens mtl network resourcet stm text transformers
+       ];
+       testHaskellDepends = [
+         arbor-datadog arbor-monad-metric base bytestring containers
+         generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network
+         resourcet stm text transformers
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arbor-postgres" = callPackage
     ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
      , optparse-applicative, postgresql-simple, text
@@ -28925,8 +29026,8 @@ self: {
        pname = "arithmoi";
        version = "0.8.0.0";
        sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
-       revision = "1";
-       editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
+       revision = "2";
+       editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers deepseq exact-pi ghc-prim integer-gmp
@@ -30519,8 +30620,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.4.2";
-       sha256 = "168mgwx0m2kriz494r9isd27rflfh4np7pjm1hxzwc8pnyd3mdx9";
+       version = "3.2.4.4";
+       sha256 = "0qnhxx4xfh40g1gh108rqcxam3zdm6qwz4h3mh8kw9lq9bnman46";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32158,6 +32259,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-lambda-runtime" = callPackage
+    ({ mkDerivation, aeson, async, base, base-compat, bytestring
+     , containers, deepseq, filepath, http-client, http-media
+     , http-types, lens, lens-aeson, parsec, process, text, time
+     , zip-archive
+     }:
+     mkDerivation {
+       pname = "aws-lambda-runtime";
+       version = "0";
+       sha256 = "1wnpck1cy7bc3g7g3z210n9sgiplsxqbli0xgpxi2wxmhcf5dpjq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base base-compat bytestring containers deepseq filepath
+         http-client http-media http-types parsec process text time
+         zip-archive
+       ];
+       executableHaskellDepends = [ aeson base lens lens-aeson text ];
+       description = "Haskell on AWS Lambda Runtime API";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aws-mfa-credentials" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base
      , exceptions, filelock, filepath, freer-effects, ini, lens
@@ -39439,22 +39562,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_41_5" = callPackage
+  "brick_0_42" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, QuickCheck, stm, template-haskell, text
-     , text-zipper, transformers, vector, vty, word-wrap
+     , data-clist, deepseq, directory, dlist, filepath, microlens
+     , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
+     , text, text-zipper, transformers, unix, vector, vty, word-wrap
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.41.5";
-       sha256 = "0r7r44h81jpv2h9wqwkh9i5hmdkr296cvmvyha6qr89298npz1cb";
+       version = "0.42";
+       sha256 = "1hrfw10zy1450slj79d432zi6wiy11jr1ciz3xh0fx27zns4yqyy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq dlist
-         microlens microlens-mtl microlens-th stm template-haskell text
-         text-zipper transformers vector vty word-wrap
+         base config-ini containers contravariant data-clist deepseq
+         directory dlist filepath microlens microlens-mtl microlens-th stm
+         template-haskell text text-zipper transformers unix vector vty
+         word-wrap
        ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A declarative terminal user interface library";
@@ -40218,8 +40342,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.2.2";
-       sha256 = "1fx9f0ddx8il141rhqxb81vms0nxkyckwx72cmjq2j0nwjhhh89l";
+       version = "0.0.3.0";
+       sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40998,6 +41122,8 @@ self: {
        pname = "bytestring-handle";
        version = "0.1.0.6";
        sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
+       revision = "1";
+       editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -41882,6 +42008,8 @@ self: {
        pname = "cabal-install";
        version = "2.4.1.0";
        sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
+       revision = "1";
+       editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath process ];
@@ -42669,59 +42797,6 @@ self: {
      }) {};
 
   "cachix" = callPackage
-    ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
-     , bifunctors, bytestring, cachix-api, conduit, conduit-extra
-     , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
-     , here, hspec, hspec-discover, http-client, http-client-tls
-     , http-conduit, http-types, lzma-conduit, megaparsec, memory
-     , mmorph, optparse-applicative, process, protolude, resourcet
-     , safe-exceptions, servant, servant-auth, servant-auth-client
-     , servant-client, servant-client-core, servant-streaming-client
-     , streaming, text, unix, uri-bytestring, versions
-     }:
-     mkDerivation {
-       pname = "cachix";
-       version = "0.1.2";
-       sha256 = "1pm2cjlllg1sq7vkig8lr9y1gsxa9w4h61rzq47w1mnhn476gv67";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 filepath fsnotify here http-client
-         http-client-tls http-conduit http-types lzma-conduit megaparsec
-         memory mmorph optparse-applicative process protolude resourcet
-         safe-exceptions servant servant-auth servant-auth-client
-         servant-client servant-client-core servant-streaming-client
-         streaming text unix uri-bytestring versions
-       ];
-       executableHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 filepath fsnotify here http-client
-         http-client-tls http-conduit http-types lzma-conduit megaparsec
-         memory mmorph optparse-applicative process protolude resourcet
-         safe-exceptions servant servant-auth servant-auth-client
-         servant-client servant-client-core servant-streaming-client
-         streaming text unix uri-bytestring versions
-       ];
-       executableToolDepends = [ hspec-discover ];
-       testHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 filepath fsnotify here hspec http-client
-         http-client-tls http-conduit http-types lzma-conduit megaparsec
-         memory mmorph optparse-applicative process protolude resourcet
-         safe-exceptions servant servant-auth servant-auth-client
-         servant-client servant-client-core servant-streaming-client
-         streaming text unix uri-bytestring versions
-       ];
-       description = "Command line client for Nix binary cache hosting https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cachix_0_1_3" = callPackage
     ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
      , bifunctors, bytestring, cachix-api, conduit, conduit-extra
      , cookie, cryptonite, data-default, dhall, directory, ed25519
@@ -42759,46 +42834,6 @@ self: {
      }) {};
 
   "cachix-api" = callPackage
-    ({ mkDerivation, aeson, amazonka, base, base16-bytestring
-     , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
-     , http-api-data, http-media, lens, memory, protolude, servant
-     , servant-auth, servant-auth-server, servant-auth-swagger
-     , servant-streaming, servant-swagger, servant-swagger-ui-core
-     , string-conv, swagger2, text, transformers
-     }:
-     mkDerivation {
-       pname = "cachix-api";
-       version = "0.1.0.2";
-       sha256 = "0jqak93ixqzr76lm0mgn9fqfsmkz1ik41j5l629d3hbl7sah15gn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit cookie
-         cryptonite http-api-data http-media lens memory servant
-         servant-auth servant-auth-server servant-auth-swagger
-         servant-streaming servant-swagger servant-swagger-ui-core
-         string-conv swagger2 text transformers
-       ];
-       executableHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit cookie
-         cryptonite http-api-data http-media lens memory servant
-         servant-auth servant-auth-server servant-auth-swagger
-         servant-streaming servant-swagger servant-swagger-ui-core
-         string-conv swagger2 text transformers
-       ];
-       testHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit cookie
-         cryptonite hspec http-api-data http-media lens memory protolude
-         servant servant-auth servant-auth-server servant-auth-swagger
-         servant-streaming servant-swagger servant-swagger-ui-core
-         string-conv swagger2 text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Servant HTTP API specification for https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "cachix-api_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, amazonka, base, base16-bytestring
      , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
      , http-api-data, http-media, lens, memory, protolude, servant
@@ -42830,7 +42865,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cacophony" = callPackage
@@ -44275,6 +44309,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava-conduit_0_5_1" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+     , conduit, containers, criterion, mtl, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cassava-conduit";
+       version = "0.5.1";
+       sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm";
+       libraryHaskellDepends = [
+         array base bifunctors bytestring cassava conduit containers mtl
+         text
+       ];
+       testHaskellDepends = [
+         base bytestring cassava conduit QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Conduit interface for cassava package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-embed" = callPackage
     ({ mkDerivation, base, bytestring, cassava, template-haskell
      , vector
@@ -44836,8 +44891,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.2.2";
-       sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd";
+       version = "0.1.2.3";
+       sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45507,8 +45562,8 @@ self: {
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
        pname = "chan";
-       version = "0.0.3";
-       sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr";
+       version = "0.0.4";
+       sha256 = "07kykcgv4xdzby2s50wlqjjvcbgvda6prcz4jhg8qzfazngpn4g3";
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base stm ];
        description = "Some extra kit for Chans";
@@ -46041,6 +46096,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "chimera" = callPackage
+    ({ mkDerivation, base, gauge, ghc-prim, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "chimera";
+       version = "0.2.0.0";
+       sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim vector ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "Lazy, infinite streams with O(1) indexing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chiphunk" = callPackage
     ({ mkDerivation, base, c2hs, safe-exceptions, StateVar
      , vector-space
@@ -51401,8 +51476,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.6.1.0";
-       sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
+       version = "1.6.2.0";
+       sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -51840,8 +51915,8 @@ self: {
        pname = "conduit-audio";
        version = "0.2.0.3";
        sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1";
-       revision = "1";
-       editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
+       revision = "2";
+       editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
        libraryHaskellDepends = [ base conduit vector ];
        description = "Combinators to efficiently slice and dice audio streams";
        license = stdenv.lib.licenses.bsd3;
@@ -51855,8 +51930,8 @@ self: {
        pname = "conduit-audio-lame";
        version = "0.1.2.1";
        sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za";
-       revision = "1";
-       editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr";
+       revision = "2";
+       editedCabalFile = "09cly6yly3vdlp8qbv6iyrk84aca7v6d160hwg9ai0dmjxk0jkl4";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -51875,8 +51950,8 @@ self: {
        pname = "conduit-audio-samplerate";
        version = "0.1.0.3";
        sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi";
-       revision = "1";
-       editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw";
+       revision = "2";
+       editedCabalFile = "1xp5mqd8svgdz9lwz2vw5mwkm98n834i2k83axwfwvpqr2jlkqa9";
        libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
@@ -51895,8 +51970,8 @@ self: {
        pname = "conduit-audio-sndfile";
        version = "0.1.2.1";
        sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
-       revision = "1";
-       editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg";
+       revision = "2";
+       editedCabalFile = "00c628bx1j8p342pc03p884illajqsgi47yplfxvdywxcijnwbn3";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -55816,14 +55891,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "crypto-enigma_0_1_1_1" = callPackage
+  "crypto-enigma_0_1_1_4" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, HUnit
      , optparse-applicative, QuickCheck, split, text
      }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.1.1.1";
-       sha256 = "0cfkzmgszvlwi4cylzxi2fpniw9a4ral4c6nyrdzjjdij55prafj";
+       version = "0.1.1.4";
+       sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers split text ];
@@ -59849,25 +59924,26 @@ self: {
 
   "datadog" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, Cabal, dlist, exceptions, hspec, http-client
-     , http-client-tls, http-types, lens, lifted-base, monad-control
-     , network, old-locale, random, text, time, transformers-base
-     , unordered-containers, vector
+     , bytestring, Cabal, containers, dlist, exceptions, hspec
+     , http-client, http-client-tls, http-types, lens, lifted-base
+     , monad-control, network, old-locale, random, text, time
+     , transformers-base, unliftio, unordered-containers, vector
      }:
      mkDerivation {
        pname = "datadog";
-       version = "0.2.2.0";
-       sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
+       version = "0.2.3.0";
+       sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv";
        libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring dlist http-client
-         http-client-tls http-types lens lifted-base monad-control network
-         old-locale text time transformers-base unordered-containers vector
+         aeson auto-update base buffer-builder bytestring containers dlist
+         http-client http-client-tls http-types lens lifted-base
+         monad-control network old-locale text time transformers-base
+         unliftio unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring Cabal dlist
-         exceptions hspec http-client http-client-tls http-types lens
+         aeson auto-update base buffer-builder bytestring Cabal containers
+         dlist exceptions hspec http-client http-client-tls http-types lens
          lifted-base monad-control network old-locale random text time
-         transformers-base unordered-containers vector
+         transformers-base unliftio unordered-containers vector
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
@@ -61582,6 +61658,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_1_11_0_4" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "1.11.0.4";
+       sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg";
+       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 {
@@ -62035,13 +62128,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "deque_0_2_4" = callPackage
-    ({ mkDerivation, base, semigroups }:
+  "deque_0_2_6" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "deque";
-       version = "0.2.4";
-       sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9";
-       libraryHaskellDepends = [ base semigroups ];
+       version = "0.2.6";
+       sha256 = "1jpapfa5lza9vpdj64a55imr9gjm19b7bwx773hb9fky77wrxn52";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62715,6 +62814,8 @@ self: {
        pname = "dhall";
        version = "1.19.1";
        sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq";
+       revision = "1";
+       editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62835,6 +62936,8 @@ self: {
        pname = "dhall-json";
        version = "1.2.5";
        sha256 = "0zdxv43kj8dp2w9hy4px9xf785ybs9jy5pzhzybiagq428k4kcbf";
+       revision = "1";
+       editedCabalFile = "0zgg3wlsvsshgcibn7xchqfw5z2qh3yxkf2lb4bkx220f4m0dvfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64856,6 +64959,8 @@ self: {
        pname = "discrimination";
        version = "0.3";
        sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
+       revision = "1";
+       editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          primitive profunctors promises semigroups transformers
@@ -65366,8 +65471,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-p2p";
-       version = "0.1.4.0";
-       sha256 = "0wl5cnh2swymj3h4hrvkkfl7d5hrmxl1ayiyv9yjbr6gm72i11vj";
+       version = "0.1.5.0";
+       sha256 = "0izlk0m0n0s8rdr31lfc05nbsqdwr2zfl2ai3j60r7hzq62i7rby";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68432,8 +68537,8 @@ self: {
      }:
      mkDerivation {
        pname = "each";
-       version = "1.1.0.0";
-       sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl";
+       version = "1.1.1.0";
+       sha256 = "078qlgdk256rcjh8k9lv7i14rqky952b2zzbnymswciqiiha5bvb";
        libraryHaskellDepends = [ base dlist template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Template Haskell library for writing monadic expressions more easily";
@@ -69629,8 +69734,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-prometheus-adapter";
-       version = "0.1.0.3";
-       sha256 = "0jkjbzb5ygd8q4641wdzw3v3cxvdqy2r6qhrrfi09iqn3ii9gjad";
+       version = "0.1.0.4";
+       sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2";
        libraryHaskellDepends = [
          base containers ekg-core microlens-th prometheus text transformers
          unordered-containers
@@ -70825,19 +70930,20 @@ self: {
      }) {};
 
   "entwine" = callPackage
-    ({ mkDerivation, async, base, containers, criterion, directory
-     , exceptions, monad-loops, process, QuickCheck
+    ({ mkDerivation, async, base, clock, containers, criterion
+     , directory, exceptions, monad-loops, process, QuickCheck
      , quickcheck-instances, quickcheck-properties, quickcheck-text
-     , random, SafeSemaphore, stm, text, time, transformers
-     , transformers-either
+     , random, retry, SafeSemaphore, semigroups, stm, text, time
+     , transformers, transformers-either
      }:
      mkDerivation {
        pname = "entwine";
-       version = "0.0.2";
-       sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
+       version = "0.0.3";
+       sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij";
        libraryHaskellDepends = [
-         async base containers exceptions monad-loops SafeSemaphore stm text
-         time transformers transformers-either
+         async base clock containers exceptions monad-loops retry
+         SafeSemaphore semigroups stm text time transformers
+         transformers-either
        ];
        testHaskellDepends = [
          async base directory exceptions process QuickCheck
@@ -73961,12 +74067,13 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "3.1.0.2";
-       sha256 = "0g568pp3sxzzzcpbcrvx76msn58nn41g1r4wq8sfvvg1hb28xpf5";
+       version = "4.0.0.0";
+       sha256 = "0h83cn0767sk8di6ja5928v65mkcp90pjqhgijrvynssxxsvfsji";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
-         base doctest HUnit monad-control QuickCheck silently test-framework
-         test-framework-hunit test-framework-quickcheck2 test-framework-th
+         base doctest HUnit monad-control mtl QuickCheck silently
+         test-framework test-framework-hunit test-framework-quickcheck2
+         test-framework-th
        ];
        benchmarkHaskellDepends = [
          base criterion HUnit mtl test-framework test-framework-hunit
@@ -75045,6 +75152,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fay-websockets" = callPackage
+    ({ mkDerivation, fay-base }:
+     mkDerivation {
+       pname = "fay-websockets";
+       version = "0.0.1.1";
+       sha256 = "1pax12d1rjmh3gdg1ylavk04f8rlldc6jnmm5sgghdq28z1mp6pb";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ fay-base ];
+       description = "Websockets FFI library for Fay";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fb" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
@@ -78380,6 +78499,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "focuslist_0_1_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+     , genvalidity-containers, genvalidity-hspec, hedgehog, lens
+     , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "focuslist";
+       version = "0.1.0.1";
+       sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx";
+       revision = "2";
+       editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base containers lens mono-traversable QuickCheck
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity-containers genvalidity-hspec hedgehog lens
+         QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
+       ];
+       description = "Lists with a focused element";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
@@ -80741,8 +80887,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.5.1.0";
-       sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v";
+       version = "0.5.1.1";
+       sha256 = "01f8d32f2nkqrf21p38zgzwmvl2pkpl9rx0c8a8ch6h56flzhck4";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers exceptions network
          transformers
@@ -80758,8 +80904,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.5.0.3";
-       sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv";
+       version = "0.5.0.4";
+       sha256 = "0w4sfa4qyclcfixxlam5djhv9hx0hzhfsvf2cabs6m8mgks8zidi";
        libraryHaskellDepends = [
          base bytestring conduit connection exceptions ftp-client resourcet
        ];
@@ -81381,14 +81527,15 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
+    ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom
+     , QuickCheck, random
      }:
      mkDerivation {
        pname = "fused-effects";
-       version = "0.1.1.0";
-       sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
+       version = "0.1.2.1";
+       sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn";
        libraryHaskellDepends = [ base deepseq MonadRandom random ];
-       testHaskellDepends = [ base doctest hspec ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "A fast, flexible, fused effect system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84078,28 +84225,25 @@ self: {
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
      , containers, directory, exceptions, filepath, happy, haskeline
-     , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
-     , old-locale, parallel, pretty, process, random, terminfo, time
-     , time-compat, unix, utf8-string
+     , httpd-shed, json, mtl, network, network-uri, parallel, pretty
+     , process, random, terminfo, time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
-       version = "3.9";
-       sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i";
+       version = "3.10";
+       sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
-         haskeline httpd-shed json mtl network network-uri old-locale
-         parallel pretty process random terminfo time time-compat unix
-         utf8-string
+         haskeline httpd-shed json mtl network network-uri parallel pretty
+         process random terminfo time time-compat unix utf8-string
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base Cabal directory filepath HTF HUnit process
-       ];
+       testHaskellDepends = [ base Cabal directory filepath process ];
        doCheck = false;
        postPatch = ''
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -86511,19 +86655,23 @@ self: {
      }) {};
 
   "gingersnap" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
-     , postgresql-simple, resource-pool, snap-core, text, transformers
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , http-types, microspec, postgresql-simple, resource-pool
+     , snap-core, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "gingersnap";
-       version = "0.2.2.3";
-       sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
+       version = "0.3.1.0";
+       sha256 = "10lcs2p14rk1l280h3xkywbagy82cp2yy4zgs8l531hyqfzrsl01";
        libraryHaskellDepends = [
          aeson base bytestring deepseq http-types postgresql-simple
          resource-pool snap-core text transformers unordered-containers
        ];
-       description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
+       testHaskellDepends = [
+         base bytestring containers microspec postgresql-simple snap-core
+         transformers
+       ];
+       description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -86680,31 +86828,33 @@ self: {
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup
-     , byteable, bytestring, Cabal, case-insensitive, concurrent-output
-     , conduit, connection, containers, crypto-api, cryptonite, curl
-     , data-default, DAV, dbus, directory, disk-free-space, dlist
-     , edit-distance, exceptions, fdo-notify, feed, filepath, free, git
-     , gnupg, hinotify, hslogger, http-client, http-client-tls
-     , http-conduit, http-types, IfElse, lsof, magic, memory, microlens
-     , monad-control, monad-logger, mountpoints, mtl, network
-     , network-info, network-multicast, network-uri, old-locale, openssh
-     , optparse-applicative, perl, persistent, persistent-sqlite
-     , persistent-template, process, QuickCheck, random, regex-tdfa
-     , resourcet, rsync, SafeSemaphore, sandi, securemem, socks, split
-     , stm, stm-chans, tagsoup, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, text, time, torrent, transformers, unix, unix-compat
-     , unordered-containers, utf8-string, uuid, vector, wget, which
+    ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
+     , clientsession, concurrent-output, conduit, connection, containers
+     , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
+     , disk-free-space, dlist, edit-distance, exceptions, fdo-notify
+     , feed, filepath, free, git, gnupg, hinotify, hslogger, http-client
+     , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
+     , memory, microlens, monad-control, monad-logger, mountpoints, mtl
+     , network, network-info, network-multicast, network-uri, old-locale
+     , openssh, optparse-applicative, path-pieces, perl, persistent
+     , persistent-sqlite, persistent-template, process, QuickCheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
+     , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
        version = "7.20181121";
        sha256 = "07fbnz3rr9dq76zx6cpxdxppkgb7wwhbrm9y89jdcpn8giaz0i6h";
        configureFlags = [
-         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
-         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
-         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
-         "-f-webapp-secure" "-fwebdav" "-fxmpp"
+         "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
+         "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
+         "-fwebdav"
        ];
        isLibrary = false;
        isExecutable = true;
@@ -86713,19 +86863,21 @@ self: {
          hslogger IfElse process split transformers unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson async attoparsec base bloomfilter byteable bytestring
-         case-insensitive concurrent-output conduit connection containers
-         crypto-api cryptonite data-default DAV dbus directory
-         disk-free-space dlist edit-distance exceptions fdo-notify feed
-         filepath free hinotify hslogger http-client http-client-tls
+         aeson async attoparsec aws base blaze-builder bloomfilter byteable
+         bytestring case-insensitive clientsession concurrent-output conduit
+         connection containers crypto-api cryptonite data-default DAV dbus
+         directory disk-free-space dlist edit-distance exceptions fdo-notify
+         feed filepath free hinotify hslogger http-client http-client-tls
          http-conduit http-types IfElse magic memory microlens monad-control
          monad-logger mountpoints mtl network network-info network-multicast
-         network-uri old-locale optparse-applicative persistent
+         network-uri old-locale optparse-applicative path-pieces persistent
          persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm
-         stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
-         text time torrent transformers unix unix-compat
-         unordered-containers utf8-string uuid vector
+         regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
+         socks split stm stm-chans tagsoup tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat unordered-containers utf8-string uuid
+         vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
+         yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -101170,8 +101322,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.6.9";
-       sha256 = "1353cr6bd814xa1d2jqqnh2h5jmlkdsfg1a4cmxwyl1wvprjx54i";
+       version = "0.9.0";
+       sha256 = "0351kjfykh94lpf6kpdw18vzpdn13k0zak99n72hl2ybpy8d1yk6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104260,8 +104412,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedn";
-       version = "0.1.9.0";
-       sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l";
+       version = "0.1.9.1";
+       sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq mtl
          scientific stringsearch text time time-locale-compat utf8-string
@@ -107707,54 +107859,53 @@ self: {
     ({ mkDerivation, ansi-terminal, base, base-compat-batteries
      , bytestring, cmdargs, containers, criterion, data-default, Decimal
      , Diff, directory, easytest, file-embed, filepath, hashable
-     , haskeline, here, hledger-lib, html, lucid, megaparsec, mtl
-     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
-     , safe, shakespeare, split, statistics, tabular, temporary
+     , haskeline, here, hledger-lib, html, lucid, math-functions
+     , megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show
+     , process, regex-tdfa, safe, shakespeare, split, tabular, temporary
      , terminfo, test-framework, test-framework-hunit, text, time
      , timeit, transformers, unordered-containers, utf8-string
      , utility-ht, wizards
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.11.1";
-       sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9";
-       revision = "1";
-       editedCabalFile = "1g8jfjsfddpiifgv39gi985lsz8fsysf6qni34b0kb44wpd67pfn";
+       version = "1.12.1";
+       sha256 = "1b9zvlrhrzg0rvk90ac1z8n8sfhdx070l8hy3sg25nbcsqxzd51w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal Diff directory easytest file-embed
-         filepath hashable haskeline here hledger-lib lucid megaparsec mtl
-         mtl-compat old-time parsec pretty-show process regex-tdfa safe
-         shakespeare split statistics tabular temporary terminfo text time
-         transformers unordered-containers utf8-string utility-ht wizards
+         filepath hashable haskeline here hledger-lib lucid math-functions
+         megaparsec mtl mtl-compat old-time parsec pretty-show process
+         regex-tdfa safe shakespeare split tabular temporary terminfo text
+         time transformers unordered-containers utf8-string utility-ht
+         wizards
        ];
        executableHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal directory easytest file-embed
-         filepath haskeline here hledger-lib megaparsec mtl mtl-compat
-         old-time parsec pretty-show process regex-tdfa safe shakespeare
-         split statistics tabular temporary terminfo text time transformers
+         filepath haskeline here hledger-lib math-functions megaparsec mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo text time transformers
          unordered-containers utf8-string utility-ht wizards
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal directory easytest file-embed
-         filepath haskeline here hledger-lib megaparsec mtl mtl-compat
-         old-time parsec pretty-show process regex-tdfa safe shakespeare
-         split statistics tabular temporary terminfo test-framework
+         filepath haskeline here hledger-lib math-functions megaparsec mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo test-framework
          test-framework-hunit text time transformers unordered-containers
          utf8-string utility-ht wizards
        ];
        benchmarkHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
          containers criterion data-default Decimal directory easytest
-         file-embed filepath haskeline here hledger-lib html megaparsec mtl
-         mtl-compat old-time parsec pretty-show process regex-tdfa safe
-         shakespeare split statistics tabular temporary terminfo text time
-         timeit transformers unordered-containers utf8-string utility-ht
-         wizards
+         file-embed filepath haskeline here hledger-lib html math-functions
+         megaparsec mtl mtl-compat old-time parsec pretty-show process
+         regex-tdfa safe shakespeare split tabular temporary terminfo text
+         time timeit transformers unordered-containers utf8-string
+         utility-ht wizards
        ];
        description = "Command-line interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -107769,8 +107920,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.11.1";
-       sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc";
+       version = "1.12";
+       sha256 = "0vl4ag5r58zag8djihmdlj9apqrvczjn51qfizs366wprdppdxax";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107817,17 +107968,15 @@ self: {
 
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
-     , hledger-lib, hspec, megaparsec, microlens, microlens-th
-     , optparse-applicative, QuickCheck, semigroups, text, text-zipper
-     , time, transformers, unordered-containers, vector, vty
-     , xdg-basedir
+     , hledger-lib, hspec, hspec-discover, megaparsec, microlens
+     , microlens-th, optparse-applicative, QuickCheck, semigroups, text
+     , text-zipper, time, transformers, unordered-containers, vector
+     , vty, xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.6";
-       sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
-       revision = "3";
-       editedCabalFile = "0knyxgscbhddizdnljjs2ih73kf2s8acyzhrvhwdmw4c14560x45";
+       version = "1.3.7";
+       sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107845,6 +107994,7 @@ self: {
          base free hledger-lib hspec megaparsec QuickCheck text text-zipper
          time transformers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107896,8 +108046,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.11.1";
-       sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f";
+       version = "1.12";
+       sha256 = "1m38r9z6ccdxhl54k8x9drbfmj1l9hy8mnb7cj4bwprpz4xx15bh";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -107927,8 +108077,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.11.1";
-       sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj";
+       version = "1.12";
+       sha256 = "0cidm3kjlfnzfpsbzkbmfx36gm5msipkavw5267s67crzdcg8qwg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107971,8 +108121,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.11.1";
-       sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs";
+       version = "1.12";
+       sha256 = "14n3qhdr95nfgczw05dki2wy26k86z1h0li8md1bglch4j9fjs36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108045,21 +108195,6 @@ self: {
      }) {inherit (pkgs) git; inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
-     mkDerivation {
-       pname = "hlibsass";
-       version = "0.1.7.0";
-       sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
-       configureFlags = [ "-fexternalLibsass" ];
-       setupHaskellDepends = [ base Cabal directory ];
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ libsass ];
-       testHaskellDepends = [ base hspec ];
-       description = "Low-level bindings to Libsass";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) libsass;};
-
-  "hlibsass_0_1_8_0" = callPackage
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
@@ -108072,7 +108207,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
@@ -108084,8 +108218,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.10";
-       sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
+       version = "2.1.11";
+       sha256 = "0nv6627dacfsfjd3irmkff06hj1hr194zpm9xq6ng93dxhkhsnab";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -110070,11 +110204,11 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, openssl }:
      mkDerivation {
        pname = "hopenssl";
-       version = "2.2.2";
-       sha256 = "0k589mi4sny88jaqxcqd0jgy6kmbzslxk6y1bk8xkvq73nvjxnjl";
+       version = "2.2.3";
+       sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base bytestring HUnit ];
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -111592,6 +111726,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "hs-bibutils_6_7_0_0" = callPackage
+    ({ mkDerivation, base, syb }:
+     mkDerivation {
+       pname = "hs-bibutils";
+       version = "6.7.0.0";
+       sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5";
+       libraryHaskellDepends = [ base syb ];
+       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-blake2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -118457,6 +118603,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-bits_0_7_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
+     , safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.0.5";
+       sha256 = "1p3bqkzsmmz66chrwykj8pawgg7m5dvzsqmr9lrsdxldgqq62i8s";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit
      , conduit-combinators, criterion, hspec, mmap, time, transformers
@@ -118825,8 +118993,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "2.1.0";
-       sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
+       version = "4.0.0";
+       sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118951,29 +119119,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.6.2.20";
-       sha256 = "05azmns8nvdpfhd0fi71slsgn8irghyx25rynipc44ff407c1maa";
-       libraryHaskellDepends = [
-         base bytestring mmap semigroups transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap semigroups transformers vector
-       ];
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_6_2_22" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
      , transformers, vector
@@ -118994,7 +119139,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -119293,8 +119437,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwhile";
-       version = "0.1.1.2";
-       sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb";
+       version = "0.1.1.3";
+       sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120357,8 +120501,8 @@ self: {
        pname = "hyraxAbif";
        version = "0.2.3.10";
        sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
-       revision = "1";
-       editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
+       revision = "2";
+       editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121639,8 +121783,8 @@ self: {
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.3.0.8";
-       sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b";
+       version = "0.3.0.9";
+       sha256 = "1lskisk4aacqiv1v6fr95zcc5mrn9l4ikxf7xpj568k2i3aqcnwk";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers either exceptions
          hslogger list-t network pipes random rolling-queue stm stm-delay
@@ -122285,6 +122429,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "incremental-parser_0_3_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.3.2.1";
+       sha256 = "07banm2lnrhjvihs0iaij0kqgff198qcbah02s3cjyyl70cmllfr";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -123551,8 +123715,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.4.0.0";
-       sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
+       version = "0.5.0.0";
+       sha256 = "1p3qv356lqw5m88wilj7mb2hyqhbcd67rcg9kdaqg3pibmyiq3bx";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -124440,6 +124604,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ip2proxy" = callPackage
+    ({ mkDerivation, base, binary, bytestring, iproute }:
+     mkDerivation {
+       pname = "ip2proxy";
+       version = "1.0.0";
+       sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx";
+       libraryHaskellDepends = [ base binary bytestring iproute ];
+       description = "IP2Proxy Haskell package for proxy detection";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ip6addr" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
@@ -126039,10 +126214,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5.5";
-       sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz";
-       revision = "1";
-       editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi";
+       version = "0.5.5.1";
+       sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127064,6 +127237,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-alt" = callPackage
+    ({ mkDerivation, aeson, base }:
+     mkDerivation {
+       pname = "json-alt";
+       version = "1.0.0";
+       sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
+       libraryHaskellDepends = [ aeson base ];
+       description = "Union 'alternative' or Either that has untagged JSON encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-api" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -127150,31 +127334,32 @@ self: {
 
   "json-autotype" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, GenericPretty, hashable, lens, mtl
+     , filepath, GenericPretty, hashable, json-alt, lens, mtl
      , optparse-applicative, pretty, process, QuickCheck, scientific
-     , smallcheck, text, uniplate, unordered-containers, vector, yaml
+     , smallcheck, template-haskell, text, uniplate
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "2.0.0";
-       sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
-       revision = "1";
-       editedCabalFile = "00wbcq9bx6sq6i5756ja6pf016xbpk2kflq20ncdv76zycxdkqnm";
+       version = "3.0.0";
+       sha256 = "1ryk896kg2bs0w430zsg235h861nf43qn9hl1r285dh53jgj6mnw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers filepath GenericPretty hashable lens mtl
-         pretty process scientific text uniplate unordered-containers vector
+         aeson base containers filepath GenericPretty hashable json-alt lens
+         mtl pretty process QuickCheck scientific smallcheck
+         template-haskell text uniplate unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
-         lens mtl optparse-applicative pretty process scientific text
-         uniplate unordered-containers vector yaml
+         json-alt lens mtl optparse-applicative pretty process scientific
+         template-haskell text uniplate unordered-containers vector yaml
        ];
        testHaskellDepends = [
          aeson base bytestring containers directory filepath GenericPretty
-         hashable lens mtl optparse-applicative pretty process QuickCheck
-         scientific smallcheck text uniplate unordered-containers vector
+         hashable json-alt lens mtl optparse-applicative pretty process
+         QuickCheck scientific smallcheck template-haskell text uniplate
+         unordered-containers vector
        ];
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -129811,8 +129996,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "kind-apply";
-       version = "0.1.0.0";
-       sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
+       version = "0.2.0.0";
+       sha256 = "1c98537cinsv0pdp8alcvqmbijxz7ac0cn7xxyla3mnnv5awk7zf";
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
        license = stdenv.lib.licenses.bsd3;
@@ -129823,8 +130008,8 @@ self: {
     ({ mkDerivation, base, kind-apply }:
      mkDerivation {
        pname = "kind-generics";
-       version = "0.2.0";
-       sha256 = "07bvdys7xlxds1q6hlqn299709k1fha81hap7jfn8snyjv3fdfal";
+       version = "0.2.1.0";
+       sha256 = "0j6r70gafcx3wg3rxhcm28gqlr7zpghl105imcqm2jgm5kb2189l";
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -130102,8 +130287,8 @@ self: {
        pname = "kqueue";
        version = "0.2";
        sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
-       revision = "2";
-       editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
+       revision = "3";
+       editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7";
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
@@ -133265,6 +133450,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck-instances" = callPackage
+    ({ mkDerivation, base, bytestring, leancheck, nats, text }:
+     mkDerivation {
+       pname = "leancheck-instances";
+       version = "0.0.1";
+       sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq";
+       libraryHaskellDepends = [ base bytestring leancheck nats text ];
+       testHaskellDepends = [ base bytestring leancheck nats text ];
+       description = "Common LeanCheck instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -134811,6 +135008,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "libraft" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency
+     , containers, dejafu, directory, exceptions, haskeline
+     , hunit-dejafu, mtl, network, network-simple, parsec, protolude
+     , QuickCheck, random, repline, stm, tasty, tasty-dejafu
+     , tasty-discover, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, word8
+     }:
+     mkDerivation {
+       pname = "libraft";
+       version = "0.1.1.0";
+       sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c";
+       revision = "1";
+       editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers directory
+         exceptions haskeline mtl network network-simple parsec protolude
+         random repline text time transformers word8
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers directory
+         exceptions haskeline mtl network network-simple parsec protolude
+         random repline stm text time transformers word8
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring cereal concurrency containers dejafu
+         directory exceptions haskeline hunit-dejafu mtl network
+         network-simple parsec protolude QuickCheck random repline tasty
+         tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit
+         tasty-quickcheck text time transformers word8
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Raft consensus algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
      mkDerivation {
@@ -138896,8 +139131,8 @@ self: {
     ({ mkDerivation, base, containers, contravariant }:
      mkDerivation {
        pname = "lrucache";
-       version = "1.2.0.0";
-       sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
+       version = "1.2.0.1";
+       sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
        libraryHaskellDepends = [ base containers contravariant ];
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
@@ -141592,6 +141827,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_2_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, data-default-class
+     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+     , vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.2.4.1";
+       sha256 = "198xik64fw3n4wk3gy1rrxl2l3jwzn8b8h1yskg71mlvpv598lwk";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq ghc-prim primitive
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring data-default deepseq hspec QuickCheck
+         safe-exceptions vector
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, directory
      , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -144288,6 +144545,8 @@ self: {
        pname = "midi-util";
        version = "0.2.0.1";
        sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
+       revision = "1";
+       editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5";
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
@@ -145100,8 +145359,8 @@ self: {
      }:
      mkDerivation {
        pname = "mixpanel-client";
-       version = "0.1.0.0";
-       sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7";
+       version = "0.1.1";
+       sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          servant servant-client string-conv text time
@@ -151297,10 +151556,8 @@ self: {
      }:
      mkDerivation {
        pname = "natural";
-       version = "0.3.0.2";
-       sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
-       revision = "1";
-       editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
+       version = "0.3.0.3";
+       sha256 = "18ycqn164kl203wmvrdyfbwfgbbyzyl38i86sllmkwpqq2ciarwi";
        libraryHaskellDepends = [ base lens semigroupoids ];
        testHaskellDepends = [
          base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -151368,8 +151625,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "6";
-       editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl";
+       revision = "7";
+       editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -152493,6 +152750,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-bsd" = callPackage
+    ({ mkDerivation, base, network }:
+     mkDerivation {
+       pname = "network-bsd";
+       version = "2.8.0.0";
+       sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
+       libraryHaskellDepends = [ base network ];
+       doHaddock = false;
+       description = "Network.BSD";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-builder" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec
      , hspec-server, optparse-applicative, process, shelly, text, yaml
@@ -153644,8 +153913,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.3.1.0";
-       sha256 = "1rdlyznj61a392n6m8p7g2g96alxcmcrw9n6izrdb0lkw21cls89";
+       version = "0.3.2.0";
+       sha256 = "12c1g6712v8m6mnysiq9pm5g4178vmrxq3j4v50fm02njj4rdpnb";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -154522,6 +154791,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonempty-containers" = callPackage
+    ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+     , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
+     }:
+     mkDerivation {
+       pname = "nonempty-containers";
+       version = "0.1.0.0";
+       sha256 = "15800rd4hix5iab0n5k484za494zs110gyga8wn5xaag1axr4alp";
+       libraryHaskellDepends = [
+         base comonad containers deepseq semigroupoids these
+       ];
+       testHaskellDepends = [
+         base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+         tasty-hedgehog text these
+       ];
+       description = "Non-empty variants of containers data types, with full API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nonemptymap" = callPackage
     ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
@@ -155909,6 +156197,8 @@ self: {
        pname = "oblivious-transfer";
        version = "0.1.0";
        sha256 = "1kq5ppm151q1im14j6zm2w0pn60baj6gzxmfqfx8p0m7a7wwl7sz";
+       revision = "1";
+       editedCabalFile = "1v9js45kc94zirg530d0f3r9wwsx60xnz7diqzvfxlbvw01649yk";
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude random
        ];
@@ -156167,6 +156457,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "oeis2" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens
+     , lens-aeson, QuickCheck, text, vector
+     }:
+     mkDerivation {
+       pname = "oeis2";
+       version = "0.1.0";
+       sha256 = "17wzcf4zq8jg6kqd0mfkhcf37mkhjys1vzwpylhzkfgxwvhi4fjj";
+       libraryHaskellDepends = [
+         aeson base containers http-conduit lens lens-aeson text vector
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec http-conduit lens lens-aeson QuickCheck
+         text vector
+       ];
+       description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "off-simple" = callPackage
     ({ mkDerivation, base, parsec3, vector }:
      mkDerivation {
@@ -156537,17 +156846,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "once_0_3" = callPackage
-    ({ mkDerivation, base, containers, hashable, template-haskell
-     , unordered-containers
+  "once_0_4" = callPackage
+    ({ mkDerivation, async, base, containers, hashable, hspec
+     , hspec-discover, HUnit, template-haskell, unordered-containers
      }:
      mkDerivation {
        pname = "once";
-       version = "0.3";
-       sha256 = "1i5yf5d6c33arbrvvyk2bcp9cz8aj62zhd6sgxqz684baidn5rbc";
+       version = "0.4";
+       sha256 = "0az973cg4mf1azvh3x1gvp395ism7300mlajj9pvqmawvfar3g9h";
        libraryHaskellDepends = [
          base containers hashable template-haskell unordered-containers
        ];
+       testHaskellDepends = [
+         async base containers hashable hspec HUnit template-haskell
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
        description = "memoization for IO actions and functions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159098,8 +159412,8 @@ self: {
      }:
      mkDerivation {
        pname = "pairing";
-       version = "0.1.1";
-       sha256 = "15230s384z6hg29fc9l06qsk0657c1z00x0pijgxr9w8lbis56qg";
+       version = "0.1.4";
+       sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c";
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude QuickCheck random
          wl-pprint-text
@@ -159411,8 +159725,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.5";
-       sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
+       version = "1.0.6";
+       sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -169795,6 +170109,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pretty-show-ansi-wl" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy
+     , haskell-lexer
+     }:
+     mkDerivation {
+       pname = "pretty-show-ansi-wl";
+       version = "1.9.2.1";
+       sha256 = "00g6crhwshscvchf4321sig1p7dr82is5vfa2x8vmxm7kr6ciki6";
+       libraryHaskellDepends = [
+         ansi-wl-pprint array base ghc-prim haskell-lexer
+       ];
+       libraryToolDepends = [ happy ];
+       description = "Like pretty-show, but only for ansi-wl-pprint";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pretty-simple" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , doctest, Glob, mtl, parsec, text, transformers
@@ -171692,8 +172022,8 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.7.0.1";
-       sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
+       version = "0.7.1.0";
+       sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -173145,24 +173475,24 @@ self: {
      , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
      , emailaddress, monad-control, mtl, QuickCheck
      , quickcheck-instances, scientific, stm, strict, tasty
-     , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
-     , zeromq4-simple
+     , tasty-quickcheck, text, time, utf8-string, uuid, vector
+     , zeromq4-haskell, zeromq4-simple
      }:
      mkDerivation {
        pname = "purescript-iso";
-       version = "0.0.5";
-       sha256 = "06dw9fqc2h8asc3gwr3m5xqxsfcc24qw2pjz4wi2f2pgb32sicls";
+       version = "0.0.6";
+       sha256 = "0zz71c8mv86ihqwcqsp0cjw9dlyd0xw394dz14mwg16frajn986k";
        libraryHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
          base bytestring containers deepseq emailaddress monad-control mtl
          QuickCheck quickcheck-instances scientific stm strict text time
-         utf8-string uuid zeromq4-haskell zeromq4-simple
+         utf8-string uuid vector zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
          base bytestring containers deepseq emailaddress monad-control mtl
          QuickCheck quickcheck-instances scientific stm strict tasty
-         tasty-quickcheck text time utf8-string uuid zeromq4-haskell
+         tasty-quickcheck text time utf8-string uuid vector zeromq4-haskell
          zeromq4-simple
        ];
        description = "Isomorphic trivial data type definitions over JSON";
@@ -174022,6 +174352,8 @@ self: {
        pname = "quadratic-irrational";
        version = "0.0.6";
        sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
+       revision = "1";
+       editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm";
        libraryHaskellDepends = [
          arithmoi base containers mtl transformers
        ];
@@ -180128,6 +180460,8 @@ self: {
        pname = "repa";
        version = "3.4.1.4";
        sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
+       revision = "1";
+       editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -180226,6 +180560,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.2";
        sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
+       revision = "1";
+       editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -182543,8 +182879,8 @@ self: {
      }:
      mkDerivation {
        pname = "rncryptor";
-       version = "0.3.0.0";
-       sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp";
+       version = "0.3.0.1";
+       sha256 = "0j8y2iqxsin4gcgl85si7gl4bjrmdw9psvc7j3maa91fyh40dx49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184491,28 +184827,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.4.1";
-       sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4_2" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -184532,7 +184846,6 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -189514,8 +189827,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
-       revision = "2";
-       editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
+       revision = "3";
+       editedCabalFile = "0bcab5xk354glypz15lnlzvr157pbvh4mjfd5ln59hr3ip84bzi9";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -189600,8 +189913,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.4";
-       sha256 = "09myrp3g8k60i3w7da8sdi6asrdz8nri8cwh7qszhmpyf0xa6vhk";
+       version = "0.1.1.5";
+       sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -189985,21 +190298,20 @@ self: {
 
   "servant-py" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, charset
-     , hspec, hspec-expectations, lens, QuickCheck, servant
-     , servant-foreign, text
+     , hspec, lens, QuickCheck, servant, servant-foreign, text
      }:
      mkDerivation {
        pname = "servant-py";
-       version = "0.1.0.4";
-       sha256 = "0cc4cwny1y0iwchasxl8ncg2ladndpxcdh7ydfr2z91y97m15yx6";
+       version = "0.1.1.0";
+       sha256 = "1s708lcib9956x0ww14kcrhn5chg0sz9jnzk456kyjmwar8qssmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring charset lens servant servant-foreign text
        ];
        testHaskellDepends = [
-         aeson base base-compat bytestring hspec hspec-expectations lens
-         QuickCheck servant servant-foreign text
+         aeson base base-compat bytestring hspec lens QuickCheck servant
+         servant-foreign text
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -190324,8 +190636,8 @@ self: {
        pname = "servant-streaming";
        version = "0.3.0.0";
        sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq";
-       revision = "2";
-       editedCabalFile = "0v435r9kzhn9jcws3kibxgr46ii6kbdniqk56qmx6hzfmkwvgwgk";
+       revision = "3";
+       editedCabalFile = "04mc3k97sk0r90m8ca34gqpb2bz8yljp3j613xx7xz90sffqc1hq";
        libraryHaskellDepends = [ base http-types servant ];
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
@@ -191735,8 +192047,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.17.1";
-       sha256 = "1vm7wcyh0lxaq4qnmbywchkrm61rvf8iy43a44hwk48p3y7jdpz4";
+       version = "0.17.2";
+       sha256 = "1wl837d89b0zl0fzhh51y718p9dv99qid0gr3rkqyvbvhayj5dcm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -194869,6 +195181,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "skylighting_0_7_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, directory, filepath, hxt
+     , mtl, regex-pcre-builtin, safe, skylighting-core, text
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.7.5";
+       sha256 = "080kmpqaqh76qqjml34rfm7m6pchdmd2519g6y3kdb3x5vj01qbx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe skylighting-core text
+         utf8-string
+       ];
+       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
@@ -194901,6 +195237,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skylighting-core_0_7_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting-core";
+       version = "0.7.5";
+       sha256 = "129q860xk59n8dxsxl7prk0jk3ddl96r9i6r4lsk5l9pbpms41pp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe text transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
+         tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skype4hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, lifted-base
      , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -197734,8 +198103,8 @@ self: {
     ({ mkDerivation, base, containers, filepath, QuickCheck }:
      mkDerivation {
        pname = "solve";
-       version = "1.2";
-       sha256 = "03byni7iqv9wh35bc2g94ycsm1nl0ngfs4n1nkpprd1vw0d5g9h4";
+       version = "1.3";
+       sha256 = "1hd7vbbxcn9x3xzxnfscmbg8bjaqm7bkhjkrkdq2b0ys04sahxs8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers filepath ];
@@ -200016,10 +200385,10 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.9.1.1";
-       sha256 = "103jq3jxhp26f8si72dmwb3vvdhsl1dw3d9j2an4yjkz9l9yjfx5";
+       version = "1.9.3";
+       sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf";
        revision = "1";
-       editedCabalFile = "0ldwb5xvm1j2cdhafmrvkd2l64zq04wx3kwavkavvgpg1mln0ijl";
+       editedCabalFile = "1d6hf71l2i94xhx23jxl3qapidw7v73kig8m2as5kxdymnpfh48r";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -202592,8 +202961,8 @@ self: {
        pname = "streaming-attoparsec";
        version = "1.0.0";
        sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
-       revision = "1";
-       editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
+       revision = "2";
+       editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx";
        libraryHaskellDepends = [
          attoparsec base bytestring streaming streaming-bytestring
        ];
@@ -204414,17 +204783,15 @@ self: {
      }) {};
 
   "summoner" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
-     , directory, filepath, generic-deriving, gitrev, hedgehog
-     , neat-interpolation, optparse-applicative, process, relude, tasty
-     , tasty-discover, tasty-hedgehog, text, time, tomland
+    ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude
+     , bytestring, directory, filepath, generic-deriving, gitrev
+     , hedgehog, hspec, neat-interpolation, optparse-applicative
+     , process, relude, text, time, tomland
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.1.0.1";
-       sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
-       revision = "1";
-       editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
+       version = "1.2.0";
+       sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -204432,12 +204799,12 @@ self: {
          generic-deriving gitrev neat-interpolation optparse-applicative
          process relude text time tomland
        ];
-       executableHaskellDepends = [ base-noprelude relude ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base-noprelude hedgehog relude tasty tasty-hedgehog tomland
+         base-noprelude filepath hedgehog hspec neat-interpolation relude
+         tomland
        ];
-       testToolDepends = [ tasty-discover ];
-       description = "Tool for creating completely configured production Haskell projects";
+       description = "Tool for scaffolding completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -204848,8 +205215,8 @@ self: {
        pname = "sv";
        version = "1.2";
        sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
-       revision = "2";
-       editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4";
+       revision = "3";
+       editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -204899,6 +205266,8 @@ self: {
        pname = "sv-core";
        version = "0.3";
        sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
+       revision = "1";
+       editedCabalFile = "06wj1r1f06a594y3h9dl11wb7ra9993s2kdfzlf74w4r14bp7j4a";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
          deepseq lens mtl parsec profunctors readable semigroupoids
@@ -205631,6 +206000,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "symbols" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "symbols";
+       version = "0.2.0.1";
+       sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393";
+       libraryHaskellDepends = [ base ];
+       description = "Symbol manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "symengine" = callPackage
     ({ mkDerivation, base, gmp, gmpxx, symengine, tasty, tasty-hunit
      , tasty-quickcheck
@@ -207820,6 +208200,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_1_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
+     , wcwidth
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "1.2";
+       sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix wcwidth
+       ];
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -207869,6 +208267,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_2_0_8" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.2.0.8";
+       sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -207972,8 +208382,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "5";
-       editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr";
+       revision = "6";
+       editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -208012,6 +208422,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.5.1";
        sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
+       revision = "1";
+       editedCabalFile = "18k4p273qnvfmk5cbm89rjqr0v03v0q22q7bbl7z3bxpwnnkmhqf";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -208317,6 +208729,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-wai" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, tasty, wai
+     , wai-extra
+     }:
+     mkDerivation {
+       pname = "tasty-wai";
+       version = "0.1.0.1";
+       sha256 = "0h2zqwj19vamn2rcqpq17wjcx3v8xfixgzh0b30k37vbqcgz62va";
+       libraryHaskellDepends = [
+         base bytestring http-types tasty wai wai-extra
+       ];
+       testHaskellDepends = [ base http-types tasty wai ];
+       description = "Test 'wai' endpoints via Test.Tasty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tateti-tateti" = callPackage
     ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
      mkDerivation {
@@ -208906,17 +209334,19 @@ self: {
      }) {};
 
   "template-toolkit" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text
-     , unordered-containers, uri-encode
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, hashtables, mtl, parsec, pcre-utils
+     , regex-pcre-builtin, scientific, text, time, unordered-containers
+     , uri-encode
      }:
      mkDerivation {
        pname = "template-toolkit";
-       version = "0.1.0.1";
-       sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg";
+       version = "0.1.1.0";
+       sha256 = "0nqsgfqj28d6qqc4639d8paqb8d9fw5kpijggbmxdnaqd64xc4p1";
        libraryHaskellDepends = [
-         aeson base bytestring containers directory mtl parsec pcre-utils
-         regex-pcre-builtin scientific text unordered-containers uri-encode
+         aeson base binary bytestring containers directory hashtables mtl
+         parsec pcre-utils regex-pcre-builtin scientific text time
+         unordered-containers uri-encode
        ];
        description = "Template Toolkit implementation for Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -214613,16 +215043,16 @@ self: {
 
   "tomlcheck" = callPackage
     ({ mkDerivation, base, htoml-megaparsec, megaparsec
-     , optparse-generic, text
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.36";
-       sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
+       version = "0.1.0.39";
+       sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base htoml-megaparsec megaparsec optparse-generic text
+         base htoml-megaparsec megaparsec optparse-applicative text
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
@@ -214636,8 +215066,8 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.0.0";
-       sha256 = "1ycmf0id5vp0ax4rmvcma4yhdis9p51qkvd43afz84hf0r26gzr6";
+       version = "1.0.1";
+       sha256 = "0k94a6am7cmqhia543rmaw06xl0xq5lx22q1sb01x3l96sxh1aa8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -215849,33 +216279,6 @@ self: {
      }) {};
 
   "tree-diff" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
-     , base-compat, bytestring, containers, generics-sop, hashable
-     , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
-     , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta
-     , unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "tree-diff";
-       version = "0.0.1";
-       sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "6";
-       editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
-       libraryHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
-         containers generics-sop hashable MemoTrie parsec parsers pretty
-         QuickCheck scientific tagged text time unordered-containers
-         uuid-types vector
-       ];
-       testHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
-         tasty tasty-golden tasty-quickcheck trifecta
-       ];
-       description = "Diffing of (expression) trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tree-diff_0_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , base-compat, bytestring, containers, generics-sop, hashable
      , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged
@@ -215898,7 +216301,6 @@ self: {
        ];
        description = "Diffing of (expression) trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tree-fun" = callPackage
@@ -216099,6 +216501,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "trie-simple" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, hspec, mtl
+     , mwc-random, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "trie-simple";
+       version = "0.4.1.1";
+       sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7";
+       libraryHaskellDepends = [ base containers deepseq mtl ];
+       testHaskellDepends = [ base containers hspec QuickCheck vector ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mwc-random vector
+       ];
+       description = "Simple Map-based Trie";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tries" = callPackage
     ({ mkDerivation, base, bytestring, composition, containers
      , criterion, deepseq, hashable, keys, mtl, QuickCheck
@@ -217309,8 +217728,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.2.0.1";
-       sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
+       version = "0.3.0.0";
+       sha256 = "1qxbv6w482hjya6bypz8d6mizy9w03b1j43m0v1h4jwi7v71br9r";
        libraryHaskellDepends = [
          aeson base binary bytestring containers deepseq errors exceptions
          free hashable http-client http-client-tls http-types mtl
@@ -218016,10 +218435,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "type-level-sets";
-       version = "0.8.7.0";
-       sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
-       revision = "1";
-       editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr";
+       version = "0.8.9.0";
+       sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
@@ -218104,6 +218521,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_5_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
+     , hspec, QuickCheck, random, temporary, text, weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.5.0.0";
+       sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq ghc ghc-paths random
+         temporary text weigh
+       ];
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-of-html-static" = callPackage
     ({ mkDerivation, base, template-haskell, type-of-html }:
      mkDerivation {
@@ -218778,8 +219217,8 @@ self: {
      }:
      mkDerivation {
        pname = "u2f";
-       version = "0.1.0.1";
-       sha256 = "1gjpxdx4m74mwl7hili74asicvl8rm90k8q9bakx8mjki8akv15m";
+       version = "0.1.0.2";
+       sha256 = "0yn4r5pp84aqvkm1md722mkh7qqy7rnaw3fr99a2inwplqx6pzfr";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-types base base64-bytestring binary
          bytestring cryptohash cryptonite text
@@ -221955,8 +222394,10 @@ self: {
        pname = "uu-tc";
        version = "2015.1.1";
        sha256 = "03x7s7imcrqz1qdlwbgyw2gnrjhl7y5v8bz209kxswyldxz270lg";
+       revision = "1";
+       editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
        libraryHaskellDepends = [ base ];
-       description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
+       description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -223974,6 +224415,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_25" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.25";
+       sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -224631,6 +225091,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) vrpn;};
 
+  "vt-utils" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, HUnit, parsec
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "vt-utils";
+       version = "1.0.0.0";
+       sha256 = "0mvf5y2mpcxccjsi0h3p0ljwlrhw080wm4j2n1rw2zxh5yvvhlxc";
+       libraryHaskellDepends = [
+         aeson base bytestring directory HUnit parsec text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory HUnit parsec text time
+         unordered-containers vector
+       ];
+       description = "Vector and Text utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vte" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango
      , vte
@@ -224841,8 +225321,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.4.1.0";
-       sha256 = "018x0rb86ndshaqm0ns2cjwrqs2d2sq5sqypy1nbd8rh1g943cdn";
+       version = "0.4.2.0";
+       sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant digit
@@ -230688,8 +231168,8 @@ self: {
      }:
      mkDerivation {
        pname = "xeno";
-       version = "0.3.4";
-       sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
+       version = "0.3.5.1";
+       sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60";
        libraryHaskellDepends = [
          array base bytestring deepseq hspec mtl mutable-containers vector
        ];
@@ -230701,27 +231181,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xeno_0_3_5" = callPackage
-    ({ mkDerivation, array, base, bytestring, criterion, deepseq
-     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
-     , weigh, xml
-     }:
-     mkDerivation {
-       pname = "xeno";
-       version = "0.3.5";
-       sha256 = "0352xn6jlcbh1z4qlz679kybcvwz756xz21fzhv36vklzxclvgxn";
-       libraryHaskellDepends = [
-         array base bytestring deepseq hspec mtl mutable-containers vector
-       ];
-       testHaskellDepends = [ base bytestring hexml hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
-       ];
-       description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -231894,39 +232353,43 @@ self: {
      }) {};
 
   "xmobar" = callPackage
-    ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
-     , containers, dbus, directory, filepath, hinotify, hspec, HTTP
-     , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
-     , libXrender, mtl, old-locale, parsec, parsec-numbers, process
-     , regex-compat, stm, time, timezone-olson, timezone-series
-     , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
+    ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring
+     , containers, dbus, directory, extensible-exceptions, filepath
+     , hinotify, hspec, HTTP, http-conduit, http-types, iwlib, libmpd
+     , libXpm, libXrandr, libXrender, mtl, old-locale, parsec
+     , parsec-numbers, process, regex-compat, stm, temporary, time
+     , timezone-olson, timezone-series, transformers, unix, utf8-string
+     , wirelesstools, X11, X11-xft
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.28.1";
-       sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5";
+       version = "0.29";
+       sha256 = "136sqbfcwp1l7ynmmayihar25qa5kn04axy4mwzf7a6nc5b3zzxf";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
          "-fwith_rtsopts" "-fwith_threaded" "-fwith_utf8" "-fwith_uvmeter"
          "-fwith_weather" "-fwith_xft" "-fwith_xpm"
        ];
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         alsa-core alsa-mixer base bytestring containers dbus directory
-         filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
-         old-locale parsec parsec-numbers process regex-compat stm time
-         timezone-olson timezone-series transformers unix utf8-string X11
-         X11-xft
+       libraryHaskellDepends = [
+         alsa-core alsa-mixer async base bytestring containers dbus
+         directory extensible-exceptions filepath hinotify HTTP http-conduit
+         http-types iwlib libmpd mtl old-locale parsec parsec-numbers
+         process regex-compat stm time timezone-olson timezone-series
+         transformers unix utf8-string X11 X11-xft
        ];
-       executableSystemDepends = [
+       librarySystemDepends = [
          libXpm libXrandr libXrender wirelesstools
        ];
+       executableHaskellDepends = [
+         async base containers directory filepath parsec unix X11
+       ];
        testHaskellDepends = [
-         base bytestring containers directory filepath hspec mtl old-locale
-         parsec parsec-numbers process regex-compat stm time transformers
-         unix X11
+         alsa-core alsa-mixer async base bytestring containers directory
+         filepath hspec mtl old-locale parsec parsec-numbers process
+         regex-compat stm temporary time transformers unix X11
        ];
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
@@ -234261,6 +234724,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_9" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, fast-logger, gauge, hspec, hspec-expectations
+     , http-types, HUnit, monad-logger, mtl, network, parsec
+     , path-pieces, primitive, random, resourcet, rio, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , unix-compat, unliftio, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.9";
+       sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types monad-logger mtl
+         parsec path-pieces primitive random resourcet rio shakespeare
+         template-haskell text time transformers unix-compat unliftio
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -234772,8 +235272,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.12.5";
-       sha256 = "12h3z7k83qfx2nyqciqg9z3mpbl14z5rpfl8q2768m5rp8gg9j84";
+       version = "0.12.6.0";
+       sha256 = "005brhqz52q6r03fx7ka2i1r2b1s2j7nis5a2ycdmr0mw5mb2scm";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare text xss-sanitize yesod-core yesod-form
@@ -237205,6 +237705,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unzip;};
 
+  "zip-archive_0_4" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, pretty, process
+     , temporary, text, time, unix, unzip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.4";
+       sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath HUnit process temporary time
+         unix
+       ];
+       testToolDepends = [ unzip ];
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unzip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl

From 72b7f7f65b149dd6995ffc1b2c99b071476336b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 20:03:37 +0100
Subject: [PATCH 080/199] hledger: update overrides for version 1.12

---
 .../haskell-modules/configuration-common.nix       | 14 +++++++++++++-
 .../haskell-modules/configuration-ghc-8.6.x.nix    |  3 ---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50901b7d1dac..0c6621c9659b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -951,6 +951,13 @@ self: super: {
   # https://github.com/yesodweb/Shelly.hs/issues/162
   shelly = dontCheck super.shelly;
 
+  # hledger needs a newer megaparsec version than we have in LTS 12.x.
+  hledger-lib = super.hledger-lib.overrideScope (self: super: {
+    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    megaparsec = self.megaparsec_7_0_4;
+  });
+
   # Copy hledger man pages from data directory into the proper place. This code
   # should be moved into the cabal2nix generator.
   hledger = overrideCabal super.hledger (drv: {
@@ -976,7 +983,12 @@ self: super: {
       mkdir -p $out/share/info
       cp -v *.info* $out/share/info/
     '';
-  }));
+  })).overrideScope (self: super: {
+    cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+    config-ini = self.config-ini_0_2_4_0;
+    hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+    megaparsec = self.megaparsec_7_0_4;
+  });
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
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 d61915c5abde..4d91daa89a13 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -54,9 +54,6 @@ self: super: {
   free = self.free_5_1;
   haddock-library = dontCheck super.haddock-library_1_7_0;
   HaTeX = doJailbreak super.HaTeX;
-  hledger = doJailbreak super.hledger;
-  hledger-lib = doJailbreak super.hledger-lib;
-  hledger-ui = doJailbreak super.hledger-ui;
   hpack = self.hpack_0_31_1;
   hslua = self.hslua_1_0_1;
   hslua-module-text = self.hslua-module-text_0_2_0;

From 697a421fdcae6e41585f1613ec479b4467977ce6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Dec 2018 20:04:22 +0100
Subject: [PATCH 081/199] haskell-shelly: enable the test suite again

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0c6621c9659b..55e74a0f7e7c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -948,9 +948,6 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # https://github.com/yesodweb/Shelly.hs/issues/162
-  shelly = dontCheck super.shelly;
-
   # hledger needs a newer megaparsec version than we have in LTS 12.x.
   hledger-lib = super.hledger-lib.overrideScope (self: super: {
     cassava-megaparsec = self.cassava-megaparsec_2_0_0;

From d5726e6ad984ea4a3a8e1fd7b10c5f5a048eac69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 11:57:25 +0100
Subject: [PATCH 082/199] haskell-brick: update ghc-8.6.x override for the new
 version

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4d91daa89a13..c8d47c552acb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_41_5;
+  brick = self.brick_0_42;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From 63f5ed9f967276a5088aca9642eb7a63bd932915 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:17:13 +0100
Subject: [PATCH 083/199] xmobar: disable the failing test suite to fix the
 build

The test suite tries to access the ALSA system and fails.
---
 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 55e74a0f7e7c..c13bfad22e7d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1197,4 +1197,7 @@ self: super: {
   # https://github.com/jmillikin/chell/issues/1
   chell = super.chell.override { patience = self.patience_0_1_1; };
 
+  # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
+  xmobar = dontCheck super.xmobar;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 82bb8cb934032bf1e63084bc4d6dfa5114cebe21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:25:16 +0100
Subject: [PATCH 084/199] haskell-hspec-core: use latest version when compiling
 with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

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 c8d47c552acb..53776037f2b2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -58,6 +58,7 @@ self: super: {
   hslua = self.hslua_1_0_1;
   hslua-module-text = self.hslua-module-text_0_2_0;
   hspec = self.hspec_2_6_0;
+  hspec-contrib = self.hspec-contrib_0_5_1;
   hspec-core = self.hspec-core_2_6_0;
   hspec-discover = self.hspec-discover_2_6_0;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x

From 059c61d001fd32b4a1f5d3190e9c0d798570b4b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Dec 2018 12:33:48 +0100
Subject: [PATCH 085/199] haskell-esqueleto: mark the build as broken

---
 .../haskell-modules/configuration-common.nix          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c13bfad22e7d..82542e6ac028 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -93,14 +93,9 @@ self: super: {
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
-  esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
-    src = pkgs.fetchFromGitHub {
-      owner = "bitemyapp";
-      repo = "esqueleto";
-      rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
-      sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
-    };
-  };
+
+  # https://github.com/bitemyapp/esqueleto/issues/105
+  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {

From b38dd07eaa224ba55a0ba25c1545077e41e2c985 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:47:48 +0100
Subject: [PATCH 086/199] nsjail: fix path to new{u|g}idmap (#51523)

---
 pkgs/tools/security/nsjail/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index ae8a06e7b5c0..f88156285ca7 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which
-, libnl, protobuf, protobufc }:
+, libnl, protobuf, protobufc, shadow
+}:
 
 stdenv.mkDerivation rec {
   name = "nsjail-${version}";
@@ -13,6 +14,12 @@ stdenv.mkDerivation rec {
     sha256          = "0cgycj0cz74plmz4asxryqprg6mkzpmnxzqbfsp1wwackinxq5fq";
   };
 
+  postPatch = ''
+    substituteInPlace user.cc \
+      --replace "/usr/bin/newgidmap" "${shadow}/bin/newgidmap" \
+      --replace "/usr/bin/newuidmap" "${shadow}/bin/newuidmap"
+  '';
+
   nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ];
   buildInputs = [ libnl protobuf protobufc ];
   enableParallelBuilding = true;

From d41e868e02b10ab4e9693f06a7c7f202edadd3b1 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 3 Nov 2018 21:29:00 -0400
Subject: [PATCH 087/199] vscode,vscode-extensions: fix insiders build

---
 pkgs/applications/editors/vscode/default.nix  | 32 +++++++++++--------
 .../editors/vscode/with-extensions.nix        | 27 ++++------------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index b5cb6f6e3e14..2a6926a87087 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
-  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
+  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret,
+  isInsiders ? false }:
 
 let
-  version = "1.29.1";
-  channel = "stable";
+  executableName = "code" + lib.optionalString isInsiders "-insiders";
 
   plat = {
     "i686-linux" = "linux-ia32";
@@ -31,19 +31,24 @@ let
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";
+    version = "1.29.1";
 
     src = fetchurl {
       name = "VSCode_${version}_${plat}.${archive_fmt}";
-      url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}";
+      url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
       inherit sha256;
     };
 
+    passthru = {
+      inherit executableName;
+    };
+
     desktopItem = makeDesktopItem {
-      name = "code";
-      exec = "code";
-      icon = "code";
+      name = executableName;
+      exec = executableName;
+      icon = "@out@/share/pixmaps/code.png";
       comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications";
-      desktopName = "Visual Studio Code";
+      desktopName = "Visual Studio Code" + lib.optionalString isInsiders " Insiders";
       genericName = "Text Editor";
       categories = "GNOME;GTK;Utility;TextEditor;Development;";
     };
@@ -56,17 +61,18 @@ in
       if stdenv.hostPlatform.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/code $out/bin
+        ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
       '' else ''
         mkdir -p $out/lib/vscode $out/bin
         cp -r ./* $out/lib/vscode
 
-        substituteInPlace $out/lib/vscode/bin/code --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
+        substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
 
-        ln -s $out/lib/vscode/bin/code $out/bin
+        ln -s $out/lib/vscode/bin/${executableName} $out/bin
 
         mkdir -p $out/share/applications
-        cp $desktopItem/share/applications/* $out/share/applications
+        substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \
+          --subst-var out
 
         mkdir -p $out/share/pixmaps
         cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
@@ -76,7 +82,7 @@ in
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${rpath}" \
-        $out/lib/vscode/code
+        $out/lib/vscode/${executableName}
 
       patchelf \
         --set-rpath "${rpath}" \
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 5535d9ab1128..0af96e8bea81 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript
+{ stdenv, lib, runCommand, buildEnv, vscode, makeWrapper
 , vscodeExtensions ? [] }:
 
 /*
@@ -43,6 +43,7 @@
 
 let
 
+  inherit (vscode) executableName;
   wrappedPkgVersion = lib.getVersion vscode;
   wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
 
@@ -51,22 +52,12 @@ let
     paths = vscodeExtensions;
   };
 
-  wrappedExeName = "code";
-  exeName = wrappedExeName;
-
-  wrapperExeFile = writeScript "${exeName}" ''
-    #!${stdenv.shell}
-    exec ${vscode}/bin/${wrappedExeName} \
-      --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \
-      "$@"
-  '';
-
 in
 
 # When no extensions are requested, we simply redirect to the original
 # non-wrapped vscode executable.
 runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
-  buildInputs = [ vscode which ];
+  buildInputs = [ vscode makeWrapper ];
   dontPatchELF = true;
   dontStrip = true;
   meta = vscode.meta;
@@ -75,13 +66,9 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
   mkdir -p "$out/share/applications"
   mkdir -p "$out/share/pixmaps"
 
-  ln -sT "${vscode}/share/applications/code.desktop" "$out/share/applications/code.desktop"
   ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
-  ${if [] == vscodeExtensions
-    then ''
-      ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
-    ''
-    else ''
-      ln -sT "${wrapperExeFile}" "$out/bin/${exeName}"
-    ''}
+  ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
+  makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \
+    --add-flags \
+      "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
 ''

From 01a7fa88139b5da9d6ad8920486f756176d2b34a Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Wed, 5 Dec 2018 00:19:33 +0100
Subject: [PATCH 088/199] loop: unstable-2018-10-02 -> unstable-2018-12-04

---
 pkgs/tools/misc/loop/default.nix          | 12 +++---------
 pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index acb88d9773c8..501ab664f83f 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage {
-  name = "loop-unstable-2018-10-02";
+  name = "loop-unstable-2018-12-04";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
     repo  = "Loop";
-    rev   = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
-    sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
+    rev   = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf";
+    sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
   };
 
   cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
 
-  cargoPatches = [
-    # Upstream includes mismatched Cargo.lock file.
-    # See https://github.com/Miserlou/Loop/pull/40
-    ./fix_cargo_lock.patch
-  ];
-
   meta = with stdenv.lib; {
     description = "UNIX's missing `loop` command";
     homepage = https://github.com/Miserlou/Loop;
diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch
deleted file mode 100644
index f991a604f336..000000000000
--- a/pkgs/tools/misc/loop/fix_cargo_lock.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "loop-rs"
--version = "0.3.5"
-+version = "0.4.0"
- dependencies = [
-  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-  "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

From b682e03e125f73985d6aa9c6c8ee9da1abc29935 Mon Sep 17 00:00:00 2001
From: Travis Athougies <iammisc@gmail.com>
Date: Tue, 4 Dec 2018 15:25:54 -0800
Subject: [PATCH 089/199] libgpg-error: enable Aarch32 support for musl

* Add ARM32 musl support for libgpg-error (#51013)
* libgpg-error: link headers instead of copying
---
 pkgs/development/libraries/libgpg-error/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 52d0f6f05cce..e713eb7f8918 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -28,8 +28,11 @@ in stdenv.mkDerivation (rec {
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
   '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
     ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
-  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+  '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) ''
     ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
+  '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
+    ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
+    ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
   '';
 
   outputs = [ "out" "dev" "info" ];

From 169e2797119cd90b631ccfce9307645890da11a1 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+github@xndr.de>
Date: Tue, 4 Dec 2018 23:27:26 +0000
Subject: [PATCH 090/199] kodi-cli: init at 1.1.1

* kodi-cli: init at 1.1.1 (#50892)

* kodi-cli: nitpicks

nitpicks applied are:

  - The pname thing
    staging-next has been merged.

  - Moved to tools/misc
    applications/video is more appropriate for video applications.
    This is a script used to interact with one.

  - Changed platforms to unix
    This script can only be used where kodi is present.
---
 pkgs/tools/misc/kodi-cli/default.nix | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/kodi-cli/default.nix

diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix
new file mode 100644
index 000000000000..d2fb32319bf7
--- /dev/null
+++ b/pkgs/tools/misc/kodi-cli/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "kodi-cli";
+  version = "1.1.1";
+  
+  src = fetchFromGitHub {
+    owner = "nawar";
+    repo = pname;
+    rev = version;
+    sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a kodi-cli $out/bin
+    wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]}
+    cp -a playlist_to_kodi $out/bin
+    wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
+  '';
+  
+  meta = with stdenv.lib; {
+    homepage = https://github.com/nawar/kodi-cli;
+    description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.pstn ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c5852e2217f..4cfe183f13e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19937,6 +19937,8 @@ in
     kodi = kodiPlain;
   };
 
+  kodi-cli = callPackage ../tools/misc/kodi-cli { };
+
   kodi-retroarch-advanced-launchers =
     callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
       cores = retroArchCores;

From 17a7e0d89ec059ea66beb602297259b26e8508d6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:43:23 -0500
Subject: [PATCH 091/199] kafka: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 52bb166f401c..42493d75815d 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -29,9 +29,9 @@ let
       sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2";
     };
     "2.0" = {
-      kafkaVersion = "2.0.0";
+      kafkaVersion = "2.0.1";
       scalaVersion = "2.12";
-      sha256 = "0mbrp8rafv1bra9nrdicpxy6w59ixanaj50c9pkgdrih82f57wdm";
+      sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
     };
   };
 in

From 7c5d43f4f5f2e77599302a907d7b382e6cc4eed4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:43:34 -0500
Subject: [PATCH 092/199] kafka: Add test for 2.0

---
 nixos/tests/kafka.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index a833e01f9f5e..f97472785f7b 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -40,7 +40,7 @@ let
 
         networking.firewall.allowedTCPPorts = [ 9092 ];
         # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
-        virtualisation.memorySize = 2047; 
+        virtualisation.memorySize = 2047;
       };
     };
 
@@ -70,4 +70,5 @@ in with pkgs; {
   kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
   kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
+  kafka_2_0  = makeKafkaTest "kafka_2_0"  apacheKafka_2_0;
 }

From 16f42b369474333091cf9a48955d08e5d4aa8233 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Dec 2018 11:44:39 -0500
Subject: [PATCH 093/199] kafka: Add 2.1

---
 nixos/tests/kafka.nix                 | 1 +
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index f97472785f7b..72f91f6428a5 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -71,4 +71,5 @@ in with pkgs; {
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
   kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
   kafka_2_0  = makeKafkaTest "kafka_2_0"  apacheKafka_2_0;
+  kafka_2_1  = makeKafkaTest "kafka_2_1"  apacheKafka_2_1;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 42493d75815d..348a9a88566b 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -33,6 +33,11 @@ let
       scalaVersion = "2.12";
       sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl";
     };
+    "2.1" = {
+      kafkaVersion = "2.1.0";
+      scalaVersion = "2.12";
+      sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cfe183f13e9..7e2c42abd802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8170,13 +8170,14 @@ in
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_2_0;
+  apacheKafka = apacheKafka_2_1;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
   apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
   apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
   apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
+  apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
 
   kt = callPackage ../tools/misc/kt {};
 

From 232f76ad2db986fbe3914abfbe9b35fb9a5f7624 Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Sun, 2 Dec 2018 23:37:32 -0500
Subject: [PATCH 094/199] rig: init at 1.11

---
 pkgs/tools/misc/rig/default.nix     | 31 +++++++++++++++++++++++
 pkgs/tools/misc/rig/rig_1.11-1.diff | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/tools/misc/rig/default.nix
 create mode 100644 pkgs/tools/misc/rig/rig_1.11-1.diff

diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix
new file mode 100644
index 000000000000..ee7b2623b1dd
--- /dev/null
+++ b/pkgs/tools/misc/rig/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl } :
+
+stdenv.mkDerivation rec {
+  version = "1.11";
+  name = "rig-${version}";
+
+  src = fetchurl {
+    url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
+    sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0";
+  };
+
+  # Note: diff modified from Debian: Norbert Veber <nveber@debian.org>
+  # http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz
+  patches = [ ./rig_1.11-1.diff ];
+
+  meta = {
+    homepage = http://rig.sourceforge.net/; 
+    description = "Random identity generator";
+    longDescription = ''
+      RIG (Random Identity Generator) is a free replacement for a shareware
+      program out there called 'fake'. It generates random, yet real-looking,
+      personal data. It is useful if you need to feed a name to a Web site,
+      BBS, or real person, and are too lazy to think of one yourself. Also,
+      if the Web site/BBS/person you are giving the information to tries to
+      cross-check the city, state, zip, or area code, it will check out.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tomberek ];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/tools/misc/rig/rig_1.11-1.diff
new file mode 100644
index 000000000000..301cf78b5a9b
--- /dev/null
+++ b/pkgs/tools/misc/rig/rig_1.11-1.diff
@@ -0,0 +1,39 @@
+--- rig-1.11.orig/Makefile
++++ rig-1.11/Makefile
+@@ -1,20 +1,21 @@
+-PREFIX=/usr/local
++PREFIX=${out}
+ BINDIR=${PREFIX}/bin
+ MANDIR=${PREFIX}/man
+ DATADIR=${PREFIX}/share/rig
++CXX=g++
+ 
+ all: rig rig.6
+ rig: rig.cc
+-	g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
++	${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
+ 
+ rig.6: rig.6.in
+ 	sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
+ 
+ install: rig rig.6
+-	install -g 0 -m 755 -o 0 -s rig $(BINDIR)
+-	install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
+-	install -g 0 -m 755 -o 0 -d $(DATADIR)
+-	install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
++	install -m 755 -d $(DESTDIR)$(DATADIR)
++	install -m 755 -d $(DESTDIR)$(BINDIR)
++	install -m 755 rig $(DESTDIR)$(BINDIR)/rig
++	install -m 644 data/*.idx $(DESTDIR)$(DATADIR)
+ 
+ clean:
+ 	rm -rf *~ *.rej *.orig *.o rig rig.6
+--- rig-1.11.orig/rig.cc
++++ rig-1.11/rig.cc
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ using namespace std;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed5429825..86167b7cf0f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5004,6 +5004,8 @@ with pkgs;
 
   remarshal = callPackage ../development/tools/remarshal { };
 
+  rig = callPackage ../tools/misc/rig { };
+
   rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
 
   rtaudio = callPackage ../development/libraries/audio/rtaudio { };

From 2a2255409265c070d8a3d9a00172452a468aa1ff Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 17:35:16 -0600
Subject: [PATCH 095/199] nixos/cockroachdb: simplify dataDir management,
 tweaks

This cleans up the CockroachDB expression, with a few suggestions from
@aszlig.

However, it brought up the note of using systemd's StateDirectory=
directive, which is a nice feature for managing long-term data files,
especially for UID/GID assigned services. However, it can only manage
directories under /var/lib (for global services), so it has to introduce
a special path to make use of it at all in the case someone wants a path
at a different root.

While the dataDir directive at the NixOS level is _occasionally_ useful,
I've gone ahead and removed it for now, as this expression is so new,
and it makes the expression cleaner, while other kinks can be worked out
and people can test drive it.

CockroachDB's dataDir directive, instead, has been replaced with
systemd's StateDirectory management to place the data under
/var/lib/cockroachdb for all uses.

There's an included RequiresMountsFor= clause like usual though, so if
people want dependencies for any kind of mounted device at boot
time/before database startup, it's easy to specify using their own
mount/filesystems clause.

This can also be reverted if necessary, but, we can see if anyone ever
actually wants that later on before doing it -- it's a backwards
compatible change, anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../services/databases/cockroachdb.nix        | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix
index 8de1e78633d5..e977751b21ef 100644
--- a/nixos/modules/services/databases/cockroachdb.nix
+++ b/nixos/modules/services/databases/cockroachdb.nix
@@ -13,7 +13,7 @@ let
     [ # Basic startup
       "${crdb}/bin/cockroach start"
       "--logtostderr"
-      "--store=${cfg.dataDir}"
+      "--store=/var/lib/cockroachdb"
       (ifNotNull cfg.locality "--locality='${cfg.locality}'")
 
       # WebUI settings
@@ -41,7 +41,7 @@ let
       };
 
       port = mkOption {
-        type = types.int;
+        type = types.port;
         default = defaultPort;
         description = "Port to bind to for ${descr}";
       };
@@ -70,10 +70,12 @@ in
           like datacenter.  The tiers and order must be the same on all nodes.
           Including more tiers is better than including fewer. For example:
 
+          <literal>
               country=us,region=us-west,datacenter=us-west-1b,rack=12
               country=ca,region=ca-east,datacenter=ca-east-2,rack=4
 
               planet=earth,province=manitoba,colo=secondary,power=3
+          </literal>
         '';
       };
 
@@ -83,12 +85,6 @@ in
         description = "The addresses for connecting the node to a cluster.";
       };
 
-      dataDir = mkOption {
-        type = types.path;
-        default = "/var/lib/cockroachdb";
-        description = "Location where CockroachDB stores its table files";
-      };
-
       insecure = mkOption {
         type = types.bool;
         default = false;
@@ -126,9 +122,12 @@ in
           The total size for caches.
 
           This can be a percentage, expressed with a fraction sign or as a
-          decimal-point number, or any bytes-based unit. For example, "25%",
-          "0.25" both represent 25% of the available system memory. The values
-          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+          decimal-point number, or any bytes-based unit. For example,
+          <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
+          25% of the available system memory. The values
+          <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
+          represent 1 gigabyte of memory.
+
         '';
       };
 
@@ -140,9 +139,11 @@ in
           data for SQL queries.
 
           This can be a percentage, expressed with a fraction sign or as a
-          decimal-point number, or any bytes-based unit. For example, "25%",
-          "0.25" both represent 25% of the available system memory. The values
-          "1000000000" and "1GB" both represent 1 gigabyte of memory.
+          decimal-point number, or any bytes-based unit. For example,
+          <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
+          25% of the available system memory. The values
+          <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
+          represent 1 gigabyte of memory.
         '';
       };
 
@@ -193,27 +194,21 @@ in
         requires = [ "time-sync.target" ];
         wantedBy = [ "multi-user.target" ];
 
-        unitConfig.RequiresMountsFor = "${cfg.dataDir}";
-
-        preStart = ''
-          if ! test -e ${cfg.dataDir}; then
-            mkdir -m 0700 -p ${cfg.dataDir}
-            chown -R ${cfg.user} ${cfg.dataDir}
-          fi
-        '';
+        unitConfig.RequiresMountsFor = "/var/lib/cockroachdb";
 
         serviceConfig =
           { ExecStart = startupCommand;
             Type = "notify";
             User = cfg.user;
-            PermissionsStartOnly = true;
+            StateDirectory = "cockroachdb";
+            StateDirectoryMode = "0700";
 
             Restart = "always";
-            TimeoutStopSec="60";
-            RestartSec="10";
-            StandardOutput="syslog";
-            StandardError="syslog";
-            SyslogIdentifier="cockroach";
+
+            # A conservative-ish timeout is alright here, because for Type=notify
+            # cockroach will send systemd pings during startup to keep it alive
+            TimeoutStopSec = 60;
+            RestartSec = 10;
           };
       };
   };

From f4414da64a18836138f0e6dad0d0227de6a2cefe Mon Sep 17 00:00:00 2001
From: Ding Xiang Fei <dingxiangfei2009@gmail.com>
Date: Tue, 4 Dec 2018 12:38:54 +0800
Subject: [PATCH 096/199] use interactive bash for gce

---
 pkgs/tools/virtualization/google-compute-engine/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 919c14d86ecf..73a8f5184778 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , buildPythonApplication
 , bash
+, bashInteractive
 , systemd
 , utillinux
 , boto
@@ -25,7 +26,7 @@ buildPythonApplication rec {
     for file in $(find google_compute_engine -type f); do
       substituteInPlace "$file" \
         --replace /bin/systemctl "${systemd}/bin/systemctl" \
-        --replace /bin/bash "${bash}/bin/bash" \
+        --replace /bin/bash "${bashInteractive}/bin/bash" \
         --replace /sbin/hwclock "${utillinux}/bin/hwclock"
 
       # SELinux tool ???  /sbin/restorecon

From 3aa9091162b48d82a58453a6bda0af98791f5f38 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:21:36 -0600
Subject: [PATCH 097/199] buildRustCreate: export RUSTDOC during cargo config

See https://github.com/NixOS/nixpkgs/pull/50452#issuecomment-443455411

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 1 +
 1 file changed, 1 insertion(+)

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 ff04ba6a8173..7630c6471dcd 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -73,6 +73,7 @@ in ''
   export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
   export NUM_JOBS=1
   export RUSTC="rustc"
+  export RUSTDOC="rustdoc"
   if [[ -n "${versionPre}" ]]; then
     export CARGO_PKG_VERSION_PRE="${versionPre}"
   fi

From e8bfc317fdbb2e45d4ad66f7361d0a7dc8d132cb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:41:08 -0500
Subject: [PATCH 098/199] pythonPackages.svgwrite: 1.1.6 -> 1.2.1

---
 .../development/python-modules/svgwrite/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix
index 79e03acd3599..1772e8794ffd 100644
--- a/pkgs/development/python-modules/svgwrite/default.nix
+++ b/pkgs/development/python-modules/svgwrite/default.nix
@@ -3,23 +3,30 @@
 , fetchPypi
 , setuptools
 , pyparsing
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "svgwrite";
-  version = "1.1.6";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
+    extension = "zip";
+    sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e";
   };
 
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ pyparsing ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python library to create SVG drawings";
-    homepage = https://bitbucket.org/mozman/svgwrite;
+    homepage = https://github.com/mozman/svgwrite;
     license = licenses.mit;
   };
 

From 9d8de9ffaa1bcdd4dc54b0e40666f0c42026a43c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 8 Nov 2018 14:15:07 -0600
Subject: [PATCH 099/199] =?UTF-8?q?c-ares:=20don=E2=80=99t=20set=20configu?=
 =?UTF-8?q?re=20flags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These aren’t needed with dontDisableStatic
---
 pkgs/development/libraries/c-ares/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index efe7a5820b53..9e38398dfad1 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
   };
 
-  configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
-
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
     homepage = https://c-ares.haxx.se;

From a3a6ad7a01e943a4097c87cb144d331910693d82 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:06:46 -0600
Subject: [PATCH 100/199] stdenv: implement crossOverlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.
---
 pkgs/stdenv/cross/default.nix   | 13 +++++++++----
 pkgs/stdenv/custom/default.nix  |  2 +-
 pkgs/stdenv/darwin/default.nix  |  4 ++--
 pkgs/stdenv/default.nix         |  4 ++--
 pkgs/stdenv/freebsd/default.nix |  2 +-
 pkgs/stdenv/linux/default.nix   |  4 ++--
 pkgs/stdenv/native/default.nix  |  2 +-
 pkgs/stdenv/nix/default.nix     |  4 ++--
 pkgs/top-level/default.nix      | 13 ++++++++-----
 9 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index daa9f66615c9..a6063049a3ad 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -1,11 +1,14 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 }:
 
 let
   bootStages = import ../. {
     inherit lib localSystem overlays;
-    crossSystem = null;
+
+    crossSystem = localSystem;
+    crossOverlays = [];
+
     # Ignore custom stdenvs when cross compiling for compatability
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
@@ -33,7 +36,8 @@ in lib.init bootStages ++ [
 
   # Run Packages
   (buildPackages: {
-    inherit config overlays;
+    inherit config;
+    overlays = overlays ++ crossOverlays;
     selfBuild = false;
     stdenv = buildPackages.stdenv.override (old: rec {
       buildPlatform = localSystem;
@@ -48,7 +52,7 @@ in lib.init bootStages ++ [
 
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if crossSystem.useAndroidPrebuilt or false
              then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
 
@@ -56,6 +60,7 @@ in lib.init bootStages ++ [
         ++ lib.optionals
              (hostPlatform.isLinux && !buildPlatform.isLinux)
              [ buildPackages.patchelf buildPackages.paxctl ]
+        ++ lib.optional hostPlatform.isDarwin buildPackages.clang
         ++ lib.optional
              (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
              buildPackages.updateAutotoolsGnuConfigScriptsHook
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index b6ea8685f8e6..e86face95195 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   bootStages = import ../. {
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5fb410b64ebd..b7d8e3ba5236 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,5 +1,5 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
@@ -16,7 +16,7 @@
   }
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 210e0439c0b8..c0bbe24e5219 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -7,7 +7,7 @@
 { # Args just for stdenvs' usage
   lib
   # Args to pass on to the pkgset builder, too
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 } @ args:
 
 let
@@ -36,7 +36,7 @@ let
 
   # Select the appropriate stages for the platform `system'.
 in
-  if crossSystem != null then stagesCross
+  if crossSystem != localSystem || crossOverlays != [] then stagesCross
   else if config ? replaceStdenv then stagesCustom
   else { # switch
     "i686-linux" = stagesLinux;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index b3a6cedad841..dbb4a0564558 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 let inherit (localSystem) system; in
 
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 978beea692c6..6d793999d904 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -4,7 +4,7 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 
 , bootstrapFiles ?
   let table = {
@@ -32,7 +32,7 @@
   in files
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system platform;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 37795b11f6dd..810cf16301f4 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -2,7 +2,7 @@
 , localSystem, crossSystem, config, overlays
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 let
   inherit (localSystem) system;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index ffff8bdf51d4..a8311f49609a 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -1,10 +1,10 @@
 { lib
-, crossSystem, config, overlays
+, crossSystem, localSystem, config, overlays
 , bootStages
 , ...
 }:
 
-assert crossSystem == null;
+assert crossSystem == localSystem;
 
 bootStages ++ [
   (prevStage: {
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index da7fc1bed34c..dcd443a1c29e 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,8 @@
   # `*Platform`s.
   localSystem
 
-, # The system packages will ultimately be run on. Null if the two should be the
-  # same.
-  crossSystem ? null
+, # The system packages will ultimately be run on.
+  crossSystem ? localSystem
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
@@ -32,6 +31,9 @@
 , # List of overlays layers used to extend Nixpkgs.
   overlays ? []
 
+, # List of overlays to apply to target packages only.
+  crossOverlays ? []
+
 , # A function booting the final package set for a specific standard
   # environment. See below for the arguments given to that function, the type of
   # list it returns.
@@ -61,7 +63,8 @@ in let
     builtins.intersectAttrs { platform = null; } config
     // args.localSystem);
 
-  crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0;
+  crossSystem = if crossSystem0 == null then localSystem
+                else lib.systems.elaborate crossSystem0;
 
   # A few packages make a new package set to draw their dependencies from.
   # (Currently to get a cross tool chain, or forced-i686 package.) Rather than
@@ -91,7 +94,7 @@ in let
   boot = import ../stdenv/booter.nix { inherit lib allPackages; };
 
   stages = stdenvStages {
-    inherit lib localSystem crossSystem config overlays;
+    inherit lib localSystem crossSystem config overlays crossOverlays;
   };
 
   pkgs = boot stages;

From b966d3c5835fdbaa153a9eacd08cdbf789ee1b40 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:10:45 -0600
Subject: [PATCH 101/199] treewide: remove static packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nixpkgs is meant to link everything dynamically. We don’t want to
expose static packages at the top level. If some package needs
statically built binaries, it should use a custom override.
---
 pkgs/tools/system/proot/default.nix |  9 ++------
 pkgs/top-level/all-packages.nix     | 34 ++++++++++++++---------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index d75be0ff5bce..63e135075b9c 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, talloc, docutils
-, enableStatic ? true }:
+, talloc, docutils }:
 
 ({ version, rev, sha256, patches }: stdenv.mkDerivation {
   name = "proot-${version}";
@@ -12,17 +11,13 @@
     owner = "cedric-vincent";
   };
 
-  buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static;
+  buildInputs = [ talloc ];
   nativeBuildInputs = [ docutils ];
 
   enableParallelBuilding = true;
 
   inherit patches;
 
-  preBuild = stdenv.lib.optionalString enableStatic ''
-    export LDFLAGS="-static"
-  '';
-
   makeFlags = [ "-C src" ];
 
   postBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59c37c8293cc..ac0cd7c194bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3488,9 +3488,7 @@ in
     buildGoPackage = buildGo110Package;
   };
 
-  ipmitool = callPackage ../tools/system/ipmitool {
-    static = false;
-  };
+  ipmitool = callPackage ../tools/system/ipmitool { };
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
@@ -3983,8 +3981,6 @@ in
 
   libiberty = callPackage ../development/libraries/libiberty { };
 
-  libiberty_static = libiberty.override { staticBuild = true; };
-
   libxc = callPackage ../development/libraries/libxc { };
 
   libxcomp = callPackage ../development/libraries/libxcomp { };
@@ -4902,7 +4898,9 @@ in
   plowshare = callPackage ../tools/misc/plowshare { };
 
   pngcheck = callPackage ../tools/graphics/pngcheck {
-    zlib = zlibStatic;
+    zlib = zlib.override {
+      static = true;
+    };
   };
 
   pngcrush = callPackage ../tools/graphics/pngcrush { };
@@ -5210,7 +5208,7 @@ in
   routino = callPackage ../tools/misc/routino { };
 
   rq = callPackage ../development/tools/rq {
-    v8 = v8_static;
+    v8 = v8.override { static = true; };
   };
 
   rsnapshot = callPackage ../tools/backup/rsnapshot { };
@@ -8028,7 +8026,9 @@ in
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
-  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
+  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm {
+    v8_static = v8.override { static = true; };
+  };
 
   wasm-gc = callPackage ../development/interpreters/wasm-gc { };
 
@@ -8450,7 +8450,9 @@ in
 
   lattice-diamond = callPackage ../development/tools/lattice-diamond { };
 
-  distcc = callPackage ../development/tools/misc/distcc { };
+  distcc = callPackage ../development/tools/misc/distcc {
+    libiberty_static = libiberty.override { staticBuild = true; };
+  };
 
   # distccWrapper: wrapper that works as gcc or g++
   # It can be used by setting in nixpkgs config like this, for example:
@@ -8811,7 +8813,9 @@ in
 
   openocd = callPackage ../development/tools/misc/openocd { };
 
-  oprofile = callPackage ../development/tools/profiling/oprofile { };
+  oprofile = callPackage ../development/tools/profiling/oprofile {
+    libiberty_static = libiberty.override { staticBuild = true; };
+  };
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
@@ -12712,8 +12716,6 @@ in
     stdenv = overrideCC stdenv gcc6;
   });
 
-  v8_static = lowPrio (res.v8.override { static = true; });
-
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
 
   vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
@@ -12948,10 +12950,6 @@ in
 
   zlog = callPackage ../development/libraries/zlog { };
 
-  zlibStatic = lowPrio (appendToName "static" (zlib.override {
-    static = true;
-  }));
-
   zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
   zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
   zeromq = zeromq4;
@@ -20610,7 +20608,9 @@ in
   openspades = callPackage ../games/openspades { };
 
   openttd = callPackage ../games/openttd {
-    zlib = zlibStatic;
+    zlib = zlib.override {
+      static = true;
+    };
   };
 
   opentyrian = callPackage ../games/opentyrian { };

From 8726f6a558ac7587db93ca2e67ec3ae1a0c0d5cc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:12:17 -0600
Subject: [PATCH 102/199] stdenv/adapters.nix: fixup makeStaticBinaries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore
---
 pkgs/stdenv/adapters.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 671306f6e6f2..850785cd881f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -32,13 +32,15 @@ rec {
   # Return a modified stdenv that tries to build statically linked
   # binaries.
   makeStaticBinaries = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_LINK = "-static";
+    { mkDerivation = args:
+      if stdenv.hostPlatform.isDarwin
+      then throw "Cannot build fully static binaries on Darwin/macOS"
+      else stdenv.mkDerivation (args // {
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static";
         configureFlags = (args.configureFlags or []) ++ [
             "--disable-shared" # brrr...
           ];
       });
-      isStatic = true;
     };
 
 

From 5e06294276754ef063c618a1ecb12b629cde8ac3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:13:24 -0600
Subject: [PATCH 103/199] darwin/libiconv: fix static/shared logic

The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.
---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index ea5a59536062..0532c88b66b9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -15,7 +15,7 @@ appleDerivation {
     (lib.enableFeature enableShared "shared")
   ];
 
-  postInstall = lib.optionalString (!enableStatic) ''
+  postInstall = lib.optionalString enableShared ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
     ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 

From e999def1597de9d03a35cfa6b62277adb0e9a7ad Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:14:41 -0600
Subject: [PATCH 104/199] zlib: clean up static/shared distincion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.
---
 pkgs/development/libraries/zlib/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index fe1c275aeda5..3a5638b22814 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchurl
-, static ? false
+, static ? true
+, shared ? true
 }:
 
 stdenv.mkDerivation (rec {
@@ -24,13 +25,15 @@ stdenv.mkDerivation (rec {
       --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
   '';
 
-  outputs = [ "out" "dev" "static" ];
+  outputs = [ "out" "dev" ]
+    ++ stdenv.lib.optional (shared && static) "static";
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-  configureFlags = stdenv.lib.optional (!static) "--shared";
+  configureFlags = stdenv.lib.optional shared "--shared"
+                   ++ stdenv.lib.optional (static && !shared) "--static";
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString (shared && static) ''
     moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
@@ -64,7 +67,7 @@ stdenv.mkDerivation (rec {
     "PREFIX=${stdenv.cc.targetPrefix}"
   ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
     "-f" "win32/Makefile.gcc"
-  ] ++ stdenv.lib.optionals (!static) [
+  ] ++ stdenv.lib.optionals shared [
     "SHARED_MODE=1"
   ];
 

From e212b9975172a43f329aefa4afaa41525323d87f Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 20 Nov 2018 12:51:26 -0800
Subject: [PATCH 105/199] amass: 2.8.3 -> 2.8.5

---
 pkgs/tools/networking/amass/default.nix | 20 +++++++++++++-------
 pkgs/tools/networking/amass/deps.nix    |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index adb43c4aa086..16e87d2a5c97 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -1,11 +1,12 @@
 { buildGoPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 }:
 
 buildGoPackage rec {
   name = "amass-${version}";
-  version = "2.8.3";
+  version = "2.8.5";
 
   goPackagePath = "github.com/OWASP/Amass";
 
@@ -13,17 +14,19 @@ buildGoPackage rec {
     owner = "OWASP";
     repo = "Amass";
     rev = version;
-    sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc";
+    sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy";
   };
 
-  # NOTE: this must be removed once amass > 2.8.3 is released. This version has
-  # a broken import caused by the project migrating to a new home.
-  preBuild = ''
-    sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go"
-  '';
+  outputs = [ "bin" "out" "wordlists" ];
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    mkdir -p $wordlists
+    cp -R $src/wordlists/*.txt $wordlists
+    gzip $wordlists/*.txt
+  '';
+
   meta = with lib; {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
@@ -33,6 +36,9 @@ buildGoPackage rec {
       uses the IP addresses obtained during resolution to discover associated
       netblocks and ASNs. All the information is then used to build maps of the
       target networks.
+
+      Amass ships with a set of wordlist (to be used with the amass -w flag)
+      that are found under the wordlists output.
       '';
     homepage = https://www.owasp.org/index.php/OWASP_Amass_Project;
     license = licenses.asl20;
diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix
index 711d64fd313e..e9b5acf618e2 100644
--- a/pkgs/tools/networking/amass/deps.nix
+++ b/pkgs/tools/networking/amass/deps.nix
@@ -94,8 +94,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "93218def8b18e66adbdab3eca8ec334700329f1f";
-      sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz";
+      rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
+      sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
     };
   }
 ]

From d1e477509c79124be16eff6981358d7927865aba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:54:42 -0500
Subject: [PATCH 106/199] termtosvg: 0.3.0 -> 0.6.0

---
 pkgs/tools/misc/termtosvg/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 65b1f71194ac..33af6a9d67b6 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -2,21 +2,17 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "termtosvg";
-  version = "0.3.0";
+  version = "0.6.0";
 
   # tests are not available when fetching from pypi
   src = fetchFromGitHub {
     owner = "nbedos";
     repo = pname;
     rev = version;
-    sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw";
+    sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ];
-
-  checkInputs = [ python3.pkgs.mock ];
-  preCheck = "export HOME=$(mktemp -d)";
-  postCheck = "unset HOME";
+  propagatedBuildInputs = with python3.pkgs; [ lxml pyte ];
 
   meta = with lib; {
     homepage = https://github.com/nbedos/termtosvg;

From 53a67891ab1fefd3aceed07f173cdd33f549fc70 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:16:43 -0600
Subject: [PATCH 107/199] ncurses: make shared linking optinoal

when enableShared = false, we set --without-shared flag.
---
 pkgs/development/libraries/ncurses/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 7db78af340cb..815db76d5ac3 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -4,6 +4,7 @@
 , mouseSupport ? false
 , unicode ? true
 , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
+, enableShared ? !enableStatic
 , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 
 , gpm
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # some aren't supported
 
   configureFlags = [
-    "--with-shared"
+    (lib.withFeature enableShared "shared")
     "--without-debug"
     "--enable-pc-files"
     "--enable-symlinks"

From c564ca83ee52855b93308a63d0da4228a5d2f212 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:21:43 -0500
Subject: [PATCH 108/199] pythonPackages.CairoSVG: 2.1.3 -> 2.2.1

---
 .../python-modules/cairosvg/default.nix          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 68b1924e5a86..abaabb24b4d9 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,18 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
 , cairocffi, cssselect2, defusedxml, pillow, tinycss2
 , pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
 
 buildPythonPackage rec {
   pname = "CairoSVG";
-  version = "2.1.3";
+  version = "2.2.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9";
+    sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14";
   };
 
+  patches = [
+    # Fix tests. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch;
+      sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26";
+    })
+  ];
+
+  LC_ALL="en_US.UTF-8";
+
   propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
 
   checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ];

From e728f2dab57375548ab52188c5801221a8251c87 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 22:23:34 -0500
Subject: [PATCH 109/199] pythonPackages.qasm2image: fix build

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

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 429159d05d7d..39c7b2055c1b 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     ${python.interpreter} tests/launch_tests.py
   '';
 
+  LC_ALL="en_US.UTF-8";
+
   meta = {
     description = "A Python module to visualise quantum circuit";
     homepage    = https://github.com/nelimeee/qasm2image;

From 6d90a8b8948185a3118faf183f29f4b8de294675 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 4 Dec 2018 21:17:22 -0600
Subject: [PATCH 110/199] top-level/stage.nix: add static overlay

Adds the static overlay that can be used to build Nixpkgs statically.
Can be used like:

  nix build pkgsStatic.hello

Not all packages build, as some rely on dynamic linking.
---
 pkgs/stdenv/darwin/portable-libsystem.sh |  10 ++
 pkgs/top-level/stage.nix                 |  16 +++
 pkgs/top-level/static.nix                | 150 +++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 pkgs/stdenv/darwin/portable-libsystem.sh
 create mode 100644 pkgs/top-level/static.nix

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
new file mode 100644
index 000000000000..27ae790fb5ab
--- /dev/null
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -0,0 +1,10 @@
+# Make /nix/store/...-libSystem “portable” for static built binaries.
+# This just rewrites everything in $1/bin to use the
+# /usr/lib/libSystem.B.dylib that is provided on every macOS system.
+
+fixupOutputHooks+=('fixLibsystemRefs $prefix')
+
+fixLibsystemRefs() {
+  find "$1/bin" \
+    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+}
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 276350e56e60..6ca370e0b9b7 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -174,6 +174,22 @@ let
     # Prefer appendOverlays if used repeatedly.
     extend = f: self.appendOverlays [f];
 
+    # Fully static packages.
+    # Currently uses Musl on Linux (couldn’t get static glibc to work).
+    pkgsStatic = nixpkgsFun ({
+      crossOverlays = [ (import ./static.nix) ];
+    } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      crossSystem = {
+        parsed = stdenv.hostPlatform.parsed // {
+          abi = {
+            "gnu" = lib.systems.parse.abis.musl;
+            "gnueabi" = lib.systems.parse.abis.musleabi;
+            "gnueabihf" = lib.systems.parse.abis.musleabihf;
+          }.${stdenv.hostPlatform.parsed.abi.name}
+            or lib.systems.parse.abis.musl;
+        };
+      };
+    });
   };
 
   # The complete chain of package set builders, applied from top to bottom.
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
new file mode 100644
index 000000000000..687e38dcc3aa
--- /dev/null
+++ b/pkgs/top-level/static.nix
@@ -0,0 +1,150 @@
+# Overlay that builds static packages.
+
+# Not all packages will build but support is done on a
+# best effort basic.
+#
+# Note on Darwin/macOS: Apple does not provide a static libc
+# so any attempts at static binaries are going to be very
+# unsupported.
+#
+# Basic things like pkgsStatic.hello should work out of the box. More
+# complicated things will need to be fixed with overrides.
+
+self: super: let
+  inherit (super.stdenvAdapters) makeStaticBinaries
+                                 overrideInStdenv
+                                 makeStaticLibraries;
+  inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions;
+  inherit (super) makeSetupHook;
+
+  # Best effort static binaries. Will still be linked to libSystem,
+  # but more portable than Nix store binaries.
+  makeStaticDarwin = stdenv: stdenv // {
+    mkDerivation = args: stdenv.mkDerivation (args // {
+      NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
+                      + " -static-libgcc";
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook {
+        substitutions = {
+          libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
+        };
+      } ../stdenv/darwin/portable-libsystem.sh) ];
+    });
+  };
+
+  staticAdapters = [ makeStaticLibraries ]
+
+    # Apple does not provide a static version of libSystem or crt0.o
+    # So we can’t build static binaries without extensive hacks.
+    ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
+
+    ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
+
+    # Glibc doesn’t come with static runtimes by default.
+    # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
+  ;
+
+  # Force everything to link statically.
+  haskellStaticAdapter = self: super: {
+    mkDerivation = attrs: super.mkDerivation (attrs // {
+      enableSharedLibraries = false;
+      enableSharedExecutables = false;
+      enableStaticLibraries = true;
+    });
+  };
+
+in {
+  stdenv = foldl (flip id) super.stdenv staticAdapters;
+
+  haskell = super.haskell // {
+    packageOverrides = composeExtensions
+      (super.haskell.packageOverrides or (_: _: {}))
+      haskellStaticAdapter;
+  };
+
+  ncurses = super.ncurses.override {
+    enableStatic = true;
+  };
+  libxml2 = super.libxml2.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  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;
+  };
+  xz = super.xz.override {
+    enableStatic = true;
+  };
+  busybox = super.busybox.override {
+    enableStatic = true;
+  };
+  v8 = super.v8.override {
+    static = true;
+  };
+  libiberty = super.libiberty.override {
+    staticBuild = true;
+  };
+  ipmitool = super.ipmitool.override {
+    static = true;
+  };
+  neon = super.neon.override {
+    static = true;
+    shared = false;
+  };
+  libjpeg = super.libjpeg.override {
+    static = true;
+  };
+  gifsicle = super.gifsicle.override {
+    static = true;
+  };
+  bzip2 = super.bzip2.override {
+    linkStatic = true;
+  };
+  optipng = super.optipng.override {
+    static = true;
+  };
+  openssl = super.openssl.override {
+    static = true;
+
+    # Don’t use new stdenv for openssl because it doesn’t like the
+    # --disable-shared flag
+    stdenv = super.stdenv;
+  };
+  boost = super.boost.override {
+    enableStatic = true;
+    enableShared = false;
+  };
+  gmp = super.gmp.override {
+    withStatic = true;
+  };
+  cdo = super.cdo.override {
+    enable_all_static = true;
+  };
+  gsm = super.gsm.override {
+    staticSupport = true;
+  };
+  parted = super.parted.override {
+    enableStatic = true;
+  };
+  libiconvReal = super.libiconvReal.override {
+    enableShared = false;
+    enableStatic = true;
+  };
+  perl = super.perl.override {
+    # Don’t use new stdenv zlib because
+    # it doesn’t like the --disable-shared flag
+    stdenv = super.stdenv;
+  };
+
+  darwin = super.darwin // {
+    libiconv = super.darwin.libiconv.override {
+      enableShared = false;
+      enableStatic = true;
+    };
+  };
+
+}

From d9f90bae6d3d43c3b9c7f3f8fe58afb142430d5e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 4 Dec 2018 23:01:45 -0500
Subject: [PATCH 111/199] pythonPackages.curtsies: fix build

---
 .../python-modules/curtsies/default.nix           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index d29ad1d64745..b0e9fee93d4c 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }:
 
 buildPythonPackage rec {
   pname = "curtsies";
@@ -8,7 +8,16 @@ buildPythonPackage rec {
     sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";
   };
 
-  propagatedBuildInputs = [ blessings wcwidth typing ];
+  patches = [
+    # Fix dependency on typing. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch;
+      sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs";
+    })
+  ];
+
+  propagatedBuildInputs = [ blessings wcwidth ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
 
   checkInputs = [ mock pyte nose ];
 
@@ -18,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Curses-like terminal wrapper, with colored strings!";
-    homepage = https://pypi.python.org/pypi/curtsies;
+    homepage = https://github.com/bpython/curtsies;
     license = licenses.mit;
     maintainers = with maintainers; [ flokli ];
   };

From aad111f5678d4cf7359bae4e6e9868ef35b61ec9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Tue, 4 Dec 2018 22:15:51 -0600
Subject: [PATCH 112/199] skhd: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index b3bf590bf268..713847313c2c 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8";
+    sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl";
   };
 
   buildInputs = [ Carbon ];

From 4121e9314973791ca7b2d37c565c9143ec211e6f Mon Sep 17 00:00:00 2001
From: fuwa <echowss@gmail.com>
Date: Sun, 2 Dec 2018 13:49:22 +0800
Subject: [PATCH 113/199] altcoins.aeon: 0.12.6.0 -> 0.12.8.0

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

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
index 4bff3aa23296..42717d3a2667 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.12.6.0";
+  version = "0.12.8.0";
 in
 stdenv.mkDerivation {
   name = "aeon-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     repo = "aeon";
     rev = "v${version}-aeon";
     fetchSubmodules = true;
-    sha256 = "19r1snqwixccl27jwv6i0s86qck036pdlhyhl891bbiyvi55h14n";
+    sha256 = "1qmlz820mjs0b60d7i90lxcwwxmsdy6swq67v6n8mbb79zmcx8ii";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];

From c9fd7dc0eed5cf1972d3491540c9df5e96071973 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:41:50 -0600
Subject: [PATCH 114/199] foundationdb60: 6.0.15 -> 6.0.17

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 8af94d4f2d92..173d2beb7697 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -187,8 +187,8 @@ in with builtins; {
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.15";
+    version = "6.0.17";
     branch  = "release-6.0";
-    sha256  = "1z8104nj1qn738bs1zjiq1mdn8dnj4vksb3fh503mf3ygl54mjbw";
+    sha256  = "00m6dkv2nm51zhiq049fiivnz8hpc8w21y024lykhn16kyjdnfhs";
   };
 }

From 3ebdd65ad7b2a4d810f271b20b7e69e0fb0e7151 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 4 Dec 2018 19:57:18 -0600
Subject: [PATCH 115/199] foundationdb: x86_64-linux only

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 173d2beb7697..7e4babbb979b 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -167,7 +167,7 @@ let
           description = "Open source, distributed, transactional key-value store";
           homepage    = https://www.foundationdb.org;
           license     = licenses.asl20;
-          platforms   = platforms.linux;
+          platforms   = [ "x86_64-linux" ];
           maintainers = with maintainers; [ thoughtpolice ];
        };
     };

From 3c22d57743d3eab7b18a38afe68b975f53d20dfd Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 4 Dec 2018 23:18:09 -0500
Subject: [PATCH 116/199] reptyr: 0.6.2 -> 0.7.0

---
 pkgs/os-specific/linux/reptyr/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 37f1362e14ea..bd25dc65ec85 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,31 +1,32 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub, python2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.2";
+  version = "0.7.0";
   name = "reptyr-${version}";
+
   src = fetchFromGitHub {
     owner = "nelhage";
     repo = "reptyr";
     rev = "reptyr-${version}";
-    sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8";
+    sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj";
   };
 
-  # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-  postPatch = ''
-    sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c
-  '';
+  makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
 
-  # Needed with GCC 7
-  NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";
+  checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ];
+  doCheck = true;
 
-  makeFlags = ["PREFIX=$(out)"];
   meta = {
     platforms = [
       "i686-linux"
       "x86_64-linux"
       "i686-freebsd"
       "x86_64-freebsd"
-    ] ++ lib.platforms.arm;
+      "armv5tel-linux"
+      "armv6l-linux"
+      "armv7l-linux"
+      "aarch64-linux"
+    ];
     maintainers = with lib.maintainers; [raskin];
     license = lib.licenses.mit;
     description = "Reparent a running program to a new terminal";

From 4b843a8106b0c5bc826e4330beae6f329cf60d1e Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Wed, 5 Dec 2018 13:40:07 +0800
Subject: [PATCH 117/199] go-ethereum: 1.8.17 -> 1.8.19

---
 maintainers/maintainer-list.nix            | 5 +++++
 pkgs/applications/altcoins/go-ethereum.nix | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5d77f75c65c9..8058927a9c4a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2464,6 +2464,11 @@
     github = "listx";
     name = "Linus Arver";
   };
+  lionello = {
+    email = "lio@lunesu.com";
+    github = "lionello";
+    name = "Lionello Lunesu";
+  };
   lluchs = {
     email = "lukas.werling@gmail.com";
     github = "lluchs";
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 156cbc01a29b..2d6312364fd1 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.17";
+  version = "1.8.19";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -16,13 +16,13 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd";
+    sha256 = "0shp8ak44v52ynlyawfh53wczd3zch7ydf6bmbrhm5rpbribirwr";
   };
 
   meta = with stdenv.lib; {
     homepage = https://ethereum.github.io/go-ethereum/;
     description = "Official golang implementation of the Ethereum protocol";
     license = with licenses; [ lgpl3 gpl3 ];
-    maintainers = [ maintainers.adisbladis ];
+    maintainers = [ maintainers.adisbladis maintainers.lionello ];
   };
 }

From f03c9c25ac7a856d4073f6051939052bfb5ac2e6 Mon Sep 17 00:00:00 2001
From: Philippe <pcfeb0009@gmx.com>
Date: Wed, 5 Dec 2018 07:01:40 +0100
Subject: [PATCH 118/199] Add cl-jpeg, cl-pdf & cl-typesetting, no extra
 external deps

---
 .../quicklisp-to-nix-output/cl-jpeg.nix       | 25 ++++++++++
 .../quicklisp-to-nix-output/cl-pdf.nix        | 27 +++++++++++
 .../cl-typesetting.nix                        | 28 +++++++++++
 .../lisp-modules/quicklisp-to-nix-systems.txt |  3 ++
 .../lisp-modules/quicklisp-to-nix.nix         | 46 +++++++++++++++----
 5 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
new file mode 100644
index 000000000000..713aff0ea405
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-jpeg'';
+  version = ''20170630-git'';
+
+  description = ''A self-contained baseline JPEG codec implementation'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
+    sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
+  };
+
+  packageName = "cl-jpeg";
+
+  asdFilesToKeep = ["cl-jpeg.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-jpeg DESCRIPTION
+    A self-contained baseline JPEG codec implementation SHA256
+    1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL
+    http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz
+    MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL
+    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
new file mode 100644
index 000000000000..babdf04e3ec2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -0,0 +1,27 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-pdf'';
+  version = ''20170830-git'';
+
+  description = ''Common Lisp PDF Generation Library'';
+
+  deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz'';
+    sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s'';
+  };
+
+  packageName = "cl-pdf";
+
+  asdFilesToKeep = ["cl-pdf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
+    1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL
+    http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz
+    MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS
+    ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
+     (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS
+    (cl-pdf-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
new file mode 100644
index 000000000000..358666877a6d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-typesetting'';
+  version = ''20170830-git'';
+
+  description = ''Common Lisp Typesetting system'';
+
+  deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
+    sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
+  };
+
+  packageName = "cl-typesetting";
+
+  asdFilesToKeep = ["cl-typesetting.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
+    1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL
+    http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz
+    MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME
+    cl-typesetting DEPS
+    ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
+     (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS
+    (xml-render cl-pdf-doc) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3b10d610d272..e78ec34a0a96 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -28,12 +28,14 @@ cl-fuse
 cl-fuse-meta-fs
 cl-html-parse
 cl-html5-parser
+cl-jpeg
 cl-json
 cl-l10n
 cl-libuv
 cl-mysql
 closer-mop
 closure-html
+cl-pdf
 cl-ppcre
 cl-ppcre-template
 cl-ppcre-unicode
@@ -50,6 +52,7 @@ cl-syntax-annot
 cl-syntax-anonfun
 cl-syntax-markup
 cl-test-more
+cl-typesetting
 cl-unicode
 cl-unification
 cl-utilities
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 8a126d4fd986..e904f0041d13 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -278,14 +278,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "zpb-ttf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."zpb-ttf" or (x: {}))
-       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
-         inherit fetchurl;
-       }));
-
-
   "cl-store" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-store" or (x: {}))
@@ -359,6 +351,14 @@ let quicklisp-to-nix-packages = rec {
   "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
 
 
+  "zpb-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."zpb-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+         inherit fetchurl;
+       }));
+
+
   "puri" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."puri" or (x: {}))
@@ -1907,6 +1907,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-typesetting" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-typesetting" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-typesetting.nix {
+         inherit fetchurl;
+           "cl-pdf" = quicklisp-to-nix-packages."cl-pdf";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "cl-test-more" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-test-more" or (x: {}))
@@ -2103,6 +2114,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-pdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-pdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-pdf.nix {
+         inherit fetchurl;
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "closure-html" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."closure-html" or (x: {}))
@@ -2190,6 +2212,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-jpeg" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-jpeg" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-jpeg.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-html5-parser" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-html5-parser" or (x: {}))

From 09a59a9fa361c8e2eb6720c1f3240b38330347c5 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Wed, 5 Dec 2018 16:31:08 +0800
Subject: [PATCH 119/199] hivemind: init at 1.0.4

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

diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
new file mode 100644
index 000000000000..0431f35057be
--- /dev/null
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "hivemind-${version}";
+  version = "1.0.4";
+  goPackagePath = "github.com/DarthSim/hivemind";
+
+  src = fetchFromGitHub {
+    owner = "DarthSim";
+    repo = "hivemind";
+    rev = "v${version}";
+    sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/DarthSim/;
+    description = "Process manager for Procfile-based applications";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.sveitser ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac0cd7c194bf..0d74c18ff9ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3312,6 +3312,8 @@ in
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
+  hivemind = callPackage ../applications/misc/hivemind { };
+
   hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
 
   highlight = callPackage ../tools/text/highlight ({

From b3411342a41518fc80f37067e26f9da30400a397 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 8 Nov 2018 17:17:43 +0000
Subject: [PATCH 120/199] ocamlPackages.zmq: fix build with non-default OCaml

---
 .../development/ocaml-modules/zmq/default.nix | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix
index fe6a17e876b6..bb16ac46f991 100644
--- a/pkgs/development/ocaml-modules/zmq/default.nix
+++ b/pkgs/development/ocaml-modules/zmq/default.nix
@@ -1,9 +1,16 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, czmq, stdint }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }:
 
-buildDunePackage rec {
-  pname = "zmq";
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "zmq is not available for OCaml ${ocaml.version}"
+else
+
+let __dune = dune; in
+let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; };
+in
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-zmq-${version}";
   version = "20180726";
-
   src = fetchFromGitHub {
     owner = "issuu";
     repo = "ocaml-zmq";
@@ -15,13 +22,19 @@ buildDunePackage rec {
     ./ocaml-zmq-issue43.patch
   ];
 
-  buildInputs = [ czmq ];
+  buildInputs = [ ocaml findlib dune czmq ];
+
   propagatedBuildInputs = [ stdint ];
 
+  buildPhase = "dune build -p zmq";
+
+  inherit (dune) installPhase;
+
   meta = with stdenv.lib; {
     description = "ZeroMQ bindings for OCaml";
     license     = licenses.mit;
     maintainers = with maintainers; [ akavel ];
     inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
   };
 }

From f698c0c4184d3dc2ba30a64becd8583bef6d0525 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Nov 2018 17:25:33 +0000
Subject: [PATCH 121/199] ocamlPackages.frontc: 3.4 -> 3.4.1

---
 .../ocaml-modules/frontc/default.nix          | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix
index e5330789e262..39ec4c011f85 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/pkgs/development/ocaml-modules/frontc/default.nix
@@ -1,37 +1,38 @@
-{ lib, buildOcaml, fetchurl, ocaml }:
+{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, ocaml, findlib }:
 
-if lib.versionAtLeast ocaml.version "4.06"
-then throw "FrontC is not available for OCaml ${ocaml.version}"
-else
+let
+  meta_file = fetchurl {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META;
+    sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d";
+  };
+in
 
-buildOcaml rec {
-  name = "FrontC";
-  version = "3.4";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-FrontC-${version}";
+  version = "3.4.1";
 
-  src = fetchurl {
-    url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz";
-    sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g";
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "FrontC";
+    rev = "V_3_4_1";
+    sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak";
   };
 
+  buildInputs = [ ocaml findlib ];
+
   meta = with lib; {
-    homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61;
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
     description = "C Parsing Library";
     license = licenses.lgpl21;
     maintainers = [ maintainers.maurer ];
   };
 
-  meta_file = fetchurl {
-    url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META;
-    sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx";
-  };
-
-  opam_patch = fetchurl {
-    url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch;
-    sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5";
-  };
-
-  patches = [ opam_patch ];
-  patchFlags = "-p4";
+  patches = [ (fetchpatch {
+      url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch;
+      sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs";
+    })
+  ];
 
   makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)";
 

From 5c82aa885404e36b026cd2084e7432c6e5194139 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 4 Dec 2018 23:52:55 +0100
Subject: [PATCH 122/199] pkgsi686Linux.nixosTests.gitlab: fix 32 bit tests

GitLab 11.5.1 dropped the dependency to posix_spawn, which is broken on
32bit. (See https://gitlab.com/gitlab-org/gitlab-ce/issues/53525)

The only part missing is decreasing virtualisation.memorySize to
something that a 32 bit qemu still executes.

The maximum seems to be 2047, and tests passed with that value for me.
---
 nixos/tests/gitlab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 269da8aa215f..f401fe098dcc 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
 
   nodes = {
     gitlab = { ... }: {
-      virtualisation.memorySize = 4096;
+      virtualisation.memorySize = 2047;
       systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
       systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
       systemd.services.gitaly.serviceConfig.Restart = mkForce "no";

From 199b4c47434aecea7aa56edb82879327df228b23 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 5 Dec 2018 04:24:20 +0100
Subject: [PATCH 123/199] prometheus/exporters/tor: make CPython happy by
 defining $HOME

---
 .../modules/services/monitoring/prometheus/exporters/tor.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
index 0e2a13c44ab7..e0ae83802425 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
@@ -36,5 +36,10 @@ in
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
+
+    # CPython requires a process to either have $HOME defined or run as a UID
+    # defined in /etc/passwd. The latter is false with DynamicUser, so define a
+    # dummy $HOME. https://bugs.python.org/issue10496
+    environment = { HOME = "/var/empty"; };
   };
 }

From 3873f43fc39d6662ffedc3e0413a8741558e5952 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 5 Dec 2018 04:24:37 +0100
Subject: [PATCH 124/199] prometheus/exporters: fix regression in DynamicUser
 behavior

Instead of setting User/Group only when DynamicUser is disabled, the
previous version of the code set it only when it was enabled. This
caused services with DynamicUser enabled to actually run as nobody, and
services without DynamicUser enabled to run as root.

Regression from fbb7e0c82f297815950e9153c21e561a704bfcd5.
---
 nixos/modules/services/monitoring/prometheus/exporters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 950af848c0f6..5308c9c4ee08 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -127,7 +127,7 @@ let
         serviceConfig.Restart = mkDefault "always";
         serviceConfig.PrivateTmp = mkDefault true;
         serviceConfig.WorkingDirectory = mkDefault /tmp;
-      } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
+      } serviceOpts ] ++ optional (!(serviceOpts.serviceConfig.DynamicUser or false)) {
         serviceConfig.User = conf.user;
         serviceConfig.Group = conf.group;
       });

From df2e4428538d36485a2ea7383110869c64be850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Dec 2018 09:59:47 +0000
Subject: [PATCH 125/199] radare2: 3.1.2 -> 3.1.3

---
 .../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 e8bec4184b8d..55bae2740cc2 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -90,17 +90,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20299";
-    gittap = "3.1.2";
-    gittip = "b453df6acc6742d709bd238cd9cd63ede2534b1b";
-    rev = "3.1.2";
-    version = "3.1.2";
-    sha256 = "1cvfkxp8vj8f6ghhin71lynvq3zpc311y5b9c2sg9g7h4j3647nq";
+    version_commit = "20315";
+    gittap = "3.1.3";
+    gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7";
+    rev = "3.1.3";
+    version = "3.1.3";
+    sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d";
     cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a";
     cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y";
   };
   r2-for-cutter = generic {
-    version_commit = "20299";
+    version_commit = "20315";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";

From 99231a36bbb40e5886cdece219a4cb26da185bfc Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <schmittlauch@users.noreply.github.com>
Date: Wed, 5 Dec 2018 12:12:12 +0100
Subject: [PATCH 126/199] dino: 2018-11-27 -> 2018-11-29 (#51557)

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index d2cbf7bbdfc6..429429bc4117 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -14,13 +14,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-11-27";
+  name = "dino-unstable-2018-11-29";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "141db9e40a3a81cfa3ad3587dc47f69c541d0fde";
-    sha256 = "006r1x7drlz39jjxlfdnxgrnambw9amhl9jcgf6p1dx71h1x8221";
+    rev = "680d28360c781ff29e810821801cfaba0493c526";
+    sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln";
     fetchSubmodules = true;
   };
 

From 33e7330440b5e0c50d482a5d283fe09f42b43830 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 1 Dec 2018 00:24:39 +0800
Subject: [PATCH 127/199] libgpiod: init at 2018-10-07

Co-Authored-By: expipiplus1 <github@sub.monoid.al>
---
 .../libraries/libgpiod/default.nix            | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/libgpiod/default.nix

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
new file mode 100644
index 000000000000..c498ef3460ac
--- /dev/null
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
+
+stdenv.mkDerivation rec {
+  name = "libgpiod-unstable-${version}";
+  version = "2018-10-07";
+
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
+    rev = "4bf402d3a49336eacd33654441d575bd267780b8";
+    sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d";
+  };
+
+  buildInputs = [ kmod ];
+  nativeBuildInputs = [
+    autoconf-archive
+    pkgconfig
+    autoreconfHook
+  ];
+
+  configureFlags = [
+    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-bindings-cxx"
+    "--prefix=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "C library and tools for interacting with the linux GPIO character device";
+    longDescription = ''
+      Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
+      the character device instead. This library encapsulates the ioctl calls and
+      data structures behind a straightforward API.
+    '';
+    homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.expipiplus1 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d74c18ff9ef..8d524a73ac85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10796,6 +10796,8 @@ in
 
   libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
 
+  libgpiod = callPackage ../development/libraries/libgpiod { };
+
   libgpod = callPackage ../development/libraries/libgpod {
     inherit (pkgs.pythonPackages) mutagen;
     monoSupport = false;

From 33e6c84753088652f77d16b372ca9fbfb4fb523a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 12:46:21 +0000
Subject: [PATCH 128/199] jenkins: 2.138.3 -> 2.150.1

Fixes several security issues.

See https://jenkins.io/blog/2018/12/05/security-updates/.
---
 .../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 7a401f88be31..ecfdc1b027c1 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.138.3";
+  version = "2.150.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm";
+    sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s";
   };
 
   buildCommand = ''

From 296b33370984c3ddb8a40d7d02f6f8718f5d8459 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 4 Dec 2018 21:52:47 +0100
Subject: [PATCH 129/199] all-packages.nix: Fix reference to self warning

This reference was added to master while the deprecation PR #51401 was open.
---
 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 ec30ddd8ae77..28990809190b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17369,7 +17369,7 @@ in
   jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
-  slack-dark = self.slack.override { darkMode = true; };
+  slack-dark = pkgs.slack.override { darkMode = true; };
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 

From b5360ce722fe2b4d2a2613406a58867a78776518 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 5 Dec 2018 14:50:35 +0100
Subject: [PATCH 130/199] govers: 20150109 -> 20160623

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

diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index 440b5e2eb0b7..152b619966c9 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "govers-${version}";
-  version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
+  version = "20160623-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43";
 
   goPackagePath = "github.com/rogpeppe/govers";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/rogpeppe/govers";
-    sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
+    sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn";
   };
 
   dontRenameImports = true;

From 3064dd19063b1dbc41b779660296509042f4823f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 5 Dec 2018 14:50:54 +0100
Subject: [PATCH 131/199] gox: 0.4.0 -> 20181025

We need the latest gox to support the latest go releases better.
Unfortunately the author doesn't seem interesting in making new releases
(1y already since the last release).
---
 pkgs/development/tools/gox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 69b20dd3a179..b28bf24892c2 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "gox-${version}";
-  version = "0.4.0";
+  version = "20181025";
 
   goPackagePath = "github.com/mitchellh/gox";
 
   src = fetchFromGitHub {
     owner = "mitchellh";
     repo = "gox";
-    rev = "v${version}";
-    sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
+    rev = "9cc487598128d0963ff9dcc51176e722788ec645";
+    sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6";
   };
 
   goDeps = ./deps.nix;

From c8091a8995f7817037bc8844929a890e09c4b435 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 4 Dec 2018 21:55:53 +0100
Subject: [PATCH 132/199] vault: 0.11.5 -> 1.0.0

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 84c35bd36a65..ac79fc8d464c 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.11.5";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
+    sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From b47d83f793c3662764bc990da2d58ec59101188f Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 5 Dec 2018 12:22:41 +0100
Subject: [PATCH 133/199] leela-zero: init at 0.16

---
 pkgs/games/leela-zero/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/games/leela-zero/default.nix

diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix
new file mode 100644
index 000000000000..c1238b7b3bbb
--- /dev/null
+++ b/pkgs/games/leela-zero/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, boost, eigen
+, opencl-headers, ocl-icd, qtbase , zlib }:
+
+stdenv.mkDerivation rec {
+  name = "leela-zero-${version}";
+  version = "0.16";
+
+  src = fetchFromGitHub {
+    owner = "gcp";
+    repo = "leela-zero";
+    rev = "v${version}";
+    sha256 = "1px7wqvlv414gklzgrmppp8wzc2mkskinm1p75j4snbqr8qpbn5s";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [ boost opencl-headers ocl-icd qtbase zlib ];
+
+  nativeBuildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Go engine modeled after AlphaGo Zero";
+    homepage    = https://github.com/gcp/leela-zero;
+    license     = licenses.gpl3;
+    maintainers = [ maintainers.averelld ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec30ddd8ae77..f6fb7d2f2e95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20523,6 +20523,8 @@ in
 
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
+  leela-zero = libsForQt5.callPackage ../games/leela-zero { };
+
   lgogdownloader = callPackage ../games/lgogdownloader { };
 
   liberal-crime-squad = callPackage ../games/liberal-crime-squad { };

From e814fba3168703eed6e2b67200299ea40beca418 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 09:27:34 -0500
Subject: [PATCH 134/199] scala: 2.12.7 -> 2.12.8

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 2d6c060e89e0..ce863ef9c915 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.7";
+  name = "scala-2.12.8";
 
   src = fetchurl {
     url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn";
+    sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 6dc9347712ca32c5c11b0b19ed43bea8d362ddf6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 15:18:27 +0000
Subject: [PATCH 135/199] weechat: fix bad merge

Identified in https://github.com/NixOS/nixpkgs/pull/44102/commits/8887e1f697d9e13ad277ca7d7054bc42c2459548#r239097413.

9504292b1e9948fb286b1b1cdbe83f66b367b64d accidentally reverted all the
changes that had been made to the weechat wrapper since
8887e1f697d9e13ad277ca7d7054bc42c2459548.

I removed the wrapper, then wrote it again, but this time taking the
code from the latest version of weechat before the bad merge.
---
 .../networking/irc/weechat/wrapper.nix        | 83 ++++++++++++-------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index 5c557a8fd242..1e371bb8e223 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,4 +1,5 @@
-{ pythonPackages, perl, runCommand, lib, writeScriptBin, stdenv
+{ stdenv, lib, runCommand, writeScriptBin, buildEnv
+, pythonPackages, perl, perlPackages
 }:
 
 weechat:
@@ -10,31 +11,37 @@ let
 
   let
     perlInterpreter = perl;
-    config = configure {
-      availablePlugins = let
-        simplePlugin = name: { pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so"; };
-        in rec {
-          python = {
-            pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
-            withPackages = pkgsFun: (python // {
-              extraEnv = ''
-                export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
-              '';
-            });
-          };
-          perl = (simplePlugin "perl") // {
+    availablePlugins = let
+        simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+      in rec {
+        python = {
+          pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+          withPackages = pkgsFun: (python // {
             extraEnv = ''
-              export PATH="${perlInterpreter}/bin:$PATH"
+              export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
             '';
-          };
-          tcl = simplePlugin "tcl";
-          ruby = simplePlugin "ruby";
-          guile = simplePlugin "guile";
-          lua = simplePlugin "lua";
+          });
         };
-    };
+        perl = (simplePlugin "perl") // {
+          extraEnv = ''
+            export PATH="${perlInterpreter}/bin:$PATH"
+          '';
+          withPackages = pkgsFun: (perl // {
+            extraEnv = ''
+              ${perl.extraEnv}
+              export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
+            '';
+          });
+        };
+        tcl = simplePlugin "tcl";
+        ruby = simplePlugin "ruby";
+        guile = simplePlugin "guile";
+        lua = simplePlugin "lua";
+      };
 
-    inherit (config) plugins;
+    config = configure { inherit availablePlugins; };
+
+    plugins = config.plugins or (builtins.attrValues availablePlugins);
 
     pluginsDir = runCommand "weechat-plugins" {} ''
       mkdir -p $out/plugins
@@ -43,14 +50,30 @@ let
       done
     '';
 
-  in (writeScriptBin "weechat" ''
-    #!${stdenv.shell}
-    export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
-    ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
-    exec ${weechat}/bin/weechat "$@"
-  '') // {
-    name = weechat.name;
-    unwrapped = weechat;
+    init = let
+      init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
+
+      mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
+
+      scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
+        [ ] (config.scripts or []));
+    in "${scripts};${init}";
+
+    mkWeechat = bin: (writeScriptBin bin ''
+      #!${stdenv.shell}
+      export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+      ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+      exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
+    '') // {
+      inherit (weechat) name meta;
+      unwrapped = weechat;
+    };
+  in buildEnv {
+    name = "weechat-bin-env-${weechat.version}";
+    paths = [
+      (mkWeechat "weechat")
+      (mkWeechat "weechat-headless")
+    ];
     meta = weechat.meta;
   };
 

From 5205aaa65540346cbdd1c49acc9a477db7818e13 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Wed, 5 Dec 2018 15:15:45 +0000
Subject: [PATCH 136/199] qmltermwidget: add missing utmp lib on darwin

---
 pkgs/development/libraries/qmltermwidget/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 79ed37dd2a9a..26386e0c42c4 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
   };
 
-  buildInputs = [ qtbase qtquick1 qtmultimedia ];
+  buildInputs = [ qtbase qtquick1 qtmultimedia ]
+                ++ stdenv.lib.optional stdenv.isDarwin utmp;
   nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A QML port of qtermwidget";
     homepage = https://github.com/Swordfish90/qmltermwidget;
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd3601..02fbe56a8d0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11852,7 +11852,9 @@ with pkgs;
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
-    qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
+    qmltermwidget = callPackage ../development/libraries/qmltermwidget {
+      inherit (darwin.apple_sdk.libs) utmp;
+    };
     qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { };
 
     qscintilla = callPackage ../development/libraries/qscintilla {

From 703827f36cc65b137eed4d759b31827d29733072 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Dec 2018 13:34:58 +0000
Subject: [PATCH 137/199] nginx: 1.14.1 -> 1.14.2

---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index e69d9e61eb98..f4cb22a38f61 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.14.1";
-  sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz";
+  version = "1.14.2";
+  sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80";
 })

From 47f54a48bdbbbff6f3c4e20f4fb1b8e764d132b8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 5 Dec 2018 12:05:17 -0500
Subject: [PATCH 138/199] pythonPackages.parsimonious: 0.7.0 -> 0.8.1

---
 .../python-modules/parsimonious/default.nix       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix
index 13fabd4cbf90..69e6d1d2bb2c 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@@ -1,22 +1,21 @@
 { stdenv
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , nose
 , six
 }:
 
 buildPythonPackage rec {
-  version = "0.7.0";
+  version = "0.8.1";
   pname = "parsimonious";
 
-  src = fetchFromGitHub {
-    repo = "parsimonious";
-    owner = "erikrose";
-    rev = version;
-    sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b";
   };
 
-  propagatedBuildInputs = [ nose six ];
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ six ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/erikrose/parsimonious";

From ee1613aea656119a872c3e75334e8469c27fff44 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 5 Dec 2018 18:13:08 +0100
Subject: [PATCH 139/199] nextcloud: 14.0.3 -> 14.0.4

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3f6fed1e0a03..ecd3a5e5c9bf 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nextcloud-${version}";
-  version = "14.0.3";
+  version = "14.0.4";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p";
+    sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag";
   };
 
   patches = [ (fetchpatch {

From 963b113a3531f892e68de0064620039d48c90b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 5 Dec 2018 19:01:15 +0100
Subject: [PATCH 140/199] soapyrtlsdr: init at 0.2.5

---
 .../applications/misc/soapyrtlsdr/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/soapyrtlsdr/default.nix

diff --git a/pkgs/applications/misc/soapyrtlsdr/default.nix b/pkgs/applications/misc/soapyrtlsdr/default.nix
new file mode 100644
index 000000000000..c62cb88e4954
--- /dev/null
+++ b/pkgs/applications/misc/soapyrtlsdr/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, rtl-sdr, soapysdr
+} :
+
+let
+  version = "0.2.5";
+
+in stdenv.mkDerivation {
+  name = "soapyrtlsdr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyRTLSDR";
+    rev = "soapy-rtlsdr-${version}";
+    sha256 = "1wyghfqq3vcbjn5w06h5ik62m6555inrlkyrsnk2r78865xilkv3";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ rtl-sdr soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyRTLSDR;
+    description = "SoapySDR plugin for RTL-SDR devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ragge ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4354acf0ca8..ea789d0c1b48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12388,10 +12388,13 @@ in
       soapybladerf
       soapyhackrf
       soapyremote
+      soapyrtlsdr
       soapyuhd
     ];
   };
 
+  soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { };
+
   soapyuhd = callPackage ../applications/misc/soapyuhd { };
 
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };

From 93ba7aa8c560905638b9425599204e9f94bef387 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 5 Dec 2018 13:48:18 -0500
Subject: [PATCH 141/199] tradcpp: improved aarch64 support

---
 pkgs/development/tools/tradcpp/aarch64.patch | 12 ++++++++++++
 pkgs/development/tools/tradcpp/default.nix   |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/tradcpp/aarch64.patch

diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/development/tools/tradcpp/aarch64.patch
new file mode 100644
index 000000000000..ef7ad9828ace
--- /dev/null
+++ b/pkgs/development/tools/tradcpp/aarch64.patch
@@ -0,0 +1,12 @@
+diff a/config.h b/config.h
+--- a/config.h
++++ b/config.h
+@@ -124,6 +124,8 @@
+ #define CONFIG_CPU "__ppc64__"
+ #elif defined(__ARM__)
+ #define CONFIG_CPU "__ARM__"
++#elif defined(__aarch64__)
++#define CONFIG_CPU "__aarch64__"
+ #else
+ /* let it go */
+ #endif
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix
index 64a97ad00873..7f395174bb41 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/pkgs/development/tools/tradcpp/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation {
   # tradcpp only comes with BSD-make Makefile; the patch adds configure support
   buildInputs = [ autoconf ];
   preConfigure = "autoconf";
-  patches = [ ./tradcpp-configure.patch ];
+  patches = [
+    ./tradcpp-configure.patch
+    ./aarch64.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "A traditional (K&R-style) C macro preprocessor";

From 0b8574540b8691924a8dac6dc4d03004d8b25efa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 5 Dec 2018 12:51:44 -0600
Subject: [PATCH 142/199] stdenv/darwin: fix portable libsystem hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some packages don’t have /bin directories. We should only run
install_name_tool if that directory exists.
---
 pkgs/stdenv/darwin/portable-libsystem.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh
index 27ae790fb5ab..f50ccc8d32ee 100644
--- a/pkgs/stdenv/darwin/portable-libsystem.sh
+++ b/pkgs/stdenv/darwin/portable-libsystem.sh
@@ -5,6 +5,8 @@
 fixupOutputHooks+=('fixLibsystemRefs $prefix')
 
 fixLibsystemRefs() {
-  find "$1/bin" \
-    -exec install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  if [ -d "$1/bin" ]; then
+      find "$1/bin" -exec \
+        install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
+  fi
 }

From 73a87b57a620fb7408e32da18a3983b794e63cfc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 3 Dec 2018 09:35:21 -0600
Subject: [PATCH 143/199] gimp: fix on darwin

Fixes #41071
---
 pkgs/applications/graphics/gimp/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 201ebf7b2984..4d835e6590ed 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -3,7 +3,7 @@
 , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
 , harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr
-, AppKit, Cocoa, gtk-mac-integration }:
+, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }:
 
 let
   inherit (python2Packages) pygtk wrapPython python;
@@ -23,8 +23,11 @@ in stdenv.mkDerivation rec {
     freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
     libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
     python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    # cf-private is needed to get some things not in swift-corefoundation.
+    # For instance _OBJC_CLASS_$_NSArray is missing.
+    AppKit Cocoa gtk-mac-integration-gtk2 cf-private
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
 
   pythonPath = [ pygtk ];
 
@@ -69,7 +72,9 @@ in stdenv.mkDerivation rec {
     "--with-icc-directory=/var/run/current-system/sw/share/color/icc"
   ];
 
-  doCheck = true;
+  # on Darwin,
+  # test-eevl.c:64:36: error: initializer element is not a compile-time constant
+  doCheck = !stdenv.isDarwin;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed5429825..698812c52d35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17050,6 +17050,7 @@ with pkgs;
     lcms = lcms2;
     inherit (gnome3) gexiv2;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
+    inherit (darwin) cf-private;
   };
 
   gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {

From c88337c9aca9d91804da7d1d05960c88e17455c9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 4 Dec 2018 12:18:06 -0500
Subject: [PATCH 144/199] dockerTools.buildImage: support using a layered image
 in fromImage

Docker images used to be, essentially, a linked list of layers. Each
layer would have a tarball and a json document pointing to its parent,
and the image pointed to the top layer:

    imageA  ----> layerA
                    |
                    v
                  layerB
                    |
                    v
                  layerC

The current image spec changed this format to where the Image defined
the order and set of layers:

    imageA  ---> layerA
            |--> layerB
            `--> layerC

For backwards compatibility, docker produces images which follow both
specs: layers point to parents, and images also point to the entire
list:

    imageA  ---> layerA
            |      |
            |      v
            |--> layerB
            |      |
            |      v
            `--> layerC

This is nice for tooling which supported the older version and never
updated to support the newer format.

Our `buildImage` code only supported the old version, so in order for
`buildImage` to properly generate an image based on another image
with `fromImage`, the parent image's layers must fully support the old
mechanism.

This is not a problem in general, but is a problem with
`buildLayeredImage`.

`buildLayeredImage` creates images with newer image spec, because
individual store paths don't have a guaranteed parent layer. Including
a specific parent ID in the layer's json makes the output less likely
to cache hit when published or pulled.

This means until now, `buildLayeredImage` could not be the input to
`buildImage`.

The changes in this PR change `buildImage` to only use the layer's
manifest when locating parent IDs. This does break buildImage on
extremely old Docker images, though I do wonder how many of these
exist.

This work has been sponsored by Target.
---
 nixos/tests/docker-tools.nix           |  4 +++
 pkgs/build-support/docker/default.nix  | 46 +++++++++++++++++---------
 pkgs/build-support/docker/examples.nix | 19 +++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 360b32faae72..ecd14b274eb3 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -62,5 +62,9 @@ import ./make-test.nix ({ pkgs, ... }: {
       # Ensure Layered Docker images work
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'");
       $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}");
+
+      # Ensure building an image on top of a layered Docker images work
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
+      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
     '';
 })
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 890f64a9d3b1..f16cb7cec13a 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -188,22 +188,27 @@ rec {
         # Use the name and tag to get the parent ID field.
         parentID=$(jshon -e $fromImageName -e $fromImageTag -u \
                    < image/repositories)
+
+        cat ./image/manifest.json  | jq -r '.[0].Layers | .[]' > layer-list
+      else
+        touch layer-list
       fi
 
       # Unpack all of the parent layers into the image.
       lowerdir=""
-      while [[ -n "$parentID" ]]; do
-        echo "Unpacking layer $parentID"
-        mkdir -p image/$parentID/layer
-        tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
-        rm image/$parentID/layer.tar
+      extractionID=0
+      for layerTar in $(cat layer-list); do
+        echo "Unpacking layer $layerTar"
+        extractionID=$((extractionID + 1))
 
-        find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
+        mkdir -p image/$extractionID/layer
+        tar -C image/$extractionID/layer -xpf $layerTar
+        rm $layerTar
+
+        find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
 
         # Get the next lower directory and continue the loop.
-        lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
-        parentID=$(cat image/$parentID/json \
-                  | (jshon -e parent -u 2>/dev/null || true))
+        lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer
       done
 
       mkdir work
@@ -673,6 +678,9 @@ rec {
         if [[ -n "$fromImage" ]]; then
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
+
+          cat ./image/manifest.json  | jq -r '.[0].Layers | .[]' > layer-list
+
           # Do not import the base image configuration and manifest
           chmod a+w image image/*.json
           rm -f image/*.json
@@ -690,6 +698,8 @@ rec {
           for l in image/*/layer.tar; do
             ls_tar $l >> baseFiles
           done
+        else
+          touch layer-list
         fi
 
         chmod -R ug+rw image
@@ -742,17 +752,23 @@ rec {
         # Use the temp folder we've been working on to create a new image.
         mv temp image/$layerID
 
+        # Add the new layer ID to the beginning of the layer list
+        (
+          # originally this used `sed -i "1i$layerID" layer-list`, but
+          # would fail if layer-list was completely empty.
+          echo "$layerID/layer.tar"
+          cat layer-list
+        ) | ${pkgs.moreutils}/bin/sponge layer-list
+
         # Create image json and image manifest
         imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
         manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
-        currentID=$layerID
-        while [[ -n "$currentID" ]]; do
-          layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
+
+        for layerTar in $(cat ./layer-list); do
+          layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1)
           imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
           imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
-          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
-
-          currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true))
+          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .")
         done
 
         imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 003e7429a81b..090bfafa0855 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -156,5 +156,24 @@ rec {
     name = "layered-image";
     tag = "latest";
     config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+    contents = [ pkgs.hello pkgs.bash pkgs.coreutils ];
+  };
+
+  # 11. Create an image on top of a layered image
+  layered-on-top = pkgs.dockerTools.buildImage {
+    name = "layered-on-top";
+    tag = "latest";
+    fromImage = layered-image;
+    extraCommands = ''
+      mkdir ./example-output
+      chmod 777 ./example-output
+    '';
+    config = {
+      Env = [ "PATH=${pkgs.coreutils}/bin/" ];
+      WorkingDir = "/example-output";
+      Cmd = [
+        "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo"
+      ];
+    };
   };
 }

From d2b467a2de7212b078fb970c70675c55da5038e3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 5 Dec 2018 18:40:06 +0100
Subject: [PATCH 145/199] rWrapper: use runCommand, local build only

This seems more appropriate for a wrapper generator.
---
 pkgs/development/r-modules/wrapper.nix | 36 ++++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index d77c24e913d3..76e819501a57 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -1,25 +1,21 @@
-{ stdenv, R, makeWrapper, recommendedPackages, packages }:
+{ runCommand, R, makeWrapper, recommendedPackages, packages }:
 
-stdenv.mkDerivation {
-  name = R.name + "-wrapper";
+runCommand (R.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
+  buildInputs = [R] ++ recommendedPackages ++ packages;
+
+  nativeBuildInputs = [makeWrapper];
 
   # Make the list of recommended R packages accessible to other packages such as rpy2
-  passthru.recommendedPackages = recommendedPackages;
-
-  unpackPhase = ":";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cd ${R}/bin
-    for exe in *; do
-      makeWrapper ${R}/bin/$exe $out/bin/$exe \
-        --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
-    done
-  '';
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
+  passthru = { inherit recommendedPackages; };
 }
+''
+mkdir -p $out/bin
+cd ${R}/bin
+for exe in *; do
+  makeWrapper ${R}/bin/$exe $out/bin/$exe \
+    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
+done
+''

From 21d83e5b1164d1ddac5989168b1501354420b560 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 5 Dec 2018 19:04:04 +0100
Subject: [PATCH 146/199] rstudioWrapper: use runCommand, local build only

This seems more appropriate for a wrapper generator.
---
 .../development/r-modules/wrapper-rstudio.nix | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 8ad3a103c93a..5cbedf403d21 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -1,15 +1,15 @@
-{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
+{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
 
 let
-  qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}";
+  qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";
 in
-stdenv.mkDerivation rec {
+runCommand (rstudio.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  name = rstudio.name + "-wrapper";
+  nativeBuildInputs = [makeWrapper];
 
-  buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages;
-
-  unpackPhase = ":";
+  buildInputs = [R rstudio] ++ recommendedPackages ++ packages;
 
   # rWrapper points R to a specific set of packages by using a wrapper
   # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets
@@ -20,18 +20,14 @@ stdenv.mkDerivation rec {
   # into an R file (fixLibsR) which achieves the same effect, then
   # uses R_PROFILE_USER to load this code at startup in RStudio.
   fixLibsR = "fix_libs.R";
-  installPhase = ''
-    mkdir $out
-    echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR}
-    echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR}
-    echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
-    echo -n "\"))" >> $out/${fixLibsR}
-    echo >> $out/${fixLibsR}
-    makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \
-      --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins    
-  '';
-  
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
 }
+''
+mkdir $out
+echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
+echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
+echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR
+echo -n "\"))" >> $out/$fixLibsR
+echo >> $out/$fixLibsR
+makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/$fixLibsR \
+  --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+''

From 0325f01d31a973d2fce530917b06dfc132a68f87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 02:31:16 +0100
Subject: [PATCH 147/199] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.12-5-g7b287a8 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/47cd70c536559082de97f5343bd4d412fcaf4c3f.
---
 .../haskell-modules/hackage-packages.nix      | 279 +++++++++++++-----
 1 file changed, 199 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c85cc3a422c3..4c2673589ae6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7240,8 +7240,8 @@ self: {
      }:
      mkDerivation {
        pname = "HCL";
-       version = "1.7";
-       sha256 = "0f61kj9c58s06w882zxmv0s5yc0zxh3f5nx7gnx2dx8p7d3f4y34";
+       version = "1.7.1";
+       sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -15289,8 +15289,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, hspec }:
      mkDerivation {
        pname = "RLP";
-       version = "1.0.0";
-       sha256 = "15m872ys5jzn21psqccgz24f5zchvj5hcz1kll18v0pivh2c4hd0";
+       version = "1.0.1";
+       sha256 = "0xxhd2whz8q3zxrk37pwbhjayfhq9dv89068q0qlfwwg6aby0k6s";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
@@ -21619,6 +21619,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "advent-of-code-api" = callPackage
+    ({ mkDerivation, base, containers, curl, deepseq, directory
+     , filepath, finite-typelits, mtl, taggy, text, time, uri-encode
+     }:
+     mkDerivation {
+       pname = "advent-of-code-api";
+       version = "0.1.0.0";
+       sha256 = "15dn78scm0hj1dqcd4xm4gmdvbmjd7afkrh64pnwfbldy74smfxy";
+       libraryHaskellDepends = [
+         base containers curl deepseq directory filepath finite-typelits mtl
+         taggy text time uri-encode
+       ];
+       description = "Advent of Code REST API bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aern2-mp" = callPackage
     ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
      , mixed-types-num, QuickCheck, regex-tdfa, rounded
@@ -28533,8 +28549,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbor-monad-metric";
-       version = "0.0.2";
-       sha256 = "0c8734nf8zgkwqgjphdqb0fa6p3qvc6cj0n16k22v8ri5ziyha76";
+       version = "0.0.4";
+       sha256 = "1g5d5a0lcx255002a02i0zc987pyimhm34h0vrbqaibapbp98yi0";
        libraryHaskellDepends = [
          base containers generic-lens lens mtl resourcet stm transformers
        ];
@@ -28542,28 +28558,31 @@ self: {
          arbor-datadog base bytestring containers generic-lens hedgehog
          hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers
        ];
+       description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
     ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
-     , bytestring, containers, generic-lens, hedgehog, hspec
-     , hw-hspec-hedgehog, lens, mtl, network, resourcet, stm, text
-     , transformers
+     , bytestring, containers, exceptions, fast-logger, generic-lens
+     , hedgehog, hspec, hw-hspec-hedgehog, lens, monad-logger, mtl
+     , network, resourcet, stm, text, transformers
      }:
      mkDerivation {
        pname = "arbor-monad-metric-datadog";
-       version = "0.0.1";
-       sha256 = "0padn66j6hxpndnakkd1hvf2jkhab1djr20c2hvp1m9kim5c3cz9";
+       version = "0.0.3";
+       sha256 = "0dqidvn3nblnnnsiq0zqhg3d9b09bv1ksnrfyyibyi75mhvx3d3r";
        libraryHaskellDepends = [
          arbor-datadog arbor-monad-metric base bytestring containers
          generic-lens lens mtl network resourcet stm text transformers
        ];
        testHaskellDepends = [
          arbor-datadog arbor-monad-metric base bytestring containers
-         generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network
-         resourcet stm text transformers
+         exceptions fast-logger generic-lens hedgehog hspec
+         hw-hspec-hedgehog lens monad-logger mtl network resourcet stm text
+         transformers
        ];
+       description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -32730,8 +32749,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.50";
-       sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr";
+       version = "0.5.51";
+       sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33589,6 +33608,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base64-bytestring_1_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , HUnit, QuickCheck, split, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "base64-bytestring";
+       version = "1.0.0.2";
+       sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring containers HUnit QuickCheck split test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq
+       ];
+       description = "Fast base64 encoding and decoding for ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base64-bytestring-type" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty
@@ -39562,7 +39603,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_42" = callPackage
+  "brick_0_42_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, directory, dlist, filepath, microlens
      , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
@@ -39570,8 +39611,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.42";
-       sha256 = "1hrfw10zy1450slj79d432zi6wiy11jr1ciz3xh0fx27zns4yqyy";
+       version = "0.42.1";
+       sha256 = "1ckisdvq0n5j35abz8as36jhp872yp3vjyxq1wbpf4lc1bnplw8k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45570,6 +45611,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "chan_0_0_4_1" = callPackage
+    ({ mkDerivation, async, base, stm }:
+     mkDerivation {
+       pname = "chan";
+       version = "0.0.4.1";
+       sha256 = "1ks74njh8fj9dh8qhydwjyqdx8lrdj5fif455cxfshvdbwhcnvwj";
+       libraryHaskellDepends = [ async base stm ];
+       testHaskellDepends = [ async base stm ];
+       description = "Some extra kit for Chans";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chan-split" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -67501,14 +67555,15 @@ self: {
      }) {};
 
   "drmaa" = callPackage
-    ({ mkDerivation, base, directory, drmaa, inline-c }:
+    ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }:
      mkDerivation {
        pname = "drmaa";
-       version = "0.2.0";
-       sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6";
-       libraryHaskellDepends = [ base directory inline-c ];
+       version = "0.3.0";
+       sha256 = "1x1r3m1gqikm6n5m006zy3c9z106qa4ykl7qa90pa29wg03475z5";
+       libraryHaskellDepends = [ base directory exceptions ];
        librarySystemDepends = [ drmaa ];
-       description = "A minimal Haskell bindings to DRMAA C library";
+       libraryToolDepends = [ c2hs ];
+       description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {drmaa = null;};
@@ -85653,8 +85708,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ghcjs-perch";
-       version = "0.3.3.2";
-       sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7";
+       version = "0.3.3.3";
+       sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
@@ -101200,8 +101255,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.8.2";
-       sha256 = "1scd87ivzmrf8ar44wkijcgpr40c996dvq5rx1py2bxw0zdd1ibq";
+       version = "0.8.4";
+       sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite entropy hashable memory mtl murmur3 network
@@ -101210,7 +101265,7 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
-         safe split string-conversions text vector
+         safe split string-conversions text unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
@@ -101322,8 +101377,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.9.0";
-       sha256 = "0351kjfykh94lpf6kpdw18vzpdn13k0zak99n72hl2ybpy8d1yk6";
+       version = "0.9.1";
+       sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102039,6 +102094,8 @@ self: {
        pname = "hasmin";
        version = "1.0.2.1";
        sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
+       revision = "1";
+       editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104305,6 +104362,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_10_9" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
+     , resource-pool, scanner, stm, test-framework, test-framework-hunit
+     , text, time, tls, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.10.9";
+       sha256 = "0y64h61w78pn3yn2hi3q41bbp5zwjlycjz2w23x6sh2w5b2xphw3";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq errors HTTP mtl
+         network network-uri resource-pool scanner stm text time tls
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl stm test-framework
+         test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -127341,8 +127423,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "3.0.0";
-       sha256 = "1ryk896kg2bs0w430zsg235h861nf43qn9hl1r285dh53jgj6mnw";
+       version = "3.0.1";
+       sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132344,7 +132426,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-puppet_1_4_1" = callPackage
+  "language-puppet_1_4_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, filecache, filepath, formatting, Glob
@@ -132358,8 +132440,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.4.1";
-       sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66";
+       version = "1.4.2";
+       sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -139204,8 +139286,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.0.1";
-       sha256 = "0rswd308ngrl2ii13j2pl09cddh6pycm7skiyilsk54j395wy2ky";
+       version = "0.5.0.2";
+       sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -141827,15 +141909,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_2_4_1" = callPackage
+  "massiv_0_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, data-default-class
      , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
      , vector
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.2.4.1";
-       sha256 = "198xik64fw3n4wk3gy1rrxl2l3jwzn8b8h1yskg71mlvpv598lwk";
+       version = "0.2.5.0";
+       sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq ghc-prim primitive
          vector
@@ -141903,6 +141985,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matchable" = callPackage
+    ({ mkDerivation, base, containers, doctest, doctest-discover, Glob
+     , hashable, hspec, tagged, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "matchable";
+       version = "0.1.1.1";
+       sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53";
+       libraryHaskellDepends = [
+         base containers hashable tagged unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers doctest doctest-discover Glob hashable hspec tagged
+         unordered-containers vector
+       ];
+       description = "A type class for Matchable Functors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matcher" = callPackage
     ({ mkDerivation, base, base-prelude, profunctors, success, text
      , transformers
@@ -142262,30 +142363,31 @@ self: {
   "matterhorn" = callPackage
     ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat
      , brick, brick-skylighting, bytestring, cheapskate, checkers
-     , config-ini, connection, containers, directory, filepath, gitrev
-     , hashable, Hclip, mattermost-api, mattermost-api-qc
-     , microlens-platform, mtl, process, quickcheck-text, random
-     , semigroups, skylighting-core, stm, stm-delay, strict
-     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, text-zipper, time, timezone-olson
-     , timezone-series, transformers, Unique, unix, unordered-containers
-     , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
+     , config-ini, connection, containers, data-clist, directory
+     , filepath, gitrev, hashable, Hclip, mattermost-api
+     , mattermost-api-qc, microlens-platform, mtl, process
+     , quickcheck-text, random, semigroups, skylighting-core, stm
+     , stm-delay, strict, string-conversions, tasty, tasty-hunit
+     , tasty-quickcheck, temporary, text, text-zipper, time
+     , timezone-olson, timezone-series, transformers, Unique, unix
+     , unordered-containers, utf8-string, uuid, vector, vty, word-wrap
+     , xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.0.0";
-       sha256 = "07zbkkbn5cn8rcbc0xznlldcflhfp4szx6phlh7xpgf2hrcyc3g6";
+       version = "50200.1.0";
+       sha256 = "02rwxq42my7347p1wb0jh50z1m6fqkifgxg2hd2vrxiwzblyz0qc";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aspell-pipe async base base-compat brick brick-skylighting
-         bytestring cheapskate config-ini connection containers directory
-         filepath gitrev hashable Hclip mattermost-api microlens-platform
-         mtl process random semigroups skylighting-core stm stm-delay strict
-         temporary text text-zipper time timezone-olson timezone-series
-         transformers unix unordered-containers utf8-string uuid vector vty
-         word-wrap xdg-basedir
+         bytestring cheapskate config-ini connection containers data-clist
+         directory filepath gitrev hashable Hclip mattermost-api
+         microlens-platform mtl process random semigroups skylighting-core
+         stm stm-delay strict temporary text text-zipper time timezone-olson
+         timezone-series transformers unix unordered-containers utf8-string
+         uuid vector vty word-wrap xdg-basedir
        ];
        testHaskellDepends = [
          base base-compat brick bytestring cheapskate checkers config-ini
@@ -142310,8 +142412,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "50200.0.1";
-       sha256 = "1snb51nw71cqjxanaf443dixz8b8vk99a8a4b1yya1xvikvdxf7c";
+       version = "50200.1.0";
+       sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142335,8 +142437,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "50200.0.1";
-       sha256 = "02ashys70857a5s7zx26zx6vdlybsdk9bil2bqawfkf6xcjhwq13";
+       version = "50200.1.0";
+       sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -153897,8 +153999,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.6.1";
-       sha256 = "1nzhfarz42b6arqndynp4zp4sq87g8ya9xh3zpyhsw8a3wz5idr0";
+       version = "1.6.2";
+       sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -153913,8 +154015,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.3.2.0";
-       sha256 = "12c1g6712v8m6mnysiq9pm5g4178vmrxq3j4v50fm02njj4rdpnb";
+       version = "0.3.3.0";
+       sha256 = "06bi9vzq8alb4wylmq9npisnnpsc0r96srbmq68hmy6pjrva6rlg";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -159564,6 +159666,8 @@ self: {
        pname = "pandoc";
        version = "2.5";
        sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm";
+       revision = "1";
+       editedCabalFile = "15jzrlf1qnn3qkzy1zk5f300y7748qdz8yk0zg0zy7ygi36b403v";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -183267,19 +183371,19 @@ self: {
   "ron" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , containers, criterion, data-default, deepseq, Diff, directory
-     , errors, extra, filepath, hashable, mtl, network-info, safe
-     , stringsearch, template-haskell, text, time, unordered-containers
+     , errors, extra, filepath, hashable, hedn, mtl, network-info, safe
+     , template-haskell, text, time, transformers, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "ron";
-       version = "0.2";
-       sha256 = "1dv1lfz9v31k817cby0252jy08sd9c01l1jrlhqf243w25a6zp41";
+       version = "0.3";
+       sha256 = "09mpv535rahaclj5yppzkg4n083d0rpqkr3r2zrmj1ywg5nw5h0i";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring containers data-default
-         deepseq Diff directory errors extra filepath hashable mtl
-         network-info safe stringsearch template-haskell text time
-         unordered-containers vector
+         Diff directory errors extra filepath hashable hedn mtl network-info
+         safe template-haskell text time transformers unordered-containers
+         vector
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "RON, RON-RDT, and RON-Schema";
@@ -184039,8 +184143,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.2.17";
-       sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm";
+       version = "0.2.36";
+       sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190423,6 +190527,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ruby_0_9_0_0" = callPackage
+    ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
+     , text
+     }:
+     mkDerivation {
+       pname = "servant-ruby";
+       version = "0.9.0.0";
+       sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33";
+       libraryHaskellDepends = [ base casing servant-foreign text ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       description = "Generate a Ruby client from a Servant API with Net::HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-scotty" = callPackage
     ({ mkDerivation, aeson, base, http-types, scotty, servant
      , servant-response, text, transformers
@@ -192047,8 +192166,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.17.2";
-       sha256 = "1wl837d89b0zl0fzhh51y718p9dv99qid0gr3rkqyvbvhayj5dcm";
+       version = "0.17.3";
+       sha256 = "0k0r44csgrlw9y80m88npvanw5ddqm634799qjiab39gvbd3p6kw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -202729,15 +202848,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_28_0" = callPackage
+  "stratosphere_0_28_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.28.0";
-       sha256 = "1rb138h9w34qvdjc3zddz4gm169ddiv690cwq0mpbfwv28v6j1fg";
+       version = "0.28.1";
+       sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -232363,8 +232482,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.29";
-       sha256 = "136sqbfcwp1l7ynmmayihar25qa5kn04axy4mwzf7a6nc5b3zzxf";
+       version = "0.29.1";
+       sha256 = "0q8ssd51r1bdm6rr5frlq0v00c4af8xgc3zgs4sa23yy3yf9gzrm";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"

From 8e11a25d5f58bc40d90578f767140ae3bff3beaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 20:38:08 +0100
Subject: [PATCH 148/199] haskell-brick: update override for the new version

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 53776037f2b2..94ac1244ffa7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,7 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   base-orphans = self.base-orphans_0_8;
-  brick = self.brick_0_42;
+  brick = self.brick_0_42_1;
   cassava-megaparsec = doJailbreak super.cassava-megaparsec;
   config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
   contravariant = self.contravariant_1_5;

From db6aeeae56e11fbe899e6d329203422cad77c51b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 20:45:32 +0100
Subject: [PATCH 149/199] haskell-json-autotype: disable the test suite 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 82542e6ac028..0d0eee11d5c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1195,4 +1195,7 @@ self: super: {
   # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
   xmobar = dontCheck super.xmobar;
 
+  # https://github.com/mgajda/json-autotype/issues/25
+  json-autotype = dontCheck super.json-autotype;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 8fbbee18d3a4c52ef6796e6a45be14fd81c3bbc5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Dec 2018 21:39:27 +0100
Subject: [PATCH 150/199] all-cabal-hashes: update to Hackage at
 2018-12-05T19:25:40Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 6024bdc1ad71..893ad997c11b 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/95366a34cd5c9b47444ac819562fff2f23d7d753.tar.gz";
-  sha256 = "184qrgb7jl1s79v4z1jz9ywihilf60jh93xhwf0n75vnxb4ibnfd";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz";
+  sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax";
 }

From f5e664f805b143cd2a85bedfd28177089c062d1f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 5 Dec 2018 16:12:48 -0500
Subject: [PATCH 151/199] opensans-ttf: change source to salsa, rename to
 open-sans

---
 pkgs/data/fonts/open-sans/default.nix    | 33 ++++++++++++++++++++++++
 pkgs/data/fonts/opensans-ttf/default.nix | 27 -------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 +-
 4 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/data/fonts/open-sans/default.nix
 delete mode 100644 pkgs/data/fonts/opensans-ttf/default.nix

diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix
new file mode 100644
index 000000000000..d8918a6567bb
--- /dev/null
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitLab }:
+
+stdenv.mkDerivation rec {
+  pname = "open-sans";
+  version = "1.11";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "fonts-team";
+    repo = "fonts-open-sans";
+    rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag
+    sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open Sans fonts";
+    longDescription = ''
+      Open Sans is a humanist sans serif typeface designed by Steve Matteson,
+      Type Director of Ascender Corp.
+    '';
+    homepage = https://www.opensans.com;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.worldofpeace ];
+  };
+}
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
deleted file mode 100644
index 6f3762c971c9..000000000000
--- a/pkgs/data/fonts/opensans-ttf/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchzip}:
-
-fetchzip {
-  name = "opensans-ttf-20140617";
-
-  url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
-
-  postFetch = ''
-    tar -xzf $downloadedFile
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
-  '';
-
-  sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf";
-
-  meta = {
-    description = "Open Sans fonts";
-    longDescription = ''
-      Open Sans is a humanist sans serif typeface designed by Steve Matteson,
-      Type Director of Ascender Corp.
-    '';
-    homepage = https://en.wikipedia.org/wiki/Open_Sans;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 02971c5dcff6..e33d9bccafb6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -209,6 +209,7 @@ mapAliases ({
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
   openjpeg_2_1 = openjpeg_2; # added 2018-10-25
+  opensans-ttf = open-sans; # added 2018-12-04
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e52ed5429825..28861078fb9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15487,7 +15487,7 @@ with pkgs;
 
   open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
 
-  opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
+  open-sans = callPackage ../data/fonts/open-sans { };
 
   orbitron = callPackage ../data/fonts/orbitron { };
 

From 851a52983b6a44a868604879f291c2da367c1e59 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 6 Dec 2018 01:02:52 +0300
Subject: [PATCH 152/199] yed: 3.18.1.1 -> 3.18.2

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

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 9100efc86394..7267e9bc4857 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, requireFile, makeWrapper, unzip, jre }:
+{ stdenv, fetchzip, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.18.1.1";
+  version = "3.18.2";
 
-  src = requireFile {
-    name = "${name}.zip";
-    url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y";
+  src = fetchzip {
+    url = "https://www.yworks.com/resources/yed/demo/${name}.zip";
+    sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy";
   };
 
-  nativeBuildInputs = [ unzip makeWrapper ];
+  nativeBuildInputs = [ makeWrapper unzip ];
 
   installPhase = ''
     mkdir -p $out/yed

From db8002cdf1856173182f9418588157bd7cb3d3cf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 5 Dec 2018 21:06:04 +0000
Subject: [PATCH 153/199] firefox-devedition-bin: 64.0b10 -> 65.0b1

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 345082392a8e..20da9410999c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "64.0b10";
+  version = "65.0b1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ach/firefox-65.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3c3cef4660704180ee6a64266f476624db76887eec8b76fe38ee35d18305a19a3f73b4800fb02bf769f766edf28e86813a49a5190fac035dd20f996de39469e2";
+      sha512 = "cda7c4c170db4b718493259e67b266851211754de4edda61957b1fd8d5491e3a0e2c17728d101e13ca03a999d2794f65b62798840103675a7e1e1ca76885f6e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/af/firefox-65.0b1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "afe36e12ad85d036d98051d9a978770ca9a31e362c85a269a2e6ff9f69d0700084aa316200f15755811d0f80bc2182a7e56cbb208575805622ba9e3e4f775c69";
+      sha512 = "695a5ccfb932bbd6a2d2257969076ad458e21b62ca3222b6614d63543bd71459bb133e53b88366915e2f874ae7490b80efec7682ff174a3e19d4827e3b73de3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/an/firefox-65.0b1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "13fe8f2f15502429177e5f214ef80a4b7d696d3b5e67e1e0c4fe86d42ea99e462513a3058086533ceda0df6aa2a8e291021e3b1f669bf091e7a7fda1bf00d176";
+      sha512 = "457ed14f27a2a502baea9d46a7b4b7e0fbdae13d90a84549d238a4fce62486f120ca61ebb137b33fa5df72d1b86d38bc27882a2055f6fd7c2d6d48976f476153";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ar/firefox-65.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9a8365b82a1d40333354774e562d7f67dd2992c6435f33c74a7aa4a119516bda257e70090805e17bdbb142901c213e50f6b964f3ee91473c480a9d1f89fbea4a";
+      sha512 = "b859161c50a0e038912c7428cd8a0996d85dad299149caa1f97d8f9380e93395358c71f900b9dbde3061dc30f5a5dc1071e34981ea9678eb53a84a9498c5e7c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/as/firefox-65.0b1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "1fcd7356cd69b408bab3c6aafb581b011ea4e0057571965df0d07e6a4a014c9c388f601fb071afe1247e8b2a060509a158a82fb3c454510fada1a0112e1f0c13";
+      sha512 = "576f0ade4da85f351937cc71bd87020a917b1d6eaf82a406a5b657872e08d4b3120e42941a40b8625e248860888a2c197b0bf0a0ac97f07ea2ec7b26c302f7a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ast/firefox-65.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e739b3fc62c05e87a9af900d2a62b12c591a382aa6029d70d09db3a2e9fa426ac424c3ce7a9e770a147fcb94e041484b334d4f1e9a912f329d2002bb8cca8fda";
+      sha512 = "75504d6c5c990db69e10ddc99f8b5d464eddf45adde7607d7957b3c85979cb8f30a5476eb7a5ce1cd6d13d71c77c4951dbcb047492af5c2774f303787a872006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/az/firefox-65.0b1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d7087037755b1dbdb347d397f0db9c4efb93c2ea858365dd5fc6598689890b62d5e8a969484d0d746be23598a5152d463893a49c89efc84ff4a870f41899bd0e";
+      sha512 = "d89073193e0a4ac3d34313acea7debd4a4fef6947c0f8aac2f6f27518465ea7700c9cfe4b2f8d5873e22cc8e474e3f14267863aaf005b42313ecb5e7e7bae306";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/be/firefox-65.0b1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9e50627425631d7c3f93cf176a157b45f23ce36c82f11139a4959f9d6b467d30ffe75b3aa62984be67d202fce9afe90685b76e2acf1a8300d82cc14654ad783c";
+      sha512 = "cec23816cb37ba0a61a82c2667bd78fc546268e1cce79a81c311676ef2c5afed56021775bb93980abbe3f2af7509320d24618dccc5fedeb6afe05966f2a5da31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bg/firefox-65.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "da8a76df26d0f4a252316e493f2fff8b3739b8c058628a9a9b0a618cb2e1d0b335df8a69fcc6a871d4ff570f9729359ee5172cbdffb21fb1c02d7ebca1846b14";
+      sha512 = "3e791bfe134304a1dd25fffa6c4fae90bf3e8132e9a09eb15560b5a98d490cb7338c2edff625a1710339df1899122a18ab9f5154c3b9b387acae22dd4c864b86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-BD/firefox-65.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "0f92c035bd9faa18f33abe421f4e2fc839a7e26b879bb1d9816f20551a186e2dfe362519049a52799908118c42c051a2a317a3aa38695e491df2a08562d58009";
+      sha512 = "6305b0774042bd1b5e06e2aa261fe9fad21d484c79ef157d9e95b655301f4f847247006e933c090602f1bc5a5228178998f8f59fec598b44f12ff64c1689f763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-IN/firefox-65.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6f7bc819220cff36b267c8c9a16565c732ff6507e08559d154657ff6ada926d6fcdbbc85bec11592bc039a9cc668ec6771427fd1d9dea49d88d630adc20c6f63";
+      sha512 = "ba3d09a95797ea28a13366ef743eff2fc55686d507ee9f8bc73f451efc4cae00e7d53c52b1d24e83b44a7d025a9c4222bd7935143f5b47d3f7ed909775fc719b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/br/firefox-65.0b1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "701b4086ef0162555c7837179d398367e782b51a414ca8895cfe3c652c7dd021b0258249883c0219dad7398d875974a6f3567df48ffe2b54b84416c6a7297cbf";
+      sha512 = "7e4f20e12e014a842eaa9f77e701466e00af93015c27be529e69673a87df2cd0f8b22dab0e006038ddf32f2cb4bcd2f7f6c64709c252580dba22ba538db1c744";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bs/firefox-65.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "f4669fdc026f7e348b086fff93d67be4c42dfc144d353c0673c9f72164db4857f61ff0a3eefd358f5459149378847dd761574f187861651261c76734d97145c0";
+      sha512 = "106e874f0127ec73a92fce3733b200bd052c4205c6698044b82d60e42a042b1c5e5b71e9352e8ce0b470cc8c9bc39c28b2166654bb0729c966e1f44b5daf7207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ca/firefox-65.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "17d6ef735aa464dc3fc77dda76d79fcc843f853be062824b431069609e4b0f86258533a14e995d5b98c77d09c4dc0d0627093df0f8cfd2f2f6f9de443bba1870";
+      sha512 = "4615f72786085295e131437972c39382bffa4584e3829253795d9bc961df97cf87edc8e9ea1218914f444d1041819f8235b36e116abb2aa5867fd65c3284d76e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cak/firefox-65.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f6c75d0e67fe581360d1e32eab18fc2f5beb51581a9fc70cb926d972744c58d6e2b49f23a05ba2b8beb03b89a5553d96ab4c1774ef7568c9819f8a8837949cd6";
+      sha512 = "acfbd95d08214f103dab546cf5087194d004e24a4163d41c82bb127d0c94375fbffc8c8ade0757f3e624fd2aac8fc9fa6519a6cf1b355c203afd5270847192f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cs/firefox-65.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "d51ac21807c945edd1e86b21bc06b0763687ba0573b0155e1c1f4c51767db36a17ed3f28223ed22b45ded1d1153bd8bb295e046598c7e1e54733e035d9630c72";
+      sha512 = "c60bbeb2fb880eae5115f317dc30573adb6917eff8d49364b2ed34ef821b90f17d275b77cfeb2c081a80f4cdbeb1ac0e02c920cee1aaa45ddba855861f0955d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cy/firefox-65.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "678951cdf8efffb874203fb72df7c935f43547233bb0dd6285e777bc682ef3c0dc1af11f55b01726a70fdabe906f70e4cb2b574ab01f848a02295b4e97e88b11";
+      sha512 = "5e5e90de26b784d81f5b68674714e8d14ff347b039e9664137ba8d94523d3f0c0fb0e0112b5961a56874aa6bbf30b4d3e7884bc46c9ab5818cd6aaac36047243";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/da/firefox-65.0b1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e3183b137019761a30a32bddcb4842f8e6eeb55d9a32e58b7ecb1ee9048fe3ac983180ba2aa61bb53edf8d60bb56003cc536699747a9d00f77328ecf100a4ea6";
+      sha512 = "66ae41f79975e00ad845b93f50fdd2d4eb8d11186ecc7dc786de856e47f44ab8fad6b5149a9ae8ca9ecc2b4020c92c07f7cae12ef0d9363184ac0e189c8650f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/de/firefox-65.0b1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "189177c81f2fb31dc89aaf195c8b0d8dba1b14361b447a77f8da94d1d9f57a086779cb54282f9f37a50f230eda26ef8c07690c75abce03468f80c786f7a24013";
+      sha512 = "37697c4868bd4b8e8becdc9ad8c6385a1b46bb9a09d35c2a56d99464de2def74ebb533a5914bf1689f778164e30be836ea0c88e1361f3f4028f02294f8248e28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/dsb/firefox-65.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9daf6db9091846f6c290d8dce3ac2f847e958305942d9c240bc81cff2c127e0d5be9c715fd13a30f7afb052f3c755705801eda8b3e0457cc2aeca3c687b257ad";
+      sha512 = "e40cafc2e024af7265b6ffa6a8be0f16862b1f1eb7a001f3710b501fdd92dabdff78f1f0abff3d537bf9ab266a988c7892e87dae074d00430522fb64bccdc31a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/el/firefox-65.0b1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "717de9d12655e306e8e494dca88901263d658556004b058948e008b66bac2cbf30f838ca26e90f0e65f7ede96d3d22931bbe36bcd33008236b3d9ca255d373d0";
+      sha512 = "0f678f8a5a34072e0530c2086e749a696a88e23c0981b2ea0664865b3b127954a1121e026dcf403aef03e3d00ad76a0f95c98677cd5a89c95216e0659fdcbbd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-CA/firefox-65.0b1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "a4f75e5501f63a7194e3d9a830d722baafe3fa1c0e592181e186cc810cc623ec1e7039e756d577fb7c82b7f6f8d0c8941a5ce36d07f291c8fa57c16e312d1b80";
+      sha512 = "3c60f3542444c61846d94d0116b8478269fb347b57c1cb000274988c6adab1a19c22d7e8050d005a35df16943ad3efbcdd99bd9a7bf7b767886472f110bea20f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-GB/firefox-65.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "a739f826dceeb48c248098e94617e72565a0603dfb02b6cd2efb104f1151a81dbb3021f3bf302a582f8e5257dee6246251f6c67c5539bcb4a6fc64d20f058d94";
+      sha512 = "e623be71b1c54f833d6dce20ad2ec8a5c51d5222f67550a8e4e5811d432d710f74bb8e7e3c3b6fd7e5bc6830ceb7392b28923885b232b1d642277c06e41a3fd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-US/firefox-65.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3caee27ebcfb58a62c27bc6625e260a0a3c8e9d8ee410ac44a91ef32e3c6da2c9df36f95775ea13e8e40a4b682934a6c1f0c93adabf4bfd7452bed66792a30b9";
+      sha512 = "da2205be3e9d672bf34e1055ee9a5eac461fd5172d2cb2dc9ba9eecab94e7559b6399eb904b2cc3483758cf3658f7b2554484e328491951632d81dcbfd84821a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-ZA/firefox-65.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ce0830bf8fd3d16e02eac457c5e9f4832e40595d663d12c7d3f91a92b33c81ce0546881cb01f11381a6b7b548cbd1a64b87d884885cd0e641922e91491ca4b62";
+      sha512 = "4aeccb63a94809737155f85a9e83c15b8df49b3c28dddd7db547079b46f15b7a5eedef75881ac32337097175193b38bd7de3e47f30dd18b56f1ff31bb6d33aa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eo/firefox-65.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "9db1efc26b2ece68803f9286ac6410541dd54bbcd94776f289d7af4d2f2ca31e1124344fecb4af6e22051f692f77e0ef9c39a8ff0aa39eec445fbd8365430ba6";
+      sha512 = "d7984116570d78194c6820342f591ec17eebe9ba6abc6e81f34d8810a24329b236cc37a705e3df8acda8eba4d1627d4a2970e794de6bd6ef76fbf9e57028230e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-AR/firefox-65.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b216931ebaf590b04cbac239b9613d6af24f33b60c75ee36f344eb93c34e9a2087e06cc249ea1315fcc0bfca1c1e465b788ef1a82a6c9cc17035cc70a94ef8b8";
+      sha512 = "b4e9d60707d70e94f2e4f1ed5d6a0994e431793c01c7d492afe72f5674a14bfe1524df6cc0d2a4e20897a5baf76b51e037fa96554f460a375eb281634001e518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-CL/firefox-65.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "d4ec8ac2d765d8267aeab062a21185fe6a31228c00f2bf35fe4ee653a4fceb0f96cdeeff83c4b122976f1487a9159ea40689130fa9a9467f2b4a926c6db52258";
+      sha512 = "2b8bc684e2f45f44f293a891b11d4d9bc0b43c55c12e6186d045ae0a6c618d1f96109680320506e913ad5425b19e22ad3004afb3b11dcadd7fe44133f4a40cec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-ES/firefox-65.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "06a5a80a67217efd9ddc3f78853ab6bacef69398fcba3a6fc354351f4d83287f026a5cef72955c9ecb7b55c61e6de2b5ae40136b422ec6549fe444a91b1745bb";
+      sha512 = "20294f5f5f88b000ddb8c9d9016c85ab49956fa34132b85417356985f14c2e5abeea7d96bb3dc6f636ab2baf68ce55507a6b6444e5b2bf6272344c0664ecf2db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-MX/firefox-65.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dc996ee1f21be35cb2dc7e18740c0657a126984d58a4bde84b67a3c28baaa22a0395124f71e06eb352e0218335ba2872bf5ffdf35588245bea55daf82ad6cdae";
+      sha512 = "c8b66a1198dd6975a372fc5667b2d9bf38313096dee2a5c34ccd2ce775cb09bb38f6ed6f28a9834d636745e23534f994380250ab594d6e1d366c75dc1cad1501";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/et/firefox-65.0b1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2c597a1802e45b3091396169c6f07404aeae7107d45188c8f3e8c214a316cd7e38c1b0cf06216b1882ca088222d1d00ecff84216ab3b545f644343049fd6868e";
+      sha512 = "51bf60f606e202e641b1bd49b34412df1c3a33139b16771748aa9a8fb1cf6a8ceb2d09f2be9abd485cfdbdb6b6aafb01c762d9a05aab442eb5f86df936a731c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eu/firefox-65.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "881d03053e21bf2024c8c0bc4737b5f9415c0cd5e07331c8aec0c958094d1b423f34c0abcf1a73ce794e0b5c3cbce343c7decbf4af812d90ec0dd7ea0f338a4a";
+      sha512 = "92ac8a65623dbce8730627a2eb83104ecb91114db18813630aecd22144f79a3cff7e1a44910259d40006115150ccf0a64e2f300b9d7b5093c54af43fb4403953";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fa/firefox-65.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "2c185e7622308de487fe2bbe20cf2ee4c923c00d7824d0d61050cf0cbf23d6fbaecb8ebab25fd978f6db89bc7c3f45eb91003088a4f827870d21303ba79d374d";
+      sha512 = "49201d2a1788e8a8916a8caa95bd350b6b157f410735f3ae33c6a2d3648b47590d72b6ea5a49e6080f6593687a1531d7ec2aa0dee820960be52ec56d3517aacd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ff/firefox-65.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b3f814dc04c57b15942ef08028111b19289ef77f48ff43a730c5840d3beca8ef1755185ffc54c8a0895ef7d734626162be73392899a2a08cec9cd6cbdebe78b3";
+      sha512 = "ad097eb38f73cb79451a753ddbd2cf68a2871ecd37b16d2e2d2b58463631d6bceb5bb301c4a0cea85cd207a87e5447c3b8029e0fc8a0b0114186a562b7f4ceca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fi/firefox-65.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1f728b5631fc2825f62f2af62c6dbd9e4bd5caf2079c476d6524c9033f2c397e734bd627e816cce25289565152221cb78ccd449650327c60ff9243096aee52f3";
+      sha512 = "151d9f2bcda0e74a9a12eb27e5f550ae082a98092db4c7fd3537993783cc623149a5abcde16a9221b1c91fc968d6b84a0d0bcde1f170705cd5054a4bbe3dfb92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fr/firefox-65.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "038fc084b4f5e6c8817706a32ffbf9025555e4c37f530e8601ef4d72bd55f3f48f57f8b7efa5e1c825a89382a4e9fb15db54e24c88bd569e96d297855e4c339f";
+      sha512 = "54ff2685bce6f1972b096c87e287ad3d612c0b7244e418344f0bedd72da2f69eceb0b913094e928668a3d750999213e2a5977a4362a6cbff7b78589cd5c9ca23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fy-NL/firefox-65.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "be74cbd160b366844e2fa955a4cd4beefb0d58ca4fd11fc40d8419df74653e29ee1e142f7e0d5bb970b90e0ef436b1bd4dc9e2b1d02db921bfc6f9f7d72242f8";
+      sha512 = "c6d1e3f27a96486c0797eb1f5bf6936f6543456e31d56d0019879513e1c06511bca297ccfe76936ba0a550daca15521238c468aefe38e93a8f56d4e8f0fa049f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ga-IE/firefox-65.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "2e84652e80ea69b90aec87abeb14aa9d0188fc598b536c74c31c7d3dd63909a73a9395e221c51088b489465fc97139693e55a1a9f926f676d50caed4e7818878";
+      sha512 = "22454e0f678e2905c55fd312e0d3a2be18e0ce9664bf6f6b3588bd63b9ca7452e532640a631f9721fb54aaa063975ac82b4b07caed139f44db9835c521ea38c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gd/firefox-65.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ed4799c7d68da7bfd663aa38c913f71bc3efcedd1f0363120d6fce1ceda0e3f0d9ffa8520681a563b6ded466c2fc80b695598be51316799752d528cbd0d6a174";
+      sha512 = "7b11d439f5b8fa1bf5709d147abb3d1bb98a00a6573f4784a95ecc900b9a1a8942c9a06a227b9a3c11ef086b597ffd41314d07b7b3392a574c5d6043d1548d0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gl/firefox-65.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9500394c6b8e65a6dcdbe8aaf76293b182a05b12f9d40b72f7c04e1c202665a15e80fbf306ab1e78cd0f8db0d308f2ced89bc7c4e5951416d23e662296b23cce";
+      sha512 = "dfba4673003970e16be3b9c3cd729969c780403955f4c16d73b3b7f1360f6b30d91e59e8f5ba5088cb557dabac3349a8a6d8dd67af50814b5968312a7b694946";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gn/firefox-65.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cd11501f541e0aef2e40b4162f388e283028b0a08cfb4a3eac4f4f6ba18093f857fb9df4258a4e6f3a687d9df7ac04981b863537c1ad8eae0a05c8aae99629fd";
+      sha512 = "adc62b0f457a981d8bec415c3812f904bce32086289a344d6f1f66fd4d9820b7a05358c10e039a16ce7a85dbf18a437aca880b53e83380c5159c5d4339399792";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gu-IN/firefox-65.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ad5f1954ab5a6a64023cafc47b7606d5692c062ea280832637f2d127c8e8ff04238abadfa40cbedd11c432aa7291b0aa5118ec63e6a0f3da5084b268989cf2cb";
+      sha512 = "92ef72ea19e9202d5712278ea4fcd24f1fa24fa8c9adbe7468e2205d9464fb39488c32c6ee90731cddde9fa581dbc79e31df734a05489abec0be5fc8b99f831e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/he/firefox-65.0b1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c8c29b03246cd65ebc621468d728682e7a901554073ce3969ae26f404cd6c6ddbf31a1e5848a24141f4e0b2163bf21f03ef0b5fd6450b8fb87e9a9312bad45f3";
+      sha512 = "1760e4810ee267ebb1105873b8a6b273cba7973537d59d82c1199a3a719c910e0b98e101bc4609dfd9b26856816ac7079d771403f51f01262672d534456e30d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hi-IN/firefox-65.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "8a9932f2fab24222955fb8d203d5deab727cd90cdaaff0e6081fa9f8501db5e9f3476a108bd4a277e0cf3527385dafee9463ddc72ea1dae34a44a5523a3d7507";
+      sha512 = "51c28e5c04fe4cecd9e9f8aee5debeccb3d85cee0dc0c495e5a114c677d7c9110cfdf601be947f25b127a33caba24094bdf80fa8bbc76c659ea56271f321ceb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hr/firefox-65.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "03877fac5e6eb31257bed35dfd041d29879077b0a316bc9a0343e3d8981a2153e7287ab1edc31273c60a0fa04fb7725477ee0bad19cdaeea8cf36c7fdf64b291";
+      sha512 = "0b270dfec2f9a7ef6a616f14929b230d8414239d00f690ab2e6966b6b8dd7aad2af9a70e2d764d70773dc7bc7591de7fef00bf07a44d9398ac65768c84269bf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hsb/firefox-65.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7fe05656c72ae73020e250c0b6f4a04987871d3711469efc592432d258fb12156d215b8a9837bbe3b34f82e0b8e514647e6da54d4c91af6400fe41515cf49512";
+      sha512 = "0b51c0e6ebc7beb81a4fc57966e91f02accd5abe6b8ca4ab67b2d51798efb51797b26b17bcc28cd9200430c0415d9f9c506c35d2035497e4038f4ff97af7de5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hu/firefox-65.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "20aadbaf391fa747261abf9f799bc466a99b0cd790cc79a31f4df901b1cc283d52389a5dbefb7c0f0cb46dac5536cb87ef1f510a11cd0ab40cc65998575457b9";
+      sha512 = "193a5e7eb8065ce4c17cf18ef3a268b00a7d1a0394761c8c22fc88ccb20abfac20dfed8cf32c9e128cb6a67af54c5519a48b789674ee0e24f05fec50a7428b8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hy-AM/firefox-65.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "25a50d09cb463a8d74753d0339bee2650d47730964a57e564ae658c2f2f393c05da368afffe2a1f9040d946b3aa57c973133c5c4e0de1d4685d0965e176a96bd";
+      sha512 = "78d87eb8c49b5e2df1d09ca8a31bf07f8e8e0bf0004ea0dd8d185f3412489fe66d2501e1feef51f788ae4c5c77e53255cc7adb15f0f5e20d0eb55fdf4a762fc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ia/firefox-65.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "b47ba7414bf0667beee177b7fb5de0bd950aba7ce567cfbec628279cf9ac208431869e2c517b0dae4ada1ee93ac78601588b82d66febf5ba27deede92f1cd478";
+      sha512 = "8653cafcb6b64abc2c6ed62487ad75331b236c6610bff79934d44882407fa1abd4b85fc53667ea14db4099626088cfd798aca495ec89c8a5bf14768e13ea7f81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/id/firefox-65.0b1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2450045d7289a0952a62092f2563ab7bc250d996b11e94c5f7df0abc4bc7bcf34817d504627f29e951282f065e94f468214c4fb691c263d9db6ec14280ac0131";
+      sha512 = "eb601d0e7aae1e322db14b9e769ee67331c2df0dba34d92693e50b6e0978e2a65c1fac06c1a28e2375d18618c0f582c45e5d9a82335e9e1d603d4dfcc7abb1e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/is/firefox-65.0b1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "320fdc1373cb4838471beed72cfb03dd0268d5d629ee0cf77ccfd1bc39572b32f572bfc82a3a4e3cf174577a307c13c334cb182ec311c5e33e9ec7db158f1650";
+      sha512 = "7a30389aa58df903d804916e0915179e3f19923c8e1fa153c168eacf7ea80a0321222dca15f7b65f329ee247da5d13c2f320397e4cfdc74f694ff9e2f851c9cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/it/firefox-65.0b1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d57c06ca6454cdfd637ccb1f08b2da5635ff6879f4eb6c7d1780b7bd11109f1bf8408208b0f36754eb7809a480567126a356c8fae2b18b1b9856011ef3097cbd";
+      sha512 = "07559c0d26c17a16a54dbd255e7c92ab4503baf618c101de66fc3b4dc98f6ac36910bec5bde6d875c2d7d11afb213a9e2a3952a612219ae7c2a2be2b81bae597";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ja/firefox-65.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ba93cfc2cad76d2c3c223c238b549ec9501c4e7387d756d3de5ecb35a6f03685cabb21ab31467270063c9ac74e905e5b08ea77f994451efde7590348de9fd959";
+      sha512 = "ec626a9457822197c8cf01f0376990f2e27f8beb23d25d5667234a7c891642b9a7fabb5eae6add31856a1cd52dd1d71056a05ef8991bb4ed8f84ab41aca5a308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ka/firefox-65.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f42243d7503c0d587638ff7008b81dd2fe4080be0b2aef6a9dbaceb3c49cbb13bcb6d5da1d5415371b38491dad81fa0ce48bdb624a2542927078284b9952d683";
+      sha512 = "f1a8149f87b741597bc626e81ee4cab7780ad61675c967680f1826ea1bbb55609afccb337f05291544fe2b330dfdb67c3a6bc20dfe6caa32272270a646eda6a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kab/firefox-65.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "92e0f22b3eb3c2e18f5f3a7eee6d9dc80da3851981b58db98a4fcee8693f7f4388159502e3a1497c2e8af4106284a09c7f074a1813219aac4c23a22520648300";
+      sha512 = "82ac700a061935fc14a705b859d6f7fc985141f61b79ee41860a47396197f59b96b78e15340b376eebf61f3c7d47ab4293334e05c920b72f6aa8db63dc0cca85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kk/firefox-65.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2ce861ba5c3cc7a6812cda64ecf6b6ce1c2108a5aeb640efb761f535bd2896826d87d93a39f10cddd088e53733f85d5302ac2e4694faffcd24bf9974b1f96a9d";
+      sha512 = "b26864a7f6734ed518709b4818ecd33318ce7bf2725e593f0dbd6fa5d8e70c70aa6828b8444fd7ab4b622540cab8296d9d10da1a8a14826201c7e878519f4514";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/km/firefox-65.0b1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "f56b968ce2e4cb6ce50f1caae0c2f9216585cd7ed1408cc87f477d76a3489938bc0875d3876f2eb67083db8e3d813a4f7601828a3d8ccd397c13e4f2bd21043c";
+      sha512 = "a3777467d2f8962b598001e62ef9044bd3a1017da6a979fc5d616b8a3da0311cceea4a5d148b32fcf05d01e3d6df4489356291c84c54a97866fc69f8daec79e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kn/firefox-65.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "151416a6d18d9270dd166746242a20c342aa999f3bb9886e171c529d5c1807aa9d11b73e1781ec23ab5c5ab2ba2e1ee5009d1c99f46a8d5a013d542d5f59d4b8";
+      sha512 = "fa92ff8ca90be448c5c8cbde5539561079a78be30826fd5b29c322dea73e94d96acdd1b3e6eb2b13f4571450dc7492f663cbc85d7334db6e2d416a8f0aacedd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ko/firefox-65.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b5218b4e241703cbe8dd153fe0668b0342091f557eefc49e47bf0b492b9adf68aae5f8416ad2f95f2c378315e4fbfa96ed759c22676629a2ef91f2722835619a";
+      sha512 = "6cd537b6f0eb3447bfb61a597e5e20756fb3477eeb21234262d933369e9bec15fa2198d23fe31479f62ab4ad0c458a50394b61da35c1c3d117925c7e449c733e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lij/firefox-65.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4a68a37cff1cbb5cae25f0bc2c153fc6ecec25e99fb5c33242708ca3ffb59f2e5ce8a6c332d1e61a57cb6f1059c5e3e0233d572615a3c1a3d8fa8a2246754e3b";
+      sha512 = "402eb28a107d8023ad2ce2c67e2481c246544d65f6f4a7fb83d19be35cb186e8cbd98d3a01045f74b9734488b72f8687bca5860d0f9b0d29958dcb51537a57ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lt/firefox-65.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2536ab847e7429e72924c0841447ce77ad46e597223c7f64805ded1398d0c9e780441cb29d7a27726af37da93fae98eb7f056e14da10e296239e2ed8f784a5c2";
+      sha512 = "f7c0c9fbc3ad6c8f372ccee8f07e5e38e5d13829db76b502b0c373e89cce932766f6ed6efd89482b94db6e9298d2b58d31a758e0038d29a786397f593175abe3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lv/firefox-65.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0e08f49334c0680e13fd0e654211b0cf314381b2cc20283210546f0415293d79e58f139ad2d68cd496598801c984b927a62dfef3da8d6763d122fbb0f7f24063";
+      sha512 = "0bb31dda168b10f78e72c9a0a93ef75df4fd0a1bcb6e541a61b196eefe794016ebd823c299d4612c6a22eff1d269dce4f5f52eda85519d7a649991ec9ef83b5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mai/firefox-65.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "a398f409bf271766e722f1ee08a114521c69a013c418bd9f66fc2c0f9cfa510d38aa9db3fd0451aa59cdeae77a88ff24a31b58d5e7da4f76148fae0670fc2450";
+      sha512 = "a18f3dbf5165bb62c43d6d11796829e4b503dc33188e6e7e765eb06eb6c66d648f4048f0a0561b0bc4e765b63736ee3ec37eb77bc90ad6c2adc73fc5013ceaa2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mk/firefox-65.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4108e9ac76734d5103bb280b290f15f33da8dff1236f94fb5eec56634f38c2db6316fd522a05b01e7cd4afc3472b6baf700e25bfee08c0cc220af98d2b4cad17";
+      sha512 = "c3ff6950da399b4dab29cdf95fd9337a011cbf3da59ae5c131714c88992957aff5c7b49bbe0939b7b4c3dab342ca47573287f998d10a2f69c5174b8ce28575e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ml/firefox-65.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "95e02f1e714eb3377b4c051e5f81add25b3850dec3c6b2f483ed3c5dbd95ca6e12096c3cdab466d988f29a132d6352a059866dfe1911ec5189fc157c9aa38a16";
+      sha512 = "80df4ae299523a64ddbc92ef5cb551884eb34b60b6650abb127aec01780c14aa34c8687fb5061d7415a70a322e3ac4b2898061c42d7b658b216e226e2ded36a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mr/firefox-65.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9166a1ce2a937cf36cb6f045de32eb9d4866fc52606f457fb94364eb538b1d9dbb010e91d7888568cd99c71d6eef9f293842e7a5ae86f9967a83960ccf420ec9";
+      sha512 = "194e9601e59652fb7150a6ed38abfe8aedd8255ce3c7619a8544ff0a8808955cb31353f2f07e5608364d5ff19ce02341dabfdf1e52ef5fdc13fecd7c47019faa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ms/firefox-65.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8b5298b78e0ff4e62101b5d7487dab830da78cb7029a71807cf75c68e50ca0f2f377b6b57cd4f7d47d08c615aee8e204e98dec0e5e7c73947004d971750d7962";
+      sha512 = "ec924c815278196fe447c92e149dfb6c7189da4eadae65396e5b7b7db05d0e097654383ae0d5e9e849796b828e677cf54419b1f40a65833bd2533c33cb0fb321";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/my/firefox-65.0b1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "9f58f606bddd65ef5d55d0bc051be063c152b3bbedd26677863f7d977e0d6e0e2b0f479f75be9181472d49aa07be504e60bd088306578133597546444cb44c44";
+      sha512 = "3449c107e15a518de1ba8effc31e5503ff9ba50099fc43c6d318119c4f98d8968a710dc8d66ad5e9627a52a45e2f0db24db1a1278eaecbd6bb2fed9c0e605a0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nb-NO/firefox-65.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "525d1f440cdf342e9efa301894257ec0a5e9d13360e7e07b95c9e8e1bbbfe8597892a301c90b8bb4f839bc8fc323baec7ec3f561f6ce90c578936cba01059068";
+      sha512 = "0d4b065236569a477a5d2fc18a910c0d6518adffa8c656a342eb1ef40a3c55dd9fed9fc42c21e955c457a9ad26592cc1795ad2bca055286d839e39de8a364912";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ne-NP/firefox-65.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "58aa6a429698aed87132195a0387360096cf1c6d67c3eccc3d27868337f28d06480232dc4814a48c8015a8186bd3123c00f777cd1af16d1d9463d5d6dce91a6a";
+      sha512 = "6f2f63519ce28e7046337d6d75ae6acefd2081834566d9f8f7c659e4dec3b5f83e61485d12deac40ca1057f4952c6d03a86eefa6be9ef7aaea6986407343757c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nl/firefox-65.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "7c9164d293660a19e85a4a830be97f0b4ee1bfc61103739bb222bde4842d50b5ea881b20e4f28182dc7f8212c370635360ad11c7d0345f2540e519a4e17ddfb3";
+      sha512 = "1a837eca4c23885a997183df9d71652b0401e283ef177b6982810443eabf9d91e2d50f5b51844f2409a028aab8091cfe79c10d45f884b15ba4f79aefe01e856f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nn-NO/firefox-65.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a2bc6f7396ff0aa813400ac2f3fc853857d1b5be02ab221d81ae8409360cad67b0b6bcd1b25a6e764e9557227ba93bff8cbca75334715713ad7c27acdaf82a22";
+      sha512 = "1066f0ee39628d9a1dd0112300f8ea4a76d832b1a3acb74fa19a2a022d0e064e7da316ba7b236b353edd2929003c287cfd229ca7921a3bcee77a890771157af9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/oc/firefox-65.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "dd52cb8db97e9b9f64b829b0cda319b572cfb98be8d317412e6f2cd2231402ff603517f9a9525dff5e5da7800d4d5380d8596987d9c46fbeed55b3a60625f33d";
+      sha512 = "9f79b9ea86dd77bc4cf9caaa6571fab2cbe3688a25588fbcc2eecbf3857728dd7b787b8c27ced7b0df6a5750baf390f5ce0fdec7d52dc6cc51352493e8608116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/or/firefox-65.0b1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "afabd283000910637aa1fac59c3f57c033a50fad422d60f3266615b88b5a1c27f526d258516aebf8847e2a461da2447924321258a157f444a6c730f5b34d212c";
+      sha512 = "a27ee9624c3c2997200d54e5ee51e156f654f71e802869f1063e47606d264773896b00890a882ac14481deb9558fe2f478f44cc54b333d820577b90d2a8c328c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pa-IN/firefox-65.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b92bde0e3125cff1474a219af74b8cc48e45835c2d3196f348ba352073e593c2e6ce4ac872a710e62921e9a234b333bbba1da9e0feffd1ad85fa5a78828ae89e";
+      sha512 = "156888812946409904a1b94d11c6cbf17a6a4d76b5b17ebdb70542008375c529d328e2db9a7e473ca724295717890bb88a6ceba00b717ac08d13ead53d37f58e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pl/firefox-65.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f371c37b6ccb97c7e9a6328423788c7de4fd75fb4a94dfb2097fb7246bd7368b3a55418fa6dbede6ca30454b13dcdd8d611f51183e5f319ceb0552a832216597";
+      sha512 = "d0143f6995b0f7500fa603724600777006ea32946b5a43eaea8264cb0cf6a98619cb1ace100ccaa202d600d0b42ad13e3fd698312d8fe2a53abd30b37462294a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-BR/firefox-65.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f7b7296719eaf28b617d7489da2e035ae90db4e3d652c1f001c22e75755cfd2c2b17c362ec2178c1bdc96623cdf7faa0662db3f63bb2cde758d622940e62e1ff";
+      sha512 = "c008136825a58b3af17567dc620454b95e432edace0e65bba11024eb3c6af1137dfd525cc9503aa798472d981d303c2c725c24471cd4b780c8d7db66e6917c4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-PT/firefox-65.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "9833fb8596fab02aca7b884092f3e3834be1e1c3eba78abd51855fe532cb48d61238158286d3ee4fecffbb072b02964605d448a0b63c1cd8801978a7f2a23f79";
+      sha512 = "37009c77c56dbf63ecb86cd96861494ec34a2c30aa4c73638699ee0484c55e9ecf5bcaed7559eb0e39424abaaa178d69932b9a25a50996389105f8defe6833c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/rm/firefox-65.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "cbef477873b088e084d550e11396682945d484247e9802aca2dc5f998aff9091a2e0bda26d91a37cfd866089e06555ec26198b0bd2cbe04e16de8672c39f3109";
+      sha512 = "819ba5cd77f959769906d6a9e6af62db57607cb2f7ec8d1c51231e02f5ffceb82e2198b6c77f362f3a30eea15a5e3cfef6796263d3c997d4f84de1f817a230fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ro/firefox-65.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d32802332224688db99e42678fb777420fdb2f59bf676c40034e3ccbeb91967c4620acb03814835c5f538902d2aefc0d78f6152f62dfb574242511265baa196a";
+      sha512 = "7092b0110429323a9dc8ad6a3f373267f70733d8dfe33f8f6a9e67baf4a6384d52271e5cc410948e9fce12f346eb182907cde5108f28608d8185380e867ad4de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ru/firefox-65.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0c064afd0bb925eb49ea72287d50f979a90968bb43bd870740d01d9e3f9d7456a5043b07d6d850098f89eccea0985d79ef25f7e1d9b81cb33352c588f9dd03d8";
+      sha512 = "7772ed2a4496dcde8039eb2dfe950690995d66fd6beb00733df5f2043d0e399d6078268f04da6397ddd4435cbd25438ef472dbdbc51f8310b2437638fff5907a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/si/firefox-65.0b1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "48707f9682f02d7e9223f9a616b2946811015680b6d303180ae466b5465f1900ee7679cf0e45b9f9c1fec680259dacbc38775f01f294039a973de76415702196";
+      sha512 = "41b66c25bc405233e5f62749b2f2e41092735bed8776a4777a31363ee333d1ea6fae860c854648b775ac07385657bf712319368dbd00374dfcccbd612cd81485";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sk/firefox-65.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c3cf6de7e24fd2eda564a567f9eeb72eb913bf6d9bbcf2fac5ee5d22d550e75583f5ba530b40eb0474abd56799f0f97ce18f684d902bfb6cf906ab07094d81f2";
+      sha512 = "208a550d3bd4695d9e90786cadacc7a268be00eb7ad5827693c6d14a7e755db44de5b07c1e925340a7786553972448a56ddd5f395778f86ad5784d62f9c7e48c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sl/firefox-65.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1e7d596bd8afe38002b9d481ccc21a36e9b48b4b742ce7421097f56881502da5cd8f8a51a92a2d143aee196d6a495e01a782f624151b02878f8c6f9f081ebc52";
+      sha512 = "d2834ffbd907372ab3d91d19a1377a3951501817c859a0cc4c7170ec0f9e51dc819f02f68a1e80c14cae70356957c36670df836bc9552aba15f6c3197b53067e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/son/firefox-65.0b1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "86ccf241981b218569bc6b8df5d9283d3a1f92e690265a4af0580994ec0d415aaa4ae804f4443d3956578ba3dd94a7c7797acdac0d47d805f6b839766a48f233";
+      sha512 = "5b7f646f5a1028636326f0057be5b73a7a9eef69fbf442abc8c786f43e3b531e0d03a7abfb3939d963cd5a5e6f9c04eea763e390143796f45b9a365aed7ef62a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sq/firefox-65.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "81bcc1d4f35d9fd920e7eb1b50ad1f2f2403ddb78b8df1ba553fd02e1c515d78b6dece16c44fd23e95104820c32a841e26e98db53d6f34d03b4775e66832ac03";
+      sha512 = "6ff106a402b0369a2142a71a89b32b9e8d61b8bd1a9b6f07ece984bdff413e5122a5aa013da1af2be450c2aa94ba37cb6b547dcfedc298822ec1c302e14faccf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sr/firefox-65.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1f1f15ed62db5958cdd1c93b3eac914318ec57264351e288ba903bfbc6bd9aeebb2eed9dc1f34418b7ffdbc70b823f8ec75de28e06ae3c3ff43523571847238b";
+      sha512 = "dbc1bb7ae7b82bfefbdf524339500f24afd79910374502cae586d020fec07dcfafe52859a7d117847fd05fe48d353f56eb415227708cd7b2be8ee19840a161ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sv-SE/firefox-65.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "eafe982f5b0d624472b4aae2a64677d3bc6475e815c4ae7e89328381e2869214b14aa11a8cfe2786386bea0dc63f9621346cbdb4b740b90e61490e453ec19803";
+      sha512 = "3092c863530d31119b3ef15f12aa978d7c5ef38b1d1f363a87297fc29368ac2c2cd87a5c19d08c7dc053338f96b69cc741e1fd30324734772c190382ae2a3a12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ta/firefox-65.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "eed9814300fa97d2e7953220af3cb630f46097fe2df65455d5a18341a3c19f316fe1de5fa8da7637a88978eaab2ae87b929f377d97e787e5da6c7daa548085f5";
+      sha512 = "e62b1863e42c3eec15b50355d54cbb7d656f15652e3560406badc61204406fcccc4f965cd6def14730eb9d16695d1e1b58d0618ca1a2693021f6e84b51f221d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/te/firefox-65.0b1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "c6806cb7031fabe3d481964d89fc148375e6572e009737735f08a71887f035b8c77e49ee0b0a28cc6f2e49720db74244fc67198fa3dae5448a1f0c2f6863aba0";
+      sha512 = "9b420f2f422b172730b167ed88d29c91b91f551cddda72de538c7682d15c36742122ae2e995b489688b95deebb7f8d8ba64662c7f4529c845ba454b79097f97e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/th/firefox-65.0b1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "bcf9af67d3f95a99d921142edc3359968b2793e3cb8f6e55d2f8f446005e9cb7fa75789daa9570d2db8252064bf55a48f9714d54bb115c5bec9d0ba107670508";
+      sha512 = "02349edaf181a2453832118d12764925f38db3837a06c212494a6da9d37f05efe5865a8d96f7a30ad1319a67f612ae0ee1113fd281380cab11c21be01218f13c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/tr/firefox-65.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "f40677e2e43401cf5114986768dbff121774e040fb1d4f2db02139a59e9386c15cfef440aa9d7d9b104652e574adae228e738b31cd2d40d78987d78454ef1aff";
+      sha512 = "fc041e81769acd28f4004cc767fcca4f917b529f802d83b93da6a5565dc6f4257deda049883e22534fd29981271521e998f79ab70a6fe88b7ecce4a0dd660708";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uk/firefox-65.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "90f1746c50e6067de269326055c7d65c227ead04b1cff3168536c7071d9933f976d8b9c96e0319d6bfe790f80bc6506b6e554307d51285bc056fc80abcefd93d";
+      sha512 = "fefb644cd87be568ccc161c99e974083241e31f42f6891f8db58a042115253c990070dd2bd12086beb2009bbd27805837126c09b72e7ad4ad2d2f1326bc70e52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ur/firefox-65.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "cd91b30e5f3ecbd7cb42637b1f0fa84013db48cb69449b386abec15d49f240b44a613b73f5ab816da781607f208a43355d1ecab3b0ea43d2b19b50925ccb1738";
+      sha512 = "f426cf7dcb4a62b17d862f9929431bc37cf6de1eeda90547ecac1b989414d1b54f86c96a3a563d123af3d5a6d8647714a28b46398e1523c30fc590822d608e23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uz/firefox-65.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "fc6cc15b1989cee3fbf47acb0c3e81f9e5dc5bc5eadf81ab73fa91adc9729c80dfb82136d0c3caf31188d7f4ae437c837469a960adf18b5edeb918242895631d";
+      sha512 = "2ca8011284ff7e46273ca7943213b4cd5687d7c949159e19ca373bd88b82a46cbb1681bd7834abe5b9dbe54f1b2ac13095109e4050a33e119795a6426af608fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/vi/firefox-65.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "9bf08bb17c5af72edc89cdda215bb22f891bb4014d29b06e40dcc4b18a1b91b03206c138d3259b23edef8a5e31e321b3bb20d440b67c2b536ff97768fdfdad9e";
+      sha512 = "707d3a6872accfe300b067044a3972b56f8bf9fe71910b7e62ec51bddb19b1b6dc8f443fceb6209a09a605202a6dd170790cc3edc8f170ebbdad31e2ec193826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/xh/firefox-65.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a5328e25807a9046268c1f682ef606f5bdd3452014f7f1b037c874c270234b62144cb695f6f381d72e2658f9ff6c50bfad2d501d6d07e4113a3f3c8323bc7498";
+      sha512 = "6fe5e7302094c87a1a3191a1fcff7c6a33c04371104e7f1bf9a2415ce4523865d70c4d134c649ef68e56e3f1a2bd6e2acecf5cc972e01068eddb01c74344b374";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-CN/firefox-65.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "6d08fc1d2712ae44481648e7021aab1b8b56bf6b80915b98c0a577dbe537ec329c819e9fb83c8ece5a76b1cb33787fe8d93cf06229074f7c68c429a836bcfea0";
+      sha512 = "388120ea1215c20166e54b5dc9c56f2ec5aaa5a00181381c66e9849f8bc750c6d201c46d2f5aafdcff3135cac67298ac092e06f2c2c245befefdd5a679d592ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-TW/firefox-65.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "985017e2ed930e45fe7fb6db7df7c36d2f1deefb96f37ce8decdd04d031da9fc1484527ab3fbdd3eec3d47cc828c875223845b0a45552b1a8a12dec7a427b15f";
+      sha512 = "566d1569ab0ba4d209be89b19f40fbdb589d465274d7187156344115f3eba279eee694df5f69ee2c04fcf2446e008d189dc9a0affe36e4e1ed990343d2ace5b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ach/firefox-65.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a7b359f01de7603af3c560b3bfaaf45d754865e0c5e792a5deb861a041dc555d5fe8285b5c50e4d2ac6e124f1922c684d49df00f2a97b622f97f4e50bb3cdccd";
+      sha512 = "3cc0cbb120517187f2780b4845d43748c453804305b4c6e8b62fa0155c2c2d4ff158ad0758d21347ff031173e1830c08d948c0c9d41c14f9eee2985e0c59e881";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/af/firefox-65.0b1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "116531c8814b03a23a524aa7612eaa7061453fc9beb7abc30f85b86dfed4150aa2bbb8bff25fbd759d9b869261619c0c002f2126a0f1cbf237a0c71b46d721b9";
+      sha512 = "eac0829a50117d7c90af59939890ffbbe7cd11f2d67f5cc30787f911598bd83b56cf667c736ec8be69fcfdd5a8c7c282f17ca57c22e1a2b9be17fae25693696b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/an/firefox-65.0b1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b89fed73ebd86a240a8078c402e738e099e4f7ddc6430455dc5035687ae601fe533a0eb3235266dcd3f36fb299456c24fd649321e1a63e417fd492b44b9bd7a5";
+      sha512 = "8b6b20ba62e12b2ce6ab5beb70c01c381fe01711a27658a27ce925e759f308d4a43d1f1744fe8a5f21477d248e4d6e393c56f33e57d808456192693efe79dbb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ar/firefox-65.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c52098d0947f60d8ac47d8b2794ca7eba03d41fb4fc66a31688818d796521367520f0ff57ae567bd3937ceb66420b484a84b25a88a346fc775ffd26f372c88ba";
+      sha512 = "92ea6e4e5e36e22ebed46e52827624de8ffb0bfe48f64509abb0ed7c0439c5e1b809cca97cde758d6e6d30eade6c42ba2c4c272858f816f9332ce2e05a2284d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/as/firefox-65.0b1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "98e5cb7a5122a4c2f4b687dcfba88e130b43e827d5ddefaf7161dfa7e0f9a86e52654d35bba1c729424562d8a5c0c0c1635b30da5f3c88d0e8f15667a7bdca06";
+      sha512 = "7c39f29e805aaeed4901170bd1df52eb3db51200f152a877f7b9e50f37c0b2135b643c61c467702abdb456491be38bd209c7e8f263fe1587101c0d0b2731a493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ast/firefox-65.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "91d6f617fc56b801dc4ddfeccd044bf1b4a89c9ad5d0f13ef185f9996b6fa41d08c092a4a9720f52f7f121aea1b6d5bd9ea99d15a9cd672b0f8534cb6f22c6da";
+      sha512 = "9408c28407c7fb2946b43703dda3bf638f14bae6adf4cb215752e76497e8e01246095ac9989ef263152f366a9fa0c4cf7d79f7a4d86b6848331333f0e89e7ef8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/az/firefox-65.0b1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "63bdad659ff4ec803b1e0f3367e17b21e2bcf7589fa3b96901e6c3453bf7a8770f0345b212f8c90a326702ac9ca6d16d87a60436ddef863022b70eea92e83a5b";
+      sha512 = "4409eac53e43fe2e2233f1e7eec8f5cb50b74e15c4057b0816d0c26d8f2dbc01c3d3a578a0bc4351d0858280038bd20dbdf9943b5e9f429ff77755d8e69b67ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/be/firefox-65.0b1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ae2b8a34157a541245288e13b551c765ef583684921cb290b76d96c2ed62e07bf016af1e11db344464a46242c4ecc6871b88a585634ada53ab6d315f5dd79d9f";
+      sha512 = "53739c8bcedcad5e04cc53d66efc81b8446232a60e2a4d0a3020099ad29a5a6f4ce41ed478a7b18bd8f4dc6c321d75f55f6333dde467eba97cc812be977c5bcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bg/firefox-65.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b0cec246ef1268bf7feefb966b92c971da8df711acdf7f12342af75f4da09ca982db4f3e71ddee362b05ccb61dbff043cd41f2f0147637d589f0e380c55e71dc";
+      sha512 = "c94ddd32cf349c3a8ca858ce2c44fcbb1edce97449956ff7a88cf696f0acde7b9b8ece49e2f5d97d9e0096d1cb320915d72188cb08a96947938ac92773d4dea5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-BD/firefox-65.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "ec449f40b88ca7479276c7f13eb42d5365c4358d39aa78d8c91185d516595a03b22839e143341236a712edbd35cc308fabc587bdfe2481a08abcb45d907ac1c7";
+      sha512 = "afc2af989f5e645ccc021b450bf59c85e5a43797d149393c5e3405660ff2c788eac74376c6046e2eb5bdb4f95762743cb904c969c3ae8c96bea3887ad457c3ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-IN/firefox-65.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4dc25dbfde5dcb4bd178f8574e273ec1081f1c12f59c0167aaaac1d4aae859bbdcc512ed50c9f6a6b6d4de94a559a8f223c4acdc124d84b647d6d96d5569cbad";
+      sha512 = "2c8632e3f4a4fe3ef067c2634467091b62bfb6273aa04c54bee8c390463b22403141f578bc6418249fcedcae0fe990b37afb24b04b3c453cbaed4687bb8f9266";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/br/firefox-65.0b1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "4d0eada67a745a2dddfd6c961ea2afc45b8dd99247f04172b21e008111d698d3bed29ee078b2f38ef03518b712c9b7d91183ce543ace27e428d64588d3a97c4b";
+      sha512 = "d0fc413bea97d4e012619be2cbefd4ad3fc357abefa365864301d2ba81a68e9bb940c55cd03127dc0ce50b4ee9556b570e96f40063ffaa8b53055d7b2be4b6a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bs/firefox-65.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "b7b18935016966913504530c9dccda00ec1db5bcd21157308ff4312f9cc222b9622dc165335dbfeab1ac1ea60a6cc7d846414232394c9a398791a9c7ca2f9ee2";
+      sha512 = "cd21a93cb26880c06d98c1ba5f4191825b45d63e4f432a99bcf956b1c144361889497d68d9e3102ede95f046926ea21e6649ab14906c183c147988914a64a705";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ca/firefox-65.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "00da4706239c7d7014a68518a643b2c130e83fb0915c12008babc920a30c87db1a9b55e1245e39b63ddc366ed017f91c843d96ca4842c91083a32b629d3b0236";
+      sha512 = "83fbc4f4880140c63c2f73900926083e97737d991e617d37335f4636eb9478547127a0a6e28d6f499cc5263a33f266a1608d2026630b66f59fd472e9c1f5b85c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cak/firefox-65.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "76ea69421e52b3d622d5f5b5d4d34df5defb4cc0c3f3c7c11f856e55287b591fbad642d3d30c255d655c4bc7db7869e2f639775c02fa1892e6ee4eb5f0a3cb6e";
+      sha512 = "a2272d2f275b2481a12cc905e17f8602e2d2e8d2c11561fddc620dc35623f99687481e9d9ad7539644ff7de03a311a436234dcdbdd9f4c0dbc6cef4d466b9cdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cs/firefox-65.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e69f0867f57fa8992276f4f49a2ae73159d3697d075bcdd30688905dd35d19ac5c7b2edf8670bdffa66fabe191ec7e736a6cfbd9731054166663ad954f2c285f";
+      sha512 = "3835a2d1f041ea50ce8fb3437589be968842496b2b1c13631a8cf697e7d5a01da3d97a7b45fd76d29c84c1affaec72555cf66f366c260df491cfd453d273995f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cy/firefox-65.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "933b7c24011fdce95934b2bffe5f83dc2e914bb34d00a429bc63018bc54fd86d50f24f7e96f897bfabce1be76ab5772e260c5c8c5ef9599c43e2598fd817f956";
+      sha512 = "a280eb112fb65d5979c6a9f8ad04ab5c2ae7fa03edd29e9363009f42776f38da2f82523c71b680bb988a40e089c6f2d58a24552a73d01311e00020d9cb87e518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/da/firefox-65.0b1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "c1077013270973de929e6f5329701b44669fd0927f1b252c1858cdd20b8cee90e6d9986ce5ab2fa10a25eba19ddbb002fb205ec12c12dc91fc056675db2b057d";
+      sha512 = "71e51583d018efcdf09f0472631ac2449fdfd748dd7d4467928fccd0d6e4bad6a2853b58a456ebd8e28997aa75c58bd22cf040bcab01e66d1635bc7948a93eef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/de/firefox-65.0b1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1810d988548e4f1ab3949fdd22b0e83be08f187d937e03c89a8854657770a3ed598890c2143e2b6cf1c4ad19b22e365446d6a96df0aed3b424d2474694521e38";
+      sha512 = "2b3204787d0423e7c967ea1c87e914719e1bf2106e8589119d9a50d447e6f0c8b1aa86e75b1ab92bc928fd4c90ea24600b4c8d2d44e5097296dcc5a494c369c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/dsb/firefox-65.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "61994d9c03695295cfee0f3e4749f58133651f14c77c61e14fb34b65055dca56ce598ff2a5b58e60e380423be6bd8d1c76a72ad6dfc2872e974de57dbe2fe120";
+      sha512 = "36e0c839d63c974bd2659c3015c5608bb4781526a983519fb3920ec125476d07acd852ac674d8306a67afd194e100a10099191283e3a948ec58b08df20107c2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/el/firefox-65.0b1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "176ca16c1982dacfbf0553dee54c4ba4f6d94b288469ed8426147786a63497837d02d5de3bd82e19e3d00362fae8c1eb7db75cd2f81c233bf8fc948afad93277";
+      sha512 = "fe6277f05e013e8861bd9fa9b5e9d02f1224f0cca881159e1a5d0ac00bfa42887bcb3beda291845f716860ed9486e6ee58665895a160574772b76befb3177073";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-CA/firefox-65.0b1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "f56cffce793283f25c617cd5ca59c17f33e63048a185c449340f4662a07f0c4194c334d149d3a3c5e0330441111a2127dd578d28cd0253ca06c901c295cf0e40";
+      sha512 = "a10b55c655894d783b508f6b86c787e481e673f7b6c3df739f08ee815b89359c4101026cd2f7c063050a09e7f354cdfbaa7a450935ff0b03b7b629abeb074a98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-GB/firefox-65.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "10cfa09292210c52b3a644245a2857958e629ebe98f7bcd3ca8d5b6a8770febd371f70a9395d192de969ff0aeef4f6592d247a860ec2325cbd50bfde1a927673";
+      sha512 = "f148b9dbaf378f6a8fe5a2225128828fdc5a6a695a324cab83841665d5f93cb8d8dfd1289aed93f66ad9bad45803641102ba8ad4e9fddb063cdd36be92957f65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-US/firefox-65.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d8cdd41a807afc1fbeb9b200b6e5a94d9c5dd86eac99cce725173d349a392c12481d334289f86be4e0be4183d14a8bc13cd746c12931cd7d46a779e6260f5fae";
+      sha512 = "b99326d15fcb6450f6af9d867959d71c68bda04a75d7d1fe1a7a0fb02593a2c418c27b8797c0eb50c56d482248b308834d0fa8bc136c7086edb9081708b9dfef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-ZA/firefox-65.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "cf3ca56846794f25586537ca70be0bfad4a5b8c29beb3c919308f8b6db0e8dd1311a1e2c0fb1c012f5bddeb738426a89a0daabe69ad578c4b9c8a9f0ddfae3c1";
+      sha512 = "bb42a0c7b782bff3195d6fc128231180611ec5ac8d9e4a402c9e796b9780f0f0d16454e457761a91f1b3bd11b554b3c61e5cf586d369809981309f1d49921078";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eo/firefox-65.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "63fff38d293a7e2264f4dd5f4b7bd48dc8738deb9725dfabbd0b99af739b93ddef1559e977d64e8c480746e50fa3c070de6e10192405c6c1aff2fb7a28303c72";
+      sha512 = "2d3e5babdcfd3b3b4f25e0a239103f6bbfe3da29d418eb8fa37e054cd9afd0425acf9239e05f8d1846461997fd20f56109f2f1f39b59a18f9be6cd494eba3a0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-AR/firefox-65.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "22d03829b66b5901b118745360040164fd1d34bd854154be96f2b4973498f3cb8a1c444c6fcdead536e60f266f7b047afaa27c37f00872e7ee9ccbd3a3e6d8b6";
+      sha512 = "33d0aed1738cc8aa1768177cf6453afd8cba013024fad7b776a737ea1976d1319ad8b0cc76db7517230faea2367773446987fe7d1af0cde468f9ab35d37a2303";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-CL/firefox-65.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "52344a032ddc72413ecdcfffd5f9597b199acbb1d07b96f4850891a364a4ea34d28d250747eb85318a6a39aba670f57da8c4d328530def46ec1990baded90bd2";
+      sha512 = "fe2b3e41e0da6e71a219eaec0024d19801f77113a10be2fd01c4b686395753cb31363b112fd1f8fbaaff756f2a5fefada53ff99fec4b8c09fcfba2a94ea2123d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-ES/firefox-65.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e1a10fc09ff5930777234777a2e2fa84011a9e734d271f425126d129d2b2fea5cd5cd6ab39c2527f175485be6d618db2c2ee21d3e2409bae806a986fe1bc0f82";
+      sha512 = "7cabe427b241f383352bcb3cf723df921e8a7d955ccbe61f16a7b6fbff592623d8af08b00f2242fd96e58a8905159254a2252657ca0fceeb8f4619f027d4b461";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-MX/firefox-65.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "2527ee035fb02778f048793a613765105bf4bb196fd2fce33a544c3af26a9b8d4bd02a090313bf93849f95d48949a0bed97766e5101bfacce87517844c529895";
+      sha512 = "eb27a3bfb6e38d2e03d0c51e511a7b95cb178ff41854692c561fd864db7ebdba2e6067cc3fdd9317df880b32691c0ac71377c5aa36a1b82322267e00db432b83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/et/firefox-65.0b1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "fc809cfe614006fa5a3b81ec9a662cd42359bef5d88a3575d13a1ea36c5a3d23d6a5893ccccd9442071ed7d144e48eb6ada694107bb3b76bf9e8ea88f1dfd679";
+      sha512 = "119eac2350a278075586a12ecaa1438001625a65955a0746c9e789eedf6165c6697b3085dc47f346d7b992e675ebe5d7341ad7729d6ad396af6c4a7473b227d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eu/firefox-65.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b8a46549965de608549d7fcdc69062491fab0de097ce23ac9f7bea9ac0c38a25391f3dd0d4eafbbecea37d55e72d5808338cd09358e4568ce0284b799fbca3ef";
+      sha512 = "cca07a6932810e7c19445cc3e7a30a0fdf1b68669a82f732ee608a6542f24776c6a9ec2f2cda74c047264649b3a533c038f7ab908873a0f379fff829b92d827f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fa/firefox-65.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "77ad08efa48264ba99395a4f3b1c4db58029a8397877a85ea885d18d2c36c259e5b2af4d5ac7934fefbf0a7c0d6ef33fd98a75a16fb0f72f13aa7615640c2b0a";
+      sha512 = "36d515f7bfc73eb2c90c16546e3c0bd596ddfde56bef6d3962f0ab178f2f7c2b34ebe07e9e7fee79fc626ba10eab9d94275e6df8564446292f7eda6be713529a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ff/firefox-65.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "16d91d5617d0166ea091a0f42445d87484b304d9b4e4a8ceefe7bf0131b8cd59ef53fdbe68c0e6603ecdd06b07ac4cd2bf662e836d8fbfec119e455ccd462f1d";
+      sha512 = "bc5f41da9ffbf41e5f9c377916572b5ece5bde37cd4416cb18c147779a9a03cbeb600961db2f3c4c43999ad3e1a12e5d7d4a54ade4f45d5c92ac1c9f1a410bac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fi/firefox-65.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "5612cedeb45cb3dca94c9234ed378bc3debf52028bdf73258ad8c16688a5ce7cc39a0a4215079361aa95ea85615d911ae863be9eb760e630d790ac8efc8be326";
+      sha512 = "1e9a19f0bede01bf06e38fc58ede4c8c011a4548b62a131a203e0269c295cda32a4f7b225bbf95f51c43a8a78cef6497412d94e29a2a75a5fc7a5abc865d29f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fr/firefox-65.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2bd0ff7bdd0fbca3d8115c1682f68eed2db08c42918bf533d4bbe7a2f5a745caf6bc162249117feff75653142fb54a9d70b9d382277781e20e13c8fa3029398e";
+      sha512 = "88fa160ff11e5b1e4910ec3c6d9534d5f48758820ef2f6944a4161670f7951b0a3219e292c47044c1192ae5d1955dda5886ad3031661c4cc810e72385529f33a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fy-NL/firefox-65.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "757bfb2edaa0a595d7fe5079ac411a8ac03533bf824979debb48e81385d123b34dfe56aaeb2fabd7217daa7ae80015d9b0c8c533a5115653dfc992f14b8a5d5d";
+      sha512 = "40f208ec0ed722a097ac4e7d4abb185386ee92707e34473679bf9dbee4d7b582eeb2a46aaeaee37b0be85439a664d8f8dedd41e22aba76035d3f79695a4a092c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ga-IE/firefox-65.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f42ae917024b7d477a216935f50da34d4743fc7a6172a1a83ef0d8a68ee7009d5a4a29168f8a19371df8486dfa33d6251397ad55ddfa98cc5974680ec2eec100";
+      sha512 = "da9a2ddb27d3207be7efdd4090adc871cd7f406dd15f6762c0026d14ecc4a9cfc1a5c9b4b85b265ed9422ff6444c13639ba3b7f8fe5585c3b475eea9e6c955a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gd/firefox-65.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "eef9f488b18bac4ba1f397d3b536dad457e7451c4e11d260889c91bc5de8ccf21293b95fd2c6a72c9b06a979af6f28aab4ad494f9c922a39ff9251a8f73b6e6e";
+      sha512 = "205e331b4a037404311b8b1152ba2e8e0981d80a4b0bd3e82b725b6ddd5ce5672285959f550b3b116b34354c8fe770bf32d4dcf9e98c29764116160bbe140937";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gl/firefox-65.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "36def20afd4f55be6aeeec85d60a8b222f238c5654a7e7be2d1a2bbcbd92512a1819234a167afca3c8b01c48df9e32de1c36658f9ae64992ff418934eb7e27f1";
+      sha512 = "b1904cf32581b444e37a10a8dae6aa4f39834b47e97b5b6e62b3bbaefe561e20f06ee69b66ba3afbc03996056fc6f3bdc62d4cd38d37e0c8cb49a52c1405a59c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gn/firefox-65.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "dbefa20dc4438fc3168f67498502c98d362c4e9771e6abe6f3e8185f5eb765d9fcffe40282979c3acddf91cc56cd5b950f444a824e40d88c3ebe145372496483";
+      sha512 = "17b6eb77a7e204a7e4c345004832ad1377331e7f744ec7ce463e2ef1f44dc576da8a8de20761612d51110c975779fb9fee0b87709a2b7541f124fb03cc4df060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gu-IN/firefox-65.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "24ff7f3c8a9d59d2e75d2fb68bf02ee3826807b5274dc0311e5dd1bfd747bee5ed0c38d7cd7de49fdc74ff2712b4bdbb431e4a3021ae5ecdf342c18aa2c43637";
+      sha512 = "14fa5291fd952d03d4beda2e71184458ecd1737996133831aa6f8f15ea5e6feefcee3db753817b02e89f4747b2c879f818fd4a7781f277491d9977e1e519bfb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/he/firefox-65.0b1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "9c7bdcfa99e36f1d89e2a93e4bfe9878d0baef82a8983cb3ebd12a12e411b0b0eb733c94cae9844e023ce2024fc4f792640db4f81fa3e7d29aaa8c80c1973336";
+      sha512 = "1079037838057e9d85bc3cb54d29958a4e2d21767c7c93afc70433363ac7aed314f520a502d3542abd231a59b503de3b768a2ef87d3f3ca2d17ad7deb1611c74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hi-IN/firefox-65.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "e3398c0b14348dd90583e83c85918d260f110f40a0cb871bca90ed36722f8e5868fe99a1f2bc0ce5e3ed26c014c89f4cf07e16b9545c014869c9909167af0950";
+      sha512 = "dd19fdf8f61fd2c4d804cb56158aca080c2faf4361585cbb93979401f024d9c1b23816c744eac3f6f788c39effe8a68f76e8d0891b97a14481bf1c68201e7a08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hr/firefox-65.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e0c20e717c6ac8127c3ccff295c81d9dfaa61e863fe4510bd9fa3aa9e05d6ed42b7a5a765c40a85181a15629ec6df2586728fd56152c2330c4a159e5316d1a79";
+      sha512 = "f1280b55ce78be18e79a7ae504b2004c7b29eeec627f36e57891c6d1b73415ff3b5645805c5b126cc005aba1d206da76e56ca09f6649dc0f95f514a294fbad1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hsb/firefox-65.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8057d0ac64a1515ec642359a781fc97b0cdc591aa406cb7b4f7b5e5b39d4870e3516e9d89796d15cd4295da892d96bf1b0e19132912c99e077498be92a2c7906";
+      sha512 = "85923f4036af41b64e3af27035fb988c8dcffa122560d10a21b78430f7f6e6fe5e05d4ec3fafab816f42957a998418d71a7514d88f738823a33fd79a238bc935";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hu/firefox-65.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "710a143c2c9f2e8ed9f36145c96cb014943149595e37619993de55a37b5a3df684221c6456dce57e73ee6747a2592656c5bb8ce00a77731f4b8d8e309d55e948";
+      sha512 = "1016ef974fe2f5cedf56dd630fc495823d224e74d2de074beaa41648843a9627e572de5313d041d5df8175099b94c1936fb1b315c8c0f99bf2ce8059b452ef1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hy-AM/firefox-65.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "02c9358ae18ee03433ac67a9b4222c0f26c9a99b71ba7d6f2ed5df3f035d81d6da38199c24cf9493b8942586e2d310bfa647d3d4d56c264fe8dc1075657f26b3";
+      sha512 = "3dd288e5876ded4a57c1e95eb0967737734f65f713157a0dd56191b12e7223e2bd214547ef009400ea58aede455e01822a9e0c4ea9ad55601e04bc6712f71e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ia/firefox-65.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "f82848adf8105b788ba4005a3fbb9495a3c37fe188e250e4eb72dbd18cc34179a82eab2ca2c5974a19d60170f47ad7a3641d2114036954344cd184496a420d3d";
+      sha512 = "bc3d4c93ba501e63004478ab924fe8ac6e069a231bfe5f5234bb3ec7b5eb288d1a214bd7180802927f3a3cce08c2bd5711fc6f6c053fdbbd1daca637d5d32f1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/id/firefox-65.0b1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "cb8b3cb9ca112c741b65c0ab54265dfb86a4b940a72d1646affbad5767bced811c0bc0088a1eeb09a453a555b437660c9b519527671ce704758b8e9b607b1e70";
+      sha512 = "e0f9ca54a40e01f9a7e1092e567503579b215a691907c10c7f96d2ace1524512af0abf4ff7362fa6c49dc1868dd4115a4514759707e04e5780b00dd16cbd3684";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/is/firefox-65.0b1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "09b22d51f074ef2c821ebda310b59e60b02295583d737b7887b24d3b6d0617bb1efd9af835dfa75db8c2625020ac256504e7a1b446cdfad6fe4b59edafcf892c";
+      sha512 = "6253ffd4a35abb04ecf1752e695278258e3450e7dd3dc335d43ae930fcc78b8ea9ff32927ff8dd8589eb491570ae050d5e36a366e95763a0421efc4703f9f2ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/it/firefox-65.0b1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "2df43ee959f65c9ed8870afbfd81ed6810d6fd9d9693e20b05629891848843b4211022899cf80fc94df9af65118bfe0d33723b93dcb4c2fcd41bbbe90dccda8d";
+      sha512 = "5ff3a302273929b7052c6c26f7007fb389867e375f104bafd0b808540b771befd3b1328bc577767ae7efd1aa58237ad86a841e07af04f298e0debb461b0fc12d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ja/firefox-65.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1a8a79e7f08489674f8f2893a4c8c9356baadb0782576063c722458d8bda467b26afe3bae0d83a0bfbd7fda5355a6aad8873cc1d76471b3322671d65b73d4ea1";
+      sha512 = "f66962e71798e4df4d222a384a2ec5051c6cc30e65c90e28296412f1908f6c5ba17057ea97875e871a984d27e6f2678f011afe5e5c067340f673d45b0ab37023";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ka/firefox-65.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "4a2b8bb0afd02fcf033f298fbfaa3ac6c7ad9e34a402e0f526dc54a2387197df9a88b057a787ecc7cad99f69bc87611a704439bbf433406fe1d22d748e7cd308";
+      sha512 = "78f1873a745fd6627a7e6435833f687abd587421b4b711103e504fe1179406920c6bdf847d6fce5fbcd47b485baa77555d3ad25f2ff7fa4837f48308f8144d57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kab/firefox-65.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "566062e5190676626a3d9e063740ce2a372e30bb8836d96b31434f2dd60595fe61ae20a3e51dbc24aa99fc136d9ed918f8ecbbdbac3a459ee0ab995cc555a97e";
+      sha512 = "cee493500d868909d36744b53562a455ebc4542730f97e0011ab7fc52a320478201fa41a462f28ec1ebbd8b63a77784084f52b5439e48cea5935fe71b961bc47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kk/firefox-65.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "dd931453d5970d36f5b281c2aa61ce04aaa107a92309c9c276b5120d83dd900bf7e67875fab4d91230a6242872df59c2aa725ebb018253876a01b712b4731105";
+      sha512 = "92d2a814bdd16f883ac46ae76a31d68fdf73bf8df409b6a54db9efa2b309d8c402be16593f314787a705d36d8a5b289d9fd4f2b950569bab4b5140711a1b6a90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/km/firefox-65.0b1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "839381f90c49fc4b392e8f503576a950051d113024df2b237d2cf34948164db741a9b1db9e13e9a7e79cbb3c5994ecf5801fa36fac5f2e541ef574c7c8c8496f";
+      sha512 = "7ec953af4f564097c6586813db66c9a9d4adff946a3def098bd9ace1bb2ec5d765cbe34c5f2d4bb309283a3ea83c9a61b013257411dab2d1e6f0978761058ce7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kn/firefox-65.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "fc2ee47bcc2c6c8872d62327543ed4b54639aecb29d76ea211cc86933646bb8828c46d04ad71b639f7dc9dcb7d3ee30afd4025fae78d9bc4a865cfb2baaa8466";
+      sha512 = "68d0ef81b194b16db975cc88af819a1021cb715a3ab9a24cb482e46e83219422f8db546be19667bd533835cc25caf0c8d13f7bf4cbed40cbff919bffc8b72066";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ko/firefox-65.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "de6d2ffb87d86da19c23fd276679babc56056a3e253ba468f2d8561aaa5450e2b0cdae0115325158577508649cb58d0417cb16ce89e6beb9f3ceb229270c43dc";
+      sha512 = "36f857ff7808f6a5023afd6ab8e1679c93e77dcf6a239d3ce4bd66548d22c2fdccdbefa648438a73a833d5f2683e334a6c4ae641a009330ddcdb651e2327ef2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lij/firefox-65.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c269db1b59e36cca2d61ddc1ec43efb4c41223680c035d69d76290a26cb18f0ff72b514fcb34895ed336ab576cd2a61d5fa953e0e2d615870a60546fec5de6b8";
+      sha512 = "2a2bc5d3d1c5f74468b8109995838c9a40c738727cb3e9d69236eb741f68de1862bcac12c4607aa65b6cac423deccf07b9d5e3f0b97ff38cb6ce90111ebe4c6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lt/firefox-65.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "b75be33bf611d53eee0cf2d6112e52d40149ed052a10c32f8f958c025726751066dd48893622de33c400ab642394f5c68db4319178bb0d8547830db46f90dd09";
+      sha512 = "0f3a3788acf2289732485097531817680d292662a70a3d7f5c3def8526e9bff444d0a3a7d8f7263048659f6df8a80a24744296b2f306e8b44cdbeb23e2b0f92b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lv/firefox-65.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "6a10fde8d72f01ad6b2e1aad56f229f57694ec2cca110d12a77a68f2eb30b4e92fe7529a9ee4589160443393cc3af61d86086058e4accc9e1f9bbf581a280e25";
+      sha512 = "856aefb6989bb97f5525e0b0e2acf14a448ae8d316c9dea98513f74098d36d254057c23421a40ade7bb42a522540232920d7bd0e648857a93a58cebbbcb5ac69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mai/firefox-65.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7340d5b9f93c7b06a09164d003b5c1fe7489e8a2e18aa1c89d093bc35e921acdf4f0dfc3b247b9c8de640153e98c8f7c271aa16c3a2e25b3730ddf2d9eea7ab9";
+      sha512 = "e427c73b0774026d8346476b581dc84f087e7989ee1ae7c28e0155b8debf4e55f7169caae7d2cab13b6d8b46d747734ca50a6fca39f256a381349634a9d4fd13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mk/firefox-65.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "c118ec46cd4da1af94a6e706c08f7c8d570b81b49545da8f255cdf922719c2a1158984293b18a2ea411615eef72e694dccf6474e7ec736a25cde5bd57e089f56";
+      sha512 = "f715fbdc2619fa35391aab97245a96b8d60dc4f8db90fbde1336cdfe22f5dcd4e68b6e9d3c4e8a07e5aff4a8bbf92daab3ae1df454a5111a436831120b390cd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ml/firefox-65.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "4ed6f9a71e515ed9eb2c9cfa71a10d9b3a3d827f635543d1638b81e9a67c38340dc9e4c910cc87d58bcd5ab551ce1b22ae8e7b7a1a82d8c68375a57234726df2";
+      sha512 = "28e98cbdbb69eae96b78586e00ad8379d0140bd02a2e9ae64bcdd2648978c63393b0139cdbebff87d703e5211709dd500b5341ad25fa3a1d3f840b6dd8358029";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mr/firefox-65.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "64300093406fa443bf8aec9c1125f2acb3a00843892ddc110c23bba4d78bac28d732848cce23c9bee7ad1ef03586fa02567bab7c9e423b09863256359e656698";
+      sha512 = "64c008751c310ad50624563214f14a310accc9f3d68fdc740864b5df50891beb76e580e60789a0219e862ad66248d75268a981ba25f78d6218d3107c1c911186";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ms/firefox-65.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "ea6641f148b7fc00e0b934181ce86735573978e7d13368673de25a88709c5b930aecebd3f4e5cd83ad40b9b0a11f3bc27b4e24d68d3dbe476344b23e1dcfe087";
+      sha512 = "d5eb1472e90ac506cb518f8cd18d9142673ee4f1289db35e7cb23df895c71a48671d17a468289c21938329a89c1dab5e23a8c1292f0a5de41c51b57091a5ea01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/my/firefox-65.0b1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "c302c3c95303e6e9e8b2b13e997a99b6acf52364e2cd30f20ba27a48aeaa395268698b2aee043deb5464e4cdf123aefa8528833b5f3d5a52beda11a39f9a3e5a";
+      sha512 = "79944df3288c8df2a105e53e36e253aec6990a48bda3169de579cd1b29176cf1b52b1ab8756a19ad06e1a028421f59a835fb69dde18394da0e10906a9c9d592d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nb-NO/firefox-65.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d09a982c4301228178161d1c7a0b00b9bd8ff71125571f54b214a0de2ad10f5efe331baaee3d849f3b06a59e52aae4c52437216476808046087800c5014a9322";
+      sha512 = "bae4bbe321b54ebf36d1c0e978c9d18ebd8ce1b4dc82711c2504fa638eb29ee03e84935dc6a458cbda0a6ca0cb5b07f08e696b9cc2f5c035665f8636ceade660";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ne-NP/firefox-65.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "0a00a6078024fdd4c03d1044d9f72df00eb8da3de3746fa78a86ed568f72d8c83719179951ce18f7c0d1dd109773c487d5159d7b6a913bc1cc8c6b2c00603fac";
+      sha512 = "cdf8bec99e46d07915d5c5082390f168617910f9b43f7b983741acdd7f09d9b1798a2b122e3e7fb9ba1beea7e43592d488264ef428461a4b90ba4dda42b0cd11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nl/firefox-65.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f87a55f30c1b9fa14a8c0d4c7187a5e36faef688ac8a3082bcaa576db11457886f97405bd2ab1c5a02b4ac1c94643f143c332a68f90ec36f3acbf42c73876dc9";
+      sha512 = "61c5d39dff518e923c5a81b4af1a1129c41bcf71d76fc8e4a4326adf8c8c486aacc6a7144e234c48b67adea7a03405848a19a65a086d12050ae1ff611a0200fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nn-NO/firefox-65.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "aada464208cfa7c18b126114e323b1e047148891a568a8088661ec313e8c04eaff4c9f0121d9b9df95584e502e1dc5311680a209b67667f8c1f7706381208a0d";
+      sha512 = "ed4f2598b3ee286671a7dcbcafb3ac4c1babfd58221ac1d6e17ae88346124e41353a73be1eb61c458cfcf20ac4a3ee26f16dc55b05a999ec9d83a28aea4cf87b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/oc/firefox-65.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "fe9a5e94cbd328fe988e263b2036d3e3477ee792d01f5bf13df67d0d352489323ae4cdf76e2e559af7008fe36804461533efe96245870244ff653e2609d973cf";
+      sha512 = "9bd6ad8359e8c7a4999e8f931b220e10dfdf3cf147cb683c5b3d2a8de775323df47117142d75612ca73c015f6b97cea271d0728225069da0f4c8359c5f5ebb82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/or/firefox-65.0b1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0992659dcd653f29b7dff511a0742352b9c47d4db5fbeb1b3fd123ceeb3dc7fdd0326f7fb9dfdb52cef128b16af21fa457f4c732f6ef421845d6de17ad8ca446";
+      sha512 = "926f128bd5b7fd6d6c74883517d3c54ce5f7d917785f45ee062610c3d0389371a48f971c247984ada2dd62a0e7249350b9b32349225b6cef80f2d2c10e1b35df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pa-IN/firefox-65.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "81ca4d42d4bb2674fc3e8e3d9c699b0d0106ba99831f7d06d747e254e8a61a6e9c197586293e83f7ea34564964b4d2a1da587caffa1dd1e7915ee5ff7ae4617d";
+      sha512 = "91757cde47223590be15cd74e3ce8f0466eae141ccca68f38000bd59c711298222d9951df1765f68ca03d2b8d15730a8ed73d142c1086ab2cf579213429ee581";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pl/firefox-65.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d344dc5929671b193077429ce08a51f420a996b8fe84d2f85a27ef71da407ad063e8a5c07ff476b9c5a687bbce5c8882d8281ffaaa4f023ea8550a607fce504e";
+      sha512 = "77cec103f6c2810f7cd3cdb036a590fb88007a86b1775178c64f81ed05ad92a8033bae5bcb753f3f9fbc39d10b32bf1d262599da0fd4a23f3a692c5941d23728";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-BR/firefox-65.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "8073330318cadf83558b30914042b1ac2da6911f00e4aba3bda573a65f27c53301e1b926eda36465c6f5e484f2f6f5208a863f8b134442e29a5cc908885917c8";
+      sha512 = "0078e18b65681ba521217f589bddd7b6c507a529e30fa524e83087e4d4837b8e771cd6db1e1cfb77e107ca28ba05c052b3b5b8c96c92b2eba63636b6a23c3999";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-PT/firefox-65.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0ec5b66761b10a6f9e33c9c4fb8551fb7fb8d33df560062c38e71e9e5f06c6d58a4ac954db650f0e9c3d12e39fe98d3bc3c9af2e67529892ac14a1b8e6187398";
+      sha512 = "aa0b1f53bb6da5b64dc8ed0da0a46e4a28c0064c1ff03dc40afdf4e2daaaf9c7cf203bf6f66d3c5fcf0fdbf0c3aec3e71819d49ca901738be6e6d343bf44179f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/rm/firefox-65.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2fa38cc4b068358faccf1e6637864556158f1cc704111f0ceab3384ad6f80df6e04731e3147f952d592a44e05e2c39794d9b6fc8da2fa0497f60c3d0329f4c07";
+      sha512 = "aa1ead0607661103ff8d58e84cc7b6b2fb80422cd25ed670b9403236d5a702255f56033cc9ffaf5746153f70973f9d8c711783fa2a16ae1ebb55e8ab9a669b01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ro/firefox-65.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "5ebc28061eede2b7e8fa82d7785af1d7ed573fa241f3bcd992973219827fe41d05fbf7e878e7fc4be0ca112389ece5088ce2da76b4ed81af25cbf77613ef1ae4";
+      sha512 = "0bd2887af7ccb38d6ef931882c33c629443dbfc1204460bd41c4321bb36497083794fe7e7761484a400844194f39247b30f68c3d2d015141f472136dff3d2a53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ru/firefox-65.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d48ce34160d0cc06931478822ed668b56c0dbabcc36533ed89325606c7114beed2275fa65be627320913cf899d18a0c91af60420b0028e19ae7baed31ca528e4";
+      sha512 = "3603a4998739e7a561f8e642ab1c41346abf5a05eb27b67fdb79f6025fca1a9868570bc1f68db6e04eaa12ff81aee6522fb2aa1bbd74aeb33e08c69b9f67fd8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/si/firefox-65.0b1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b40f699b3832dd3fa31bcc70f237eed994f3ec2e7f405896595c7bf0a2bdfd935d483ea342f42c041f942613df5483aee93f47f154b999a032541a2a13e751cf";
+      sha512 = "1664426cdadf570e4b1282f38015eff3436fe6c37f3aa0b9445f5099d3e4ea58d176364cf615c28f82cf37fe07134611ee405dd5dfe1df7d41f10b5aaf97251d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sk/firefox-65.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ebad485939f64ef32016c7c410b09c80b55c40ff21f59caa3d5e73aa2c65581cf82cbadc2421be9e7f743ff7176f454908b2399b0c2d78ff1c81c4003bac84f3";
+      sha512 = "d2144172be9383c32d2f66328f27ee5d9585959687efaa5bce1e7a9ed1726af58714a535aadf6dc42e31684f44f065775126e4ebd177c12610e40587c1094566";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sl/firefox-65.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "dd7812bb6b579db9961bca9056add99e5aa10b3309c9562ac1a30a3613fa2afdf5a3fbf0943783660671b38b35016efb8ed3b1caaa0d67edaa07dca05b3a30b8";
+      sha512 = "624becd246d58a11b1353a4838e78ed5ec8362f356279581ae1f4376da40712b6aa388d5cf02eae6040139e34995254e1ee0c08971d3666e8a867cef1be38354";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/son/firefox-65.0b1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e78c803672aae2f6a26f7e9173adf7d8151d9d54866114e805d8143e46b20f5a08d4b2b944fe3e2b87f8cf342777c925ceda94592b746e101b62234141512756";
+      sha512 = "0d2842e6dc3187608265c70d1b0648d8b31e5b790b734d1e09c9621f8910f015ec7c245d4be1ece26f5df171bb134afabff8af1de373185d6186cc4bead293ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sq/firefox-65.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "0bc01415b9701bc80f371fb4541bbad387caf74b25edb0b2d0ce91a840cf7a8bd012fc206486b724b5cdc694dde3d229ce8c074c5d4b8d6b2e9166354b5939b3";
+      sha512 = "1539962902491f03cc0e5f5c730137a6c7649b02e3816042862a37f06982760d1119fd7721e5199b94f45a4c21f76797ffba6f84981f4ddf89f1791a06e55e3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sr/firefox-65.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "f59a095a8ee815f48e5bead71af079453df702e56874c8017df4fdfde51c4db81a83a6ddd2feb2c8385f0c2bba5f0f985bb9abb38cd9777f7234796eb014e621";
+      sha512 = "0cf6b4c2db8c5fcbafdc207f38de436a25c4bf467589c69d2ef1c82cd91b8ecd19a562af8bcfdf9e867b9da2c54d1bf492a395a0e6c00712f7143cbef4b598ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sv-SE/firefox-65.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e9884e0ae32d721b4d67069c63b573dde120ebc4de91b886644d07d00def8e341ff1a224c8645c2c2cb5539af2eaee74ee8c835bfe7a36e96ac7a4383b9344eb";
+      sha512 = "ddc9bc5a3b260570c5df6995857cfae69e426b745d5577b88dd6b1cb56794e3176ade22ea78437afc5a0d2e493c8d9281266ec5691cd9cd10743e6650df48478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ta/firefox-65.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "36d3424027236c38f271a9eb12db55f978ee4e59d58b7addcd40f92f41aff015616a1b1b43183ad550b62f347b0d1ae85c4df91227ad65b1710176be8152c5b2";
+      sha512 = "ab60ae9f72751526b26b7bcd062293cecc30ec02464797788efe9610a57baa0c1deb3ecf7af6d5f2d1059e971e04e119b497e4223853047f73a924304b16ad68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/te/firefox-65.0b1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "d49d0896e38f22de374e4b7b2a28cf63619f7c8980dbe17efaa2078333f84e0df20cc636aece5c58fad4a792095dc11ad08e75912e77a6d00c55c63fd2085800";
+      sha512 = "c1c31923c57ff1484dd7992a380cb812a5954dca248bc2af69ebb104cfe9f543a16b8447694a748d427f727a87dd07474cbd17d9a1eacdf0c51af0ff48e79137";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/th/firefox-65.0b1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "e74e806bcbaf3206c4a95846110ce13659fca80a63126496a9b2d7f26d00e1b8e781288144cd22e278938a37f316463f2179cc0642ab6e852875d85b16eb4aab";
+      sha512 = "060058a99916d0b851ab41e0a1c38a3ab8f15241a8f46d4fafe50d6a9dcc436e697a1e6f7ced819bfaaabff8335555afe236807877400aca1eff9749210d8d9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/tr/firefox-65.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3cb2de0f5a305de3ee8c4ba7b70db4dd882437e3030a1837b3e3cb1478d609616fc7e8c61c247bab0a03e6061fe8755191db0a2126b2d5b95576396e557a4457";
+      sha512 = "a8e6d67cb49fee893600fda43ae4abe9ea3d49edea372db2ccf51589edc1cc4762eabf641ec51d1d5117ae0424122da08c0ca3cd339f7ea6e46ffb8f33fa254d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uk/firefox-65.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c2cffd17e5704eb6dfc6e757f6e4f45440b9ce10baa410be779f02815b60017d5647df8d48cc183e6cae70e64de893f467e7edce8facc189bd50868e0824b56a";
+      sha512 = "7000cb70414f2c7b0b3f4de5175584732acb5978aeaa77721f91016d31ec561986124a28cd8705abc57a562b1dee1b6ff0c270105ee0d1c6a3cf485b54c8184d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ur/firefox-65.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "55a3ba48586665ecc77223d44982ebc276f15f7ed2538a7917ea982968a888de8c4fded1a2239969f95b751f71a9e9c3d20a1d655ec80b8bc9f63de3b2f418b2";
+      sha512 = "445ea8709ac7962cc9c2e5316453918d890fb3c6b453f97fba4a67dde6707bf509eeb3e8cff2d7789a4acbc9d138d1f7e8d4d493db55dd122c48deebb401e113";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uz/firefox-65.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9f94a8cf73af3f96c06a8aab1f31183d940fdf55ba864661513e9facc5c40adf6cc1fb42170a49d702f305906711df9e13bcf97bfdb22e31f8f177a8468f3bef";
+      sha512 = "acb46a2d398da472fd85f8a8d8e6498570b395445e21d4bac250146e7b68f9ae01c98747a67faceedbef3cddfdf3f12a7ba10ffbd9c5a20ba9fb8542bc310944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/vi/firefox-65.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "bdeca49540475316fb93326651f7c2ec54bda4d27ff16395f8ae8488855813bbe0b68f98d278d1e87724be4ee8c7c1ae5560900e9b1fd75ac861ecbc8c4e46bd";
+      sha512 = "e3541f17bc38a48453e4a3b76e7b721b56dc8a3d41f16d23d7ce9698edbcac860c5956a1ba2db5050dd490eb8faef3c8d75ace0d878b77d0d54321712e9a2c80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/xh/firefox-65.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0dff6128be2a8493f8f93e91dcd9a74c1861739babe57bdf7c7505ccf657cd7b6d25461dbb8c478afdb1811ba4b5a1abe8ca7fb7947393b30923d47af37ecadc";
+      sha512 = "958064d163f58f306f66de17f0b255cae1e315c707b70a1b19e0bd37c0ce8bf61c2b5cfa23cc605c76dc77061d17647f13a93577baff167bc9acd044d26f1232";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-CN/firefox-65.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4589a428a78b532f888a7bd82167af84d85d7557a099e6a38cddcbf01db546241f12420f6a926540c55ad7092e00aa1ac8b622b3638a74ee97ec58f0cb0e85ab";
+      sha512 = "b74a598177fcab1dc721e854135cbca2769a478a908adbfffb18d5ed7dd4d1e984a8413d11fe5b11235423962bc0adfe00fc4e3c48512909dda0c12663d01564";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-TW/firefox-65.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f9b8bfe7609b7dc511b52ea937fbdd3f40b32c5aebaa2d9a68766efef0aaad6d9e33c0d0fcdef55a4953973df2b2695d4179f9ada33893ae13ebc8fcc05e8442";
+      sha512 = "c7bee751ce40b7110f0f32263dc6e928d52e5b065ce1e0ad2770a43c44dbc6f1bf372df7aaad909eeedb8e4e48f045365f181b25aa8baa5ad738025a293b7c8e";
     }
     ];
 }

From 2e44e002a2a267e50d227d6ccf50283a9d22ea46 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 5 Dec 2018 21:06:11 +0000
Subject: [PATCH 154/199] firefox-beta-bin: 64.0b10 -> 64.0b14

---
 .../browsers/firefox-bin/beta_sources.nix     | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d18e82771956..e16567809d6f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "64.0b10";
+  version = "64.0b14";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ach/firefox-64.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "e63de6a872ec67b80cc488be329f4a89b56544de02da871904cdbef47cbf65b9aff2f83974ad3b8e661b2361c6cd836279dd006aef95e16c0f85af21dff7bd69";
+      sha512 = "a2a467acf4d76b09d7f04760dda0ed2e49f31e96166c26bee8efea0cde4dce914deec16a7b6bc3cc8e06b2acc70a250c7db980b180c5ad7b363e8e0334afbfab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/af/firefox-64.0b14.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7e745d102fbee703e4c065a597a26f225aa8259e5544465b6f131c5f6edc878f652c2f3529f74366d3aa7181c47f4b448287021696168e8c9873b8183300e937";
+      sha512 = "7a271ec7e0600299fd73101ca2148a5057149deefe5ac5747213791f5cf6a2fecd54e04ee7b3b0bd8d3a5cc3ff8ed852724b602b797d6a8e43128ff2ebc83af8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/an/firefox-64.0b14.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "8507a65610f8fa2c23c086094ca71936e0249adcde13105ce0ab9879b32434aae38534b90098e40e031dc406de49390824bbbecf17f3a6903dbc065fb5fbe0aa";
+      sha512 = "418f50d3b71d265d7669a7ab3d4027164dbac85a7970c6fe690fa592c08a33ffdf8feaa6a58e13b28566e8218f2988f134219608d4a1804fe7aef8a154c16f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ar/firefox-64.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "f5c49d943b0ccaed81389b161ec744dda771adf93c90c5ab09325b7de57744c1814bcb7caa88ea9269e8754ec44bdad5fc948a5a903a77dc0657dd6fc03510cb";
+      sha512 = "61439fc182462d27a03ad8d9472d96a50336a864915632f8e0c8ac3b0c5e2f7aa6a346ffedc1f0712fcfd6417063b0894e2d8b4f015f85ee1ec4d9ab0ed48c01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/as/firefox-64.0b14.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "cc5b14798da8a759be04518f97b7ee4995138893ad08c2e0d721212f69de63088e1a08237f9bf4e725d154806441d1a89b1514d4c789bd1381d6caa9737abb94";
+      sha512 = "64f83e85f4ef5c169f4683e92224134cc260e052f2e837e2e272d052cbddb106ab6a14a985dcad7e9928a7ac17e28b9f847a22df681fc4600183606330012e16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ast/firefox-64.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8256d617d336d08a6effcad9e445ab0a4a80a747bdd2a85c50eedf3dd2495d41280db0d52bb6563f96c2041320a411b519f0978efd2f7f059ecf40a3fb164ab8";
+      sha512 = "9a7cff9892fa4fd89bff4b4be462a949d70c6c07eaf4c2373946f8f991e1eb6656d2a7af6ba55a7a4fafeb54988add6a779c01b42861aad37a58b81adbb487fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/az/firefox-64.0b14.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d11f0e0c8967c1562ca9455a23905b4b3a057f7819d2093fe7e60e785aeda718215e636b42e9b60bdcbe1ac89a326d47da5d6559d01c3583865996df4b42fda0";
+      sha512 = "1b635a7599459e3f270bdec64cf6d9b984fb0b2470c49a3fd3566e1da3ebd4302ae0f0b575f739f9c175a4630f45f31ec39feefc8ce2decfcd84383582171b8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/be/firefox-64.0b14.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "335ad773e97afacedb62cb3a4dfbd583732e2bd8408b253143cd99922b116498cc5c55c39c9e2431dd3db39d7cd05f2aa2d769ba334d683bd975fcd4e6395f42";
+      sha512 = "f9935dd0f3a9ae11812acb03bfb0166e6030872b847cf3cfc29e9b56eea5050cc1e75a898a404deff6b01d8131c112c3dd2df754c197a69fc9f0e0093bf2c128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bg/firefox-64.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5d002e9993f0e1a63742e5a34f96161b43ef58146c28cde4563079bb073f7299551cdf0a9f35a6e961f2dbdbb87c29a7326676ef927ef4737eb9103157f2a7ab";
+      sha512 = "13b3618c401fd41f8f199444e84eb5bbdd3b50605b30fefbc15819ca54f92c8bb8e542396c2a32d856453e1a01df98d4755fe6c840360ab16a308af1cfe0eef6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-BD/firefox-64.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "c54af20089bd32eaeb17d8e574b674ffa193842e809eeccb4fe6694c4b3b674371b60ef06f1abde2012465c458a36a624fb9146470cadf2596c3369c3ab05ca0";
+      sha512 = "ed5492d0f16d45d5e22f9fc5691b1672fa46b7b71389ff80d35b16de9b02320acfd416d44e6186e7fc2ee54099fcfe8a356f302bc049092d9c955f2f0e2b29f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-IN/firefox-64.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "fac070b57346188b9aac15257fe1bc30a0b4feec05d80a93fa5f4f0104891ee4ffafd81f8ecd1e55939cce4a10b728b10db0fb1d0be5ba14533e515b798b2d45";
+      sha512 = "df84b6688aed1dcf4de5ff8eb8d8bf802d5062989259c2255684d329d172c1fc509c1fffbc6fbf7f045f8aeb0b4955a3c12da85140899e0a5d6e6193f2bc4170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/br/firefox-64.0b14.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "4549764420a4c7b6b6583e5770aa246ac1dd24e57f792c03e98d2311d5bfb47869e228c54d4a7fd296101e9a1881b1ac0cbc66dd60bdd63f7149f8d3b175289d";
+      sha512 = "f8b148f8a86774a0ab8b2f7590b6d76feb9d2cef99629e76b6fb86fd1195de86aa6693c03655ec4dcc9d062978c542d13d55c2ba7573242d2793f8f71bc9b34a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bs/firefox-64.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "fa8e664ecbef781ef5ecbee5ad692e37640c2537c35ece772fadddc2e4d79391f756f28891f0c22c16964f247aa787a096e28a662fc08c3f6b8a971a43dc1876";
+      sha512 = "150783ad5f748514f46743b7d1bfddd63175cd8b17eedc6b4f1049ac9fdd4d4b06288411fa894f09e18c0b66c2d03dfabe769bd77f909062a36ca78af9b1b60c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ca/firefox-64.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fd7072341f3451481f4e50e986bf02f45541730db7320bace3d3a343014e01a28595cf0ace6bad1a099504fd9943a5cece2833e4d156122db8bbbf88b7ff3193";
+      sha512 = "3d4b5ba4f9efb0960a2e7556cb08331f4ae78cd193f065c1c2d8c9d6fdacccc1de5418bc7e9a71ba19d9de7ea78f2ef154a4a95ac58489a8f9990a3ff27c1395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cak/firefox-64.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a9920a8d8ca455b85accc51e4337d6813de263b432decd5b2d275b0c272ede7351c187299cbd7c0745e6cfe356b793f37335bb2840b23b8ff4ddaeca4e8a9332";
+      sha512 = "a21f14531c8e77695f49cfd8ba035dee340cec05764dd009000614eb3b1e5ea73c6c677dda6d13bce7805e1a17669749a37fe4cca9e6c10db555b6dd0f057af7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cs/firefox-64.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "d622c8c1dd679bf90ba7150381a04f70ac0479b261584cd18e17b44261529a8dc023f7a4b2ad8d495cd1f292a0ddc053e4e4daf70cbcf7ab02d10c6aa072a502";
+      sha512 = "70421e5d7c0ae97a941b9b008afdacbc883b4d9c2672610bc08a1b9b31f90c9414aac791c4bf63443dcd8155f90777b1aa29ab8e9d56284b9da7a872d0055f0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cy/firefox-64.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2812212393f826387206adc0968b0efafb62176b11e55a126ddbccdedb13d8a8656ef1400d262d9120dc50b59a0028c43d97ca45a3da5b167485a9c5378bed9b";
+      sha512 = "d4b903a0e7391080be7c3dde5d714466550d55c82354d5ce87195ea40e1bc026dd43e5529ec2749761d0578ba76254bd12bcbd127b364202dbd6dac3ec474b89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/da/firefox-64.0b14.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "52d690a5c4406ee9a0fe69a598a8d4d7b24ff3475676d79de67d45658058a139629ca0c1080fbd849d52dec119691e19a3c79e2a0994f5e96ed057da322b4578";
+      sha512 = "ac3b7b0957c48b34b2266e46144dc20e8d24e131f86c227ccecc07fb232e02dc4e11b7019df3f0319a90ed58c837bc1f4ab520e91a6279e4e37b7fe6a02f57f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/de/firefox-64.0b14.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e1cf5a56bca2d62e56b2cc9c32da15b3add35ce06dbcd648a241f1d36047c86c13ee5cc0619a2aee22d2652698bf83e5974e330b18b65e00391e913f9975e8b7";
+      sha512 = "4187a9813c2a948d135f1f8e70d31dc8ee1b8ecdd3a07905e7265533e6df77fa68b5ec09ca7525a9a642758c99e91d3118d02cab23468c9e383e2bdc9389d457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/dsb/firefox-64.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d0a07800b6a25683effe02c4222215e6af478b0582d0fa53e25e74f337966edc33add3dd907b9831038e4d1349a6828148f61e4e4413cece20bc5d160e0269ae";
+      sha512 = "8aee6ad9200054c3124bbc227fb3c64e4a2665ce68616c145c7ea7eb71d35aae3846068616ec39d8b80fc29adee954c4ea31fbe5491169e39a70988866e16133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/el/firefox-64.0b14.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "3c5b88c1bb6028735e7594d64dbc5fff9a9fb28ee02abe912c18c1d9e4f8266a78f0c0636e9dc058063fb79982a7b13666b2287e9bf89953df9511c2ea8ea855";
+      sha512 = "85e9efc9615d6b1cc12af25e8a4051ef885e2f1b535ce9d2f9aee16162aee91672e6230774343991896f993dc93ff10ccc2e24d7c3ff13ed1acc93c7537dad26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-CA/firefox-64.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "9fdd11055d0ee06f27b080f813d2eda68637c8028c20b2a7b4122e4b3b4398c22d5339f54d25ab4d221c76765e490b83ba30368a7641869d660060c60a18afe7";
+      sha512 = "8776b5d1286d90522b133ec1923b5f510981d9a9a59f502a421a2e12f0e6fc46af66cb887db37326802e18dfa99ffba823143ffa60ffb03a95f62772af132126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-GB/firefox-64.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "15a07fd9cee551320e808dbe538519c18caadfe50da7711b576feca337385b623eb958f0d97f04c23a266daf19355e1e2a69a2f24ec3482a2d2d8938e38afd27";
+      sha512 = "477d56e4f5b7c2c26ecde42388fac36ab1045cb52eb5d0ed5a316dcb148efa8be8eb5deaf37eccd8ea906ef702441af476c43cac795278e6a0071d46c5830861";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-US/firefox-64.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e113244031727118e50d5f44515e64e4c8b576e260877d5c9009397b36732095b98a701858a82ac421e56fbc40c2a7b3a2d39e391bddaf49f74f9818e0ab48dd";
+      sha512 = "e6de3cee9298362fe3a93ccc23ab3ec1a4e8597224c44e2c3f31e1cecacf05270563f988156107c4d4b009a5a8e7f50ba849a94e38518fc30f986f6a73bd06aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-ZA/firefox-64.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "583d871b48a41e2f21f468f6702484e5875c02f2df9c9eeab4b1faf99fa977d84e4878e673c915f907d131b655f6dcd1875ebc126093589baec2f5091d98e05f";
+      sha512 = "03944b015f1ed1521dd79c9f3948ba280d6b52cc9655f6e884310e4032a44e4fa38b4ee7ecf8cf50c48f4bb325986835a7002cd7e7e21ae6c1c8d63764478cec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eo/firefox-64.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "bdadfe17850e57163ebcd66a3c0ce3e20fc69453df09029d7f31d541d98bc6c3a0a5c98e6902a659e3b54e2669beb6133ef45373221a21eaa3f3f26bea0b892a";
+      sha512 = "fbc1bd9143f9450c0c42356c20696890a64b333e0506ed959d3531cc4fea7b50fe379178c7fb51ef5e8449838d2749ed7f3343a3a2617afdb994784192fa8c2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-AR/firefox-64.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "61453a1e4141e7a19fd7d31fb8872574b5e3750058675f1b00c6a78e2212f69210f00b15288b68af2de8a56b3d09a63be4650e280a5385a86e0003721126a35c";
+      sha512 = "3f64bb89d8311b82e93c121256232cf7420d1d8aecf2cbad62b823904f4d0cdcb6192a276e97a2004614294f7893885292736f7e3bbcef9217554f680c0fb509";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-CL/firefox-64.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "98e9e06267e7a6f700acbdb6c1f35a557d7a67e9ad294ff391b0464796f5eb16a41c1c755c3a890e7e82dd94e62af302fd3392b4d553e2490c28c5f15eda0b7c";
+      sha512 = "705b55e42f4a1982712c1c76f758293e6fa8785938c5270c95285b0e31a7caca1552adeb69ecbbf5e5b5d714ef2e282d00762b147c42a0ffd50c01d56cf9cf6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-ES/firefox-64.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cb37d107d742289f88f6e88afdbda3d18d41c3d37cb6209c5991d20c36a3ccf780376f3ec6cb3c0fddd08c33f35f98c22b71236987a537410abc72a6d46ea7bf";
+      sha512 = "583337f9a52132f2265337892071bb88557c4bb5a8e827ff2c37c99ad45a51b516ce16a145e7e32c98bba3deadbc79fda03f0dd0f2438b8573774ba60ff61e50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-MX/firefox-64.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2969ee93e447c8e9bfd5702f43f32c46bff39a073dec5137d72c5cdce64054c7067b385622a24375966ec13770173317bdb1037237e2de980ae755c9a072a6e8";
+      sha512 = "2178c0f13035d9050550101a090818b4c3fce5577a13389e93353db2d33b025ab8f5904660f2b1516c2356af4aabef9cd6f403fd5e70560e3f4392db7c873c22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/et/firefox-64.0b14.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "21a75474dd5ce519ecbd78fc803ee3a80041a0f1eb2daac15c8fc861856a15e365909b40eb250689d5aab4dac9121a9acba6f0805533c71c2a9ef034d566bae6";
+      sha512 = "405a1592c91e51fedcb68e526f75e9db7cc28e333fc75effa4963d4313216080d863a071b0f881e2d79c990d721503e6f2794d4a374f108aaa65a63ecd9c3346";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eu/firefox-64.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "5d332bff9b85956b1a1b0c83a27a1c5211d4700f53b1a38f34ec7072c3d000bc6af7cce48a51084ba3a295c9d025730313747ef8e759c5fbf662879bd14aac61";
+      sha512 = "ad8f627889b4c801dec0e73e4ace1e62f3d7a9e561629b2c7907554740bc74d67e9ea69bebc85d7f79e671c3bf95a3c3bad8585afe590a9d1da28acbe2bd71d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fa/firefox-64.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "1bb42cc21b65dab7b950a877e21a3ee9cff78ba4eae034da4e322930120d8cf5076598801ea609b77cdfa41d084fe62f8322d42da773336597c30102bb61eb10";
+      sha512 = "91dfbdf6caf769bb45e168630dc028dde338fdaeb25e72a5f1fc98787a877d4c95504f4a0152fc6c7f7b347a4629aa8250c3a328607ddc6340c61f867e7d274f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ff/firefox-64.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "9ced85f9ae63885b49953a733f2081fee55dfc14e12bccc3f3531ff605181c7c04156e272c100ccafe7d88169df1f128efbcf6bee0737afaa28c5ca22a77d286";
+      sha512 = "5271040348c6fb046e04df8e0181b045a1bdd8ec46979324f8ce98eec6ecde148dbbcd7eb84d7b3102dd10ddabc14360487cc8735c3c3fd84a25aea79b304492";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fi/firefox-64.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "3624699d5945964f16035a87fd666efa202de1b25a29f742131131f23dfa4b8e38a17c061e3ce95b40bbbd45026c60139b961062a7c5a9d6c01ea3399d56ebf2";
+      sha512 = "09386d83a26a8dfba3da620460026ce4bf92032dc8e35db28ad0bf9501b11b4c8108350e3823135567df03194573c69483de967d9632e4b22904fa7b2a1450b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fr/firefox-64.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "56c304d07c4f357170620e13c2f986b2c87f39c7dee3a8d0c0ec12bc54dab02ac12d0c9c281a011bace55e36327d64a0710d8fbdc345ea0bc4f9b6f19ff42514";
+      sha512 = "b14931c9146a5784dca231e9eafbee32845af405baffe2cbabd70fb2369294d797fea8a719a2679945c375f2355773cd4a54b287a823bc7e9896f41e56a2ceaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fy-NL/firefox-64.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "0b75d75abb56ba70b421ca819fc80aff409ccc98b373d91102ad84ca7967aec5e8f01f93f9019c6b223bf9063456d2891a1e04dc43ce34643d6bf9ef162f508f";
+      sha512 = "7d8f480a075692d93cd03fa9aa1b1359e41782925e91cf670100101edd8e4136e52e004a80cc3f8f36332b16885e97394871fd9b0c553a6868f91a30742fe599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ga-IE/firefox-64.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "0a6a39c1c93cdb67fb413719f32dfc583bfff1a8d98cd330de126f9f1189f594c9b85b51ea210bfe07439a9ebf5b5266edfe0621d6b544fdb25098107435a418";
+      sha512 = "787a5ec8470f0a06a0b16c1bc3bf11f46e26dc375d0fc0d413d6bd663baa014a313b9fcd511463eb587e39dee1657a534511033d0d92842911334ad9005abe55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gd/firefox-64.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "5406d839461cefa0741a89b4b5bf95b6bb09c4096694db7a58540a31ceb0ae63c83d9d23f983056ad7515d17d152777b0851f21149454f5ce67ffd4951e07070";
+      sha512 = "22ba14425e3a08660562e03a89a4f7edc7e8759378f549b284bc69275f0660fc52ed87f6ca028ed361b619d33446fa7c397843095d4ca4eebdfc4edadef4651e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gl/firefox-64.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f1a383801edd077b57bffcc3ed2ac2f2616be9cbb56d21b842490c40f9aa59796e6301b0b1c51ed4178a9ddb21ecd5daa4ef9155b633d0d1886373519222ce91";
+      sha512 = "d36f2bf1b3be13d64dfc36f853d67defc8a6d08d93afe41beb7f8b63854baff198fdfee13c65a4e6f9e907f91753844dd41a5503313a1e8c364c8dc3f2de97d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gn/firefox-64.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "37c4eef718dd9e76e87d4ac08f86cffb843aa0a90894e3da46bfaf2b6e89282fa7aedeaec061439f5e61ec57d299966df3185cd266fa1451b57f53788817c1b3";
+      sha512 = "cef46c079c13fa606a4c5b072ae14f6ab2b578c8b6a43532b38b65547b4fd0618237e84a89d4fe3ea8bfefd8a28984af783b9beaa7478cd42b5cc42784c2f70a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gu-IN/firefox-64.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8a6fc54b0a203b5b03c3cbcbed26f5908af361958cbfe0b2ecdccaa28f7db7b5488b3f9aa47b94da19be0f41bc2ddbef782bfeb6c3a3516f9c41090e45dcad0d";
+      sha512 = "2bbc4c4af3f927b51c57afdb780bb1ab55357f40f7934b43468933db4ffda115b19fc95a95bbb292ac68c083b6c7ea0ea2feb3a072779fd5416bb41f7938b89a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/he/firefox-64.0b14.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "00553c2131873c7c0353129e402193b8c285738d2553067233e8919eb617f6cea5344b2b1076629d33b036cff9bda4cb923a89e6a1a38841ea42c5bd3ac7a5a1";
+      sha512 = "897577cf30f2b6c31f779ffeb74b221513fcea262af77e2ff8beecc53e5c1140b478b530ca1c2b88f98f5b3070509c6e06a7cdf9a1b512c455e2676cd4345c25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hi-IN/firefox-64.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6ddab934e6e6157955d9e2eb8209e2107c6e451f3731ef141eb07757fc60e59b76251a61d8d6b3b918f300588add2413d119005a16d420cb879f279a134c11dd";
+      sha512 = "998cd2d0b00d372023c223541c4980ce22cff87724c57135de801aa89841db3f348f183e69d6743d3aa19a0ca0e3676a6443ec8263d7a00806f537895256623b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hr/firefox-64.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "94d13d40681176087279bbf0e2cf21d4cd1ae442270317174519375b9bf9f9731e98ead581e17a734bf992ce3f71183232b8af3156aea0abf8e07845de56d8bf";
+      sha512 = "18c4a3483b1561a71dee3408ad8a26a4f16207216af25b48abc892bd5298f8cc43b03005e4f06543985c5ff3fb3b3811176cbfe349ba59b5578675ee1c7ed698";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hsb/firefox-64.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "26cd09691d013306507e4f6166fdeea9f2978cfd12bd9fa40f5a5dfb8b09e6444ea5cd062c09271effed3c3319b197c71cc055fdc8b8fe556de195b0cec0e7ad";
+      sha512 = "ef1c6a4eb5afdaeb06a6bf98ff411a3b92f86fd0143df3a8473a71a434734c688c1145f150da1db6f9d2ec943f2f6cc906de43a68853a6b0dcdd126638855946";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hu/firefox-64.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05a3189384bd7a83b736b826a21241434d88e1e67699c9b3add789a3ae2ccbc715cdf4addfab32fba0c844c238d15f72cb8545a5ab0507054f69e5f8701ff98b";
+      sha512 = "8b8bf3d8d763135e766360847163541897c44d0039b7929b24bc4c4c70187866ab2a91dcc37e1755048611f15c957bc9801734b289dc0de98aaa712f9efb1170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hy-AM/firefox-64.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9bea0ec38b5a0178c573edb5ccb5d23290b6a04a79d182473dbf60bfa4c98ecf6cf097cb00488462b329bd828df15ad40a2029cd4d81850c0ed30124cd0ac192";
+      sha512 = "91691bdff5334bf1bf51fca19bf558045b6fda537f4d4094a572c015b486def65591ce2bd6f988a3b5daca357482df3a0ba90cacd3454886d4f747d4b8fc8e8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ia/firefox-64.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "4603670c8aa74cc722840b6329cd111f954e926359a6e9f483b8a40d73767a9d24760d2bf517e02bb180c462440b8fd871a46e15333f29103ecaf62aa28f3004";
+      sha512 = "a8b41cfb69f44bcf37c3ea84710a4df5cf183804afc8882e3929ebcd50de23d212f53051716445c42d9eb78d13930cbfdbc46cb1c1b9df20c57815a0433b38b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/id/firefox-64.0b14.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "edecd1dd815b93cefbf433c369f4cc02fb2c3c11993c8f66d155acbe90a7068e9208e46dee2324b5ce223b5c2e7593a13a773ab3ba3cffc89ccb312d15ddee5a";
+      sha512 = "a93348f890565262294d0e45c8189b80075519bc631184de4eb5258945fe5542a9412dfc2a1eb4eef97802efce995ed53a3c3b13c5d0784e74ebe5a4aa040695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/is/firefox-64.0b14.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d528fefe33aa41d36339441ff036d86dfb19405881011aa51731149414797c8206a112f824fe3f7a0578955e8a4d462d9c9e79f08dd478170fa3f5029cf12dda";
+      sha512 = "6d9a6561f898689e20105da5ddbc4740e6af53d7f0b3df9c7a91fae241c56e3babdf6c82733249ba4433ede312792643d9da5e291b8c9fb884f3178a2670ffb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/it/firefox-64.0b14.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a2226c02ee56897a5fb47222f03c7f72f6606321b7b82909eea206c37c9842931ecfd203088416bcf0e2b0d2bac7dae5fce2179408225f6ecd9d213635a5f0c6";
+      sha512 = "b1c404d585c245d0df17531587bccdecc8e6d548de149bfc9755539e66a8d74769e12b2af95ccbc0ac062923ee6abb259e9bac5a556c40341e2c64dcb710228d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ja/firefox-64.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3c22833f791b47422fbf6fe937ab4c557b60e1101582b05fd469a350b81cba9f56c0f88a4dc7aebd4a13aeadddcf7f69b001cd8c0c3c9845b2e9207ae118709f";
+      sha512 = "4fc1d401c0ac6e991d038107b73693407f91106ac79cf67926144efbd3921aceba2eaedbf5f7aea395cdefd46c8c275fde651d1f84ef2fec607d23823a1bb271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ka/firefox-64.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "fb6c44387c76cca30dc03c07a50612287cd24f812b8b864998323d8751e65c7db3bcb409c3b399b742980f0dc86311e4b7df88854e471dbda69120b582d60c95";
+      sha512 = "ae14719f16db6c8f247e47cb56ece7a099321566c192b1481f5ed24256bbb2e04c6e944e9754dc9251cc70e41766d88bb25d61ea484afa1dac8992ecfc766d6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kab/firefox-64.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "c8b0ff8ab93496627b2b6ea284699fd436d6afdd26d136e7ec9ad8c5e456d87aea78754ed767b07999e54829668cc47da43319ee37e36366944176dcb5ca8ea4";
+      sha512 = "78c533f5b0ee07b3e984367bb0703ecbdef5218e697ef8a1f03c37e30dd54ed4222479b450e760f0cf079da76cbe58d4784b5dd057e035d29bd56b554d442992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kk/firefox-64.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ce93679ce4886662481f556fa438bb4ae988f4c2179686753be2ed1c176a7066414d3cf034093ce5ba46ba2f2ec68a9ef7e5cdf585c4dcb40ec89a48cdce7b57";
+      sha512 = "b59c5d709944696aee587cd72ea4b38c79ad45ff89e0c0e0fbaa305adc5a47ef4a9556696ff74e833ec73d74b184efd775f21306af5313df3c0473b9a196f6a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/km/firefox-64.0b14.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4dc669e5795a9a426690397773b5146c9424fabfaaff9bc3bcb880c9e862c3eca7856ad7e6d642975cac476fb7645b4613df6a7a5b1431e669c89cc78a05a791";
+      sha512 = "238ef7dadf712f13037f478427fee757a28ab0b3d570d936f416a49b192ec8620275e5a5a5254e8330dea242de6e6ed2e13044f098a03d64706f4600db4a695b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kn/firefox-64.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f65033d3050e27b62db028f95476f8637d8c7ed7437c2da1bb383e32dffd2c4be9bd82e76a3a26572bcedc6379fb4a3c3bb2b977ca690142f7046ca7e95f906f";
+      sha512 = "3a965a435fd652cfb73b7b002561b2ec8e47159c7a239ffa9b316595907c54ca61fe978f57556f35775aab613f134078865b25546cea251708001f30b1d09bc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ko/firefox-64.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "e0bfa42023ef0562f5b4ca7116687f33f403bd2130e0e3deed402f3dd0772da0f8cc15b2f4dfed43fdb9adc0bafd776f920f4bebd9463dfa0ca477ddf5d0f234";
+      sha512 = "5fbb7f5611b2a335c194fa1790eb34cd56c4adfd82f298468853796b485a36c610562b7d883ad953910c80db6d771a21cc1c49c8c723de0f3109be1f0b2c66d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lij/firefox-64.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "36719e381e743eeb034c89cf8361a8bc89c567c726939a6ba0cac29f818e5d0565de1505133ac7a5822859d60a5be53c569bb861b2091c208bfd1602918b5cd2";
+      sha512 = "f957ecb83a0e47538264ec4960c120e6e71aa4d83276e6927605f224074825d4aeaa79fd5086a5f2c0d7cfc822eeed35aa177f565868f7e710a5eeea11f3d4d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lt/firefox-64.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "c40c524bab02c3220c703d3122c37f2748253b059d55427ff88a3a0548efe91af161efd220bbc20bae343ef577f8c97bc9b6257ca19e895bfe014c6cd0edd1d9";
+      sha512 = "2ae0eaf4ef059bda2ecee65327410aa1f0ddd1a825879ca34821c4738fb53b2a9cdccd619aa66ba535965ac10315deadebd8d70f08026138f367751179b328d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lv/firefox-64.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "da660dd435b4b821d3468d6bea3e0d514864e131e91dd5f7fe4a5723e2520c4014dbd52fe5d5f160cdebea2a5f4c6e3c99704fed7b606b929dbb5a6ebaecaa25";
+      sha512 = "ba0e7d68728ba12b435e87cf55b1435dee7a61df4ad114f1b609dfa7aa38b506725c8c492bb1e6b48069102bfc2a6211d996c76c122a7b90f58f67a738c66633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mai/firefox-64.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "f03ecb9a811ba3027d15d849de620668946d7309bbc5ea61df26688afb0a93319c03fc0b04eb91ba97536731f000c40ca2eb5e8aeca95acaee09749e8d61c51b";
+      sha512 = "9ddd2dd8b0d0b109bdd0d552e613a74b1e1716b8ce74951b66c74968c23a679679562f4f06fae90efeb36ac7066b1da7cec2f9937f4bba476b80d412ecf91b3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mk/firefox-64.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "f5addba550f781ed310b87ba8cba6ee2528f655f0c688ebb471e0a5cfa7341670d85df0c0e2885ac0c8d9d71b4ff21ae01cbd36db9c3538199e73a0cc3e697ff";
+      sha512 = "0b1d34e3f27d79f3d46db0698f025d0da5e6f961ab1933b211ba8e468df766339a47d9d8e4a6c643896987078fac5c6b3aad5a605db4c7faea2b3da1c0a84232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ml/firefox-64.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6114ef12f355d862b9f8530ee2b49d266ab07801be3d09846ab6c412465ad11d767490a867d8ce4ca66ff36f94d580375dd5b69ccfda6f68bb60dd85ce1986dd";
+      sha512 = "afa01233b121d94b3695c1fef488a70e55216ebb4c69238905bdf20d5fe594f98cf1a331afaac56514c1a75631fb75781aaece1a77570db9c384b8bcf7a08710";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mr/firefox-64.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "05d320b82a4eab53752d63b461d324882e392b8f2a95c2ef64e149b3ecc03f1f6e7b151f96ec2105f92c45fc92e7f329d5a750ce35f71c5660c78c21a9c03f47";
+      sha512 = "faa143b4a04f0c86d6281ca6ef7fffc99fa468c4a6e14ee39d552fca910c0133682d5ef79a13e82aa2829d5f1cb17afec16582618631c0ec57656d330e2a5596";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ms/firefox-64.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ec6d0251fdc0732f75911694eaafff1b57bd986caf83513b0dda9adc4409d583d2053a99d655daffb3ee8eed1cb6080c743d1ddabe49c133ed55f1a6c9ea58cf";
+      sha512 = "0be2311c606cc2031d63d2eacff2d6a30022e1d65206091dde08f4adcc7fd51cd8d82c2a532db3debe32aa0fcf8355d6ec8b16822b286b3fb81faff44a98d452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/my/firefox-64.0b14.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "e37d41dafc186fe94856542b6640364f48af9e22f04b21d81e0b36013a879049ddf69e3e43e31b7a44661c56afe5306ee93b215d9c93357bb4c13c86852d583e";
+      sha512 = "079fb4cc46e0e89f4b5cf645617f5ca1a6b6f8b5d6dfab305de07870593181cae996472dde9c92be66cd6be06f74ce1f1d2ce8e57cec2ea331de608e83ba33a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nb-NO/firefox-64.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "67c12df46d949b16a496267feba440960fa02305afe3b2b147c8715adec432b9e75c5b93df7e3605c1f9b5f0c24cd6f863445874f7d269a1cb20bfcf12028ee2";
+      sha512 = "f76089d3bf28e96b0c99eec8533119d43beffe697f85c8ce0d70779390ac24ffe1b5d190f58bfc6dcf7cda268e5c4feec825cdab8c72cdd1d8b93853eba23d89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ne-NP/firefox-64.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "c0d76f22b1aaeac6055a9b8954c6ac77b106b7086a67f763f95e036e973b4d2754d78fc1d4d0fbbb9659d881cce0c04d8de5e529c62d5c0b128f2aa696fed791";
+      sha512 = "3ea45dd8243eac66b08e892d2cccafa4e1e6b39f7cb11c04a2af6c77b150d0e0315d16dcc298376208df1526953e1490efae31460ca8a2f77edaef45b12a0dc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nl/firefox-64.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "09d303724b5adc4a7cd1760dbaafc55f32d81ad31ac1e9b91ec4818ff7199a3204f7962fa09c6d4350773610f06d337e201646c04847030592ffd9be2a55e265";
+      sha512 = "cb6c6b3539bcb8e78d2e9d6ced29513c7394c7dc9b66481cde01d54afacdf16f035b5eed3a247cd70104561a429f6dd76925b4a84ed74b8e23e27393631d2629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nn-NO/firefox-64.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "97126166aba2ec50a12f9e9f5383d8f72a90005ec038bc77150252cb8899bee0976e26f8b7a12d38d5a51518b7dd274880a39e8e98a054765bda98f33acb1096";
+      sha512 = "a8fdeab729b27235f11327e217c77568502805961b7999c239f93fa721557cdb61e5a97cd38b2d397cc248c8b93b6aa1fc547a86dba5bc7ed096391e0482ad8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/oc/firefox-64.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "042d63d26a19a6f0796aaf1c16ea14c65d75a99175def2f3fb89b659c358b1dee1250d1495a85d0a0b41d5fd6040e995a55bdc32d0abeeecabb6dc18a16127c8";
+      sha512 = "e1c6951b62508bc9533b485785edaa23dfd5c2dbeba6847ae12b7fab91a46ee49ad348a6aa6a79923f6689c149c203284ee210a97fdbac4c8aed4bf55c932140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/or/firefox-64.0b14.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "029e8313015d35833dcbb7c79937fedde78596fa8257e7bf411bc104692a3b659849cb974810d27d3abd88d674d3cde978bfddeca9cabc567f4a91207afa760b";
+      sha512 = "9bc58b76ff74e3e05ea9fd525670fb3126cd01d84217b2eccfde2c5e6f8e079c9466a1dc121ec39b4b849361b033d122c78ca7babae6ec968b939c2eab0ddbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pa-IN/firefox-64.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c805bca742259579fab0c04b3d692d809723acbaab83c092668212ef584254157ec9522ead6891fd2b69687c7ac95c39374194160e81a11872e3f76acb65b5b0";
+      sha512 = "7a4d6b8937d266463b81694e7e68c332fe443649c8c11ca24d329d95d1dc5b0c3bf4af1f430a953a274ba1e5b008096d7462e502949f8dd2238b3b2a0ec70a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pl/firefox-64.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "91bbb80fcb8f5b7537bc9353db38f54521948a13da4829e973837be29f0710db5f31a55fa075c58f7938ca0f78402e77eed67a96314b5ebb3e5d54a697ef2067";
+      sha512 = "3e20e6322afd239402bc8ed9adc9301f24d9fe58ddc7d5ce98c4a8909af4c0fd5d3af6de9d5a66006a75aff80e1107d016efdfd0a9765dbb32cb2a9dfaa5e8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-BR/firefox-64.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "fb14e2c177b7bba82e2fa5f9aa3039a60b8342c9ea2f74f24af5698b5a1d95c31342d8f3911d89995e9c606ebd4335e36736c470b4563c9c089ea38ef1636db4";
+      sha512 = "5c437f8473a6cd0f195c2c6bf9061fd1805b26f2f41af69b3bf3a49de3c78e4927966ae3a319dff2508b97681c388a44f2d7e07fca316debed978db678c79ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-PT/firefox-64.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "582e2e7c1f85cc827405f1207da4bb000b239d278a33c397af3f4fe5a17dc0d4201ebfb98738b1802aa8c02b6f44b2e6ddd82ca9ab5fe3c08eee99759ee8eae1";
+      sha512 = "fded195a4bec193e7cd0ddb3b75c40cad78bb518b87349d59f8efe548e1b22118bda1a078e2501a06996c981f2576604369d08a1a6457055670a7d3b44e97db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/rm/firefox-64.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8f4452458e39b8f9415541130b8e0ea739f7f60c4c6781d98b3ff2f937563ffb0511428990dcc1db2e70832c54b35394e4380bf8b13e5a4c653a920c46cc4e35";
+      sha512 = "694e50bd6007cb7a7f857e146e266217e94dc447f1ec72ff279e045f7133621dce77a67bbe126d805842bdf47021e43c1e3faa26af930690b7e2309e6449e758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ro/firefox-64.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "db746c0350ddd99c2c30094cb76675a06e648958144b08d31002fd9204541b6522ac06b6954410277c4191d06ea4f8595c8e33b151b25de52f805c16c12c5365";
+      sha512 = "23f4cb17987f66b0bcbd07bb75896c3bf29ace882294b30ad8b6ef61548ea271ed55f005c6ead3d6836e3ce4024d4f77ab1de0627afefcababef0bee94bd7fdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ru/firefox-64.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "772cba5c3beb070a579e765216693bf193eca4ed66a9ae6eabd452f6e8b3b3254a12642111bc2eacb7b65b15df81b61584e3c91220d35000d1c1985ce5e147b5";
+      sha512 = "36b68d824ac8fc64a207ac13801612dab3bd3e2efc364c6dc54381e359edd8e022c79e1b96cbe49937ed71cdf7beccf106942cf55ba311a943be9220914c2a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/si/firefox-64.0b14.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "31514d4c77608e88d1ce0a0505d8cf9774c834724a14feb17377c50c0eb517d4cadf101c25f1ed2a9edeac620d5fb6de1717b37e35322202eb3af2aa37c4672d";
+      sha512 = "e1f486def762c77868c6e2bfe38a3e83919f4a59e0b198f4d8ea04baaedfcfd8e3e87a70c593fd4cec587f15f57379a6ebf99fb80458a7e857c5ad19a58d5f8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sk/firefox-64.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "34c7f9dcb8de54621707f0da0b4e1e3d4fab2792d971fdde4b67e13ad05e458d5aa91249a58c87ae9d9772f8c83d9ebc8a6faa2cb94554c48ab8f4daeef222bc";
+      sha512 = "a8cd34e876cfb491259a7ca1419a51a7ff2929defc94d16d6d582c3938be83fa30b46ec482bdea6e4589143cd7889da3b85550c2872e5fa0ce09f909ae8c62d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sl/firefox-64.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "e8c4edeccd8fd9aa61e148b430d882aa30d560995b65500e03e5be64fa24f008fb8a0b65c271161326127f1ce748da155cba54a507692877ec4035036c183fe3";
+      sha512 = "558d671ab59316383760919ab673475e578e8a8a3ae0bc4c37282b3064371b8a048f5c631e64589f24f360eeca49a6a326274b45f55947ae2972e01f330efc30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/son/firefox-64.0b14.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "2f9ec511eaf8ab90de5ab2e945f0dc798c51297b9f8fd766c73860e74d7d18f1e6d6cefb2e01e060bbc103c59adb38c6af8d0ab34806fc5ceafd5907c09af322";
+      sha512 = "8983fcf775fb1d7c975a56eccc7f821c0c9e2f4d689c601b21a748e898baaeeb46166561e368676d966f9bf8d78d89a896040ed0d5914248fdfafd1c64bc09de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sq/firefox-64.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4b967cb914f450bd48349100e925248d39b7fc9f86b6ba339805e1707cee0d5b181ddfd40089f6ef64a8e3619bd47605b07b96178037bd12f0f43e447f979df4";
+      sha512 = "db12d81b9ec8f7f412496d1995acf28295d8d49069d2a7f982fc6a82de39550d9cdaaa005431a8ca5608df2c530d6596341567793435a0efb5854038b0532d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sr/firefox-64.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0aa75350e7b7356e0bfbf70547cb177175bdded6f56d8eb1313474f8e2888f5c16b29fcd74ccd03f14158f21f1f9d1acf48df4b9a206bba1ed511a0a872cfb05";
+      sha512 = "c6e2b768d08623232740fe8bfc77a2bba47e415450020e0367be83629308aeb85fe9235b5e32716721b91153ba527d03d3592df9da91d6b386ff808758631244";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sv-SE/firefox-64.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d1d6105972409f9dd3cc1ee126c592684dac0eaffe5ce15f34252608dd940aee37734717d25801df2c9b8c9fc979075619349c3399a5cf96618f6144928a154d";
+      sha512 = "202d503eeefc8e8026607fd2079c7231c4a7eaf097acac6bc1066262f05557c002a2e0da191e6bd92832baed6ae1095e04407395e9dcbb7c7b51fd204680d653";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ta/firefox-64.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "8e8487396ebd36ac42cf773544869379bf510eff530f893737cbffe248eebf132d7782904ec7ac02a1b65379c14f886d953a031f6f6e1b0728e4c5e37cdd9e84";
+      sha512 = "bc6d40ec162b760b527795aa3ed79937abecdae0cb9489b886c184a3fde732afe2ff743cf56db5d70d2d87fa7038065583811a2e6d7ff7e2de884b7d4adb463e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/te/firefox-64.0b14.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f33333903d4fe5d49ba26b67f06edfcd2faf533b833d68b3488cefefe6045304400f905e7167a153b072f624f8ff36cf4627a4fd8e76a5cebe6772f819081d1d";
+      sha512 = "f03e0e987effc10ca3fae20fa0be07ec21a8d3ad0feff77c4d2ff0a44cd048cde44e27f33fafc28fffe771c3a0582162bf7cb9704099ff3738922210e6066ade";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/th/firefox-64.0b14.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ab05599f0426eea4a86c8998f884073a835d81a85c4cb68847714c463ea5dfe68942e4a4086cdbc1140d02b3f3801784bce05f319721df1c79079e85eb7ab4e4";
+      sha512 = "8fe21c9e494dc1f5ae38ca950b178d005a8adbb0fce84b80d0d427d544513b15bc41cd901fd7cdbfd816a3b716c261d81f034516bb354402ab8fe03adc963aff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/tr/firefox-64.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "27adf56f2306125bf5d1fee5759066668f87766dbab9c64cf882427aeae2d7294aa42f72c456177f4c5fc5fdcce8854ea386d60014bf2e32c65a84150672318e";
+      sha512 = "3d1bf804ac3bd65d8ab36817a03e0d51f6a439e7ec37e18a6e4bbb8f690b44c3c3c6acc88d0a2bfea5586ccf78bbec89811d7d38bed381b272546b12f2442838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uk/firefox-64.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b224cc1c6edcf61ba52e3ee3cc87b8a069e7a2761ae0f0157b97db7db0486114ddf994f55e6548da81ff35533f66fd91ef117d1f2edd8460190274966178f886";
+      sha512 = "b0c14a7e9ab36a5428e842370ce04c3856c7845924e42e604bba4d426b5b8ec2bbbd8ccb88f96030cd1971eafa1c40666f424122250d05f88026f2336b8f8f04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ur/firefox-64.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "86df507c3ff62a3912c037ffc45729cf7836e6735e30568f55f0f7d00c1c1a0cdfd41536705a74bfd8cd06c9cf9f3d2fbd8cc2019f0204d1f7e04015392d4016";
+      sha512 = "cc7a5cc3ad79dd76a50a5373dad37209f8c574bd459eadbafadb327037c6335e1b6bf28fb9aed93d29a76a00f12e5d22747c45091eca5a9ebd451c8d24d6c16a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uz/firefox-64.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d8a1195868fe5ad8c73304b92b854ead1dd51621a618abb4c42391fd4ae0cf7205d5caa490279e7dd86f5c2f8802eefd79aa2373b47fd16ed06f797bb8e4fda4";
+      sha512 = "9f263397c4bd072935d4d484d238082f3779cc83a59bd01d2810c635d994749ff55722dafa718286456af2fd2b4b1f02622c9ded919b850aa6c6bf46913371cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/vi/firefox-64.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c5e4f110d96386edc7cdc2252c10f3f24826763fae7a35d0ff0d803033c7e2384ed6fd3b1c3dab722c22927f1869e7fb87d82cd60abe920a1e9212a43a64f2ae";
+      sha512 = "149422236d100f5ffe064070047cfb4a6716630d75d72d31a420970002194ba883581b9793d5b16699d0e2dee1105ea849d76f0dce5b086ac606068feeaed0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/xh/firefox-64.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "908741b67bfef70bcaec20b76cb393e8497ecd6bb82f8302919df99cadc189fb665bff31388f81aa876927161dc753c63abfb63613e79a10065913e6762f3e97";
+      sha512 = "cb96bf8137975343245e00662590b558d66f01aad33522932c18306ef339ddd4dc2334be9a57f14331fe6dadb9a5ae06473ac3875f515163bead1b69bd03b6ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-CN/firefox-64.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "7ce0fb5fd6622c1a03ae2faf3f84fd56abc65beda43cef0d8d5d4889cda831ec3dd54566f383705625637b7d93b1684b6e6b6fbf345467fa44e3d690d118299d";
+      sha512 = "33e4c94fefb32dde1b80740bb7304a4da916964466f23de19a32f447be02300f9c97b6dd5709bc469773bc7680c3a8e88f39553ccef838b439b6e5b25850e0d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-TW/firefox-64.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3308bd7a442a84392bad111c3c8903b110b901075991774a9593d5a6a37e4fd805406e27a3bd5e39686fe348bd079a17aa063894f55912033ed75bdd64316ab8";
+      sha512 = "6d8deca1cc1f542d5de5137bcd6c10f7d1e70adfc67be286744224bcce3f0c1f76a9e6310c94c23842d952568293746888945c0fa89552b0550a3527b1d4067c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ach/firefox-64.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "18ac2cd8ca4c630aa80fa3b4c473fd2c7d20e9002cb40bdabc29a73fce7e5da6c4b5c5c3912efa067780b46e264a23aa39da466296741a942c1cc74fc3758fe9";
+      sha512 = "217d749356819fb06ca2208af220e176b0cd9552e9c3b540939df7f39e429121e4b3f48617fda16b9ddd4f8bfd48d88f215fc9556ed95d5191bed0b681d1cf23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/af/firefox-64.0b14.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2befe913a134bad225ab7dad76cc6202ee8184b271434636176ab3ed057db17481ed7ac925e48aa24509ae57e7fcdd176c187d55e4949ab5bd038e502f32e9ab";
+      sha512 = "a2032bf0c3eed7d6525a0e3b3cda01797334b345732f69c4689a3e39261a53c83512d822fd55086e6df88f216e158603842f6cd7225485a993d8645d780bf10a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/an/firefox-64.0b14.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "31af4d6a84c601fbf31f0e52d9eb7f68ab666de129f3a8c1b2d3a54e7061b159cdae09e6da54942fcded87abd2f5c41ea003563d0d657761cb9078446e138c36";
+      sha512 = "c25b2d0ced9bb95453581027f478d928ec343561a4c16f49d0f95e8e3194034c4e220f4c418f23f1e107e3f271314753b92d133073310c5c95586aec61c81850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ar/firefox-64.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3a62ec619dd5a8e041a443665188edeade532a2ecb0b5d78cfead8c4a0a4609de241701cea184453fdb58d295a0460b55009e94b6e01eb0f4d538da15bde8ba5";
+      sha512 = "955146bea4ecde03b4b27290c54f5a633de09ec882bb2a2ffd8fb675a31b51b5a448be66d170f4f3795896f1eb3ec9e54ebdf6f5872aec7170f57c4210b58871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/as/firefox-64.0b14.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "801beb19f6df2528996bd399607ae86ea3b31e8b11584d33cc7437857b5f77caa442c4ef26834839d4b99a0ee2b7ad1f33d43561f71879cf501823e5f0f6a9fa";
+      sha512 = "85b77a481fc7a82bb1b192176928e4095db19e03c19bbe64da4e07f1498620a6e31db44074b39dfa4f77641f7a74fa98669421f82c2c6bec053878c17c8390f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ast/firefox-64.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "29f3dd7b31f647e9b4ea4ca32b8c2a263816f929675e71ff995c8fb979fd079b5b42e71bebfc66e6470e0f5d029b90aee0c78c7a86d8825f411330624acf87b5";
+      sha512 = "48f56f503a0b036c4575a166a4c181d61d70d88ba6c2bfd984b0f5e392df175bf95d9eac93fde657ef1157a0ae0e727dfefc446a38a577a395c7a685e1aa09b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/az/firefox-64.0b14.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "97228f40fb86942a9870ff1c705dd70921f847a9b72db2f8c44738221dda1cade35d5fadc5f826169eba35c062e78dd7fe1aef02c9ae620c60a1366f6948b990";
+      sha512 = "07bce90b9ae3bbb45a93aff4cf9b645d4a700eec311463aa84cb0b08cffd2ae7b293f94b57c8f098ace91a5a949b1fabdd048d68829db16ea69f6e23b027eeed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/be/firefox-64.0b14.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "84ce6814ed7286bc616d6a225f3818584dd6a021c741bf3ee93b319b1367389ff893ebfb9f19d06c59131403fc6ce33e546257f0023ae3265189d984b5774c17";
+      sha512 = "800de070b9e722ba07831d86aab41c9fb3ed9377e796770887b71cdfb9eda9165ac752525bfdc5b7af28cd6b316863268820773741662dbc6287e5a3727e2407";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bg/firefox-64.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "fd075c08eccf7847a1d9b00a3d721e13a75b5387c5be8582a222c72bc7eeafe3b5972534c0ce15f14f5fd5158dcb7c22835b310d8ba64a69954ecba64dca3802";
+      sha512 = "804b72fa923fcdb6dbd5c4ce819557d71469ee797bef48fb6d51df150fe79b6d4f20612b7c2d69277facbb4164592028cbd514fa9e63ba00bbf4be4a3fe733a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-BD/firefox-64.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fcdb381d2b6d175f250144db7a13a682bf3589825a5157693f929801414b6e0e932d94caff9492e34da029b8589703913ae3a6e65175d5e1f0bab143663c72ae";
+      sha512 = "8ad135f5b98d792b7250c2dbb9d8616a3e2454f6cffa5850ba8ab7f8b1f1d2041fcce39e45333e8e6d08371da39dde3a8221cad6217e3264e1d32bdb7a7ce73f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-IN/firefox-64.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "c7379dd8549a83ff3cf67c2493ee7386aa90858f2169ce58727c6276ea113e7df9c9cc499bdb56b381e193f8fadbd23eb35f786153db0ff89f9bbf8f4408fe29";
+      sha512 = "c9cf90d40dc319df43f681bd7583681548924aa04e963c1c4d6f6128db7c9402810d3747e223ec4f6e3589e2ea6cb913329b238d15d4d9771b8efec6635cefc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/br/firefox-64.0b14.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "66a04d15ef3a77fabe4ba0e51c601315057377517b1428dace9036f0f7e4691bdf7e9ff7784065bcd6f5508bccc03eaa9181069f5b8f726e3d4937d1812d3eb0";
+      sha512 = "9ad73b35d93aa81732f35478da526be05e6c9f66773010b718f88cfa80817f0f3ff8d537a864a9c01cb197c2c780d604d82458ed982e1089febd85042a11ebc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bs/firefox-64.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "d7f0d44131ef2dba579067ead466b43b50ec3ed627c4d6fcadca1d9de93f754ee1bfc838bc7eaec90b2e4a9d08a4a057257e676e9de3699b4b6b8999b1fa375c";
+      sha512 = "10cb7314d0a56fc4c2b0bc7197c71c99f1693adabea53da6a1d1bc7abd17ab6d91a983030017a8cc09c759eb5d678efa4ca0dc8388b2c4c8e84ea52a0b849c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ca/firefox-64.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "43e52f7581535f86df2730e1aa4c3489a0842addf1c40c8f168913c1f5e6fae7713d24aea0a1d8dc7aa5afa7eeb9e5ae8701744861d715ad002ffc76c26c07df";
+      sha512 = "efcd45c51970dc198e1019410601b8788f0071f0b98d5d341fd6e9bf2733c2ddd84e9f29cb3d3239acc691e0f7d549f0714ab9fcf4dbba8d0f5a288075d65bb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cak/firefox-64.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "efa9b4744c1a3507e528d8a960d807df7c14b7cf7ed79e6d237897d7bb2d72305c0f147bdb5690468ff7ddda1cf56ee25d0aaf07b5cc7432e0e6d079f18e164b";
+      sha512 = "d33062aab7ecd8975539c1188c796f23ff045a27e3f357ccd747dfc6bbec50e79bc94f5c9bd2660e86d083259f69268397b405262e106b16956f9eedd73db106";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cs/firefox-64.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "0539e29a711894942d2732e5ec667101ac66f4a847cbcdd0155de776614882a0e41ac94df73ee8b85bc9b57dc6aa98650537d57115fbce7f95ebd4a6965e990c";
+      sha512 = "e3e5ebeba62b199c667b99abc3c06073603addd7ab76e0dbe1822d8b9c55aae69bf1f6dd6971190b52073cfbbaf66bcf01dfe5b9dcd13feaf96e5d0681aa240c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cy/firefox-64.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "72b69630ff274ede07fe09ea6bf09b85fbb5cc93dc3dcaa891cf9436d665f98634036397a67f7448aedfa1053018536e706c74ccdd35c523fbac8d47c16edfcf";
+      sha512 = "b1f9d3b0e9c004d8612fb3c852151c3384631f439432a766c01c1ea595095b154429ee6bb7881d3fdad0faf99674d81127be57ebb17bae1922b2d4de9f0dc699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/da/firefox-64.0b14.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e70f4d9dbf404638a83e1e07aa5fd815b54577291bee161093cff772c6227e54afa76e031711aa1c36dd7b13052c976d3ee69785c84084d00e2f9f9558b3199b";
+      sha512 = "8f56d6653eb56d3f32f74c04d58014126899d3a5349f7a6c56d015aab71cac523f4f3261fc21ae0a7645a99a83e9b55198391d2606c7b8a70e2b0d3fe58d1e08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/de/firefox-64.0b14.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "9ea87bad16b995f3e262df85d5fa321cf5f00484eea66dd92e77b79c6872ed2d496fca277be5afb937e35f98d72e71452f43cd7c27f28b27fe427b48ba014cc4";
+      sha512 = "c0b472e2080a24c5c35efff86adbb91dc5bdc89fc2c93804ec9ba35846d3d18d85022c7c2a0a0e405a14561fb635063149a4195928d1486ed8880a29c05e9904";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/dsb/firefox-64.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e30ab23fcd411ebeb62a86de32055d24ff683a3c5f4977ae4d23e312ab9a2f1b7f339e0f23732688674dbacb49c498f6a75352a4bed74ce677c55c1e495ed0d5";
+      sha512 = "fe5a95eb0c311c3131126ee92c4fc8f4e547b87871b6cf736c986a366bca60a85e5b6f593931725761417fa13d9edc275430ae1e73add67eee23fe0ff2750933";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/el/firefox-64.0b14.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a06fcc2bc07fb904a4a18e393001b0f204fc1a6a254def69eedd96b68ddab0f2a51863c78468e69dc534ac4948620ea8d643d14b2ca88ad68f0f367113a5b447";
+      sha512 = "c2d34ca92cd36fe745ca66d803569a26752e4f834dea0d07b0fea24365286a2f215c25fff6833be4f0fbe6fd89313693080fece2a1490d99b08ac85f76407e53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-CA/firefox-64.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "e1b1abd09668bd0865b5c802f748867a8fb26e0789710a636167731b97fcdc9b5490ceff11ce1968672abbfe315da473f7bea187799fb6c4e627d4a39fd1b7e4";
+      sha512 = "85b3d450ba292c2cc669af1d9f27821b96f0d13ad9d59fec2bd685bfc5bbf02489970337b51653108f64aa164182fdc670624a36eb07e55e8a7eafa6f16e1071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-GB/firefox-64.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b5dbc47b11fe634a5a53610fa0d45b975bcf3f7fcf8d7d7a739a1fb432647ee3da7b3b2d31c6eb1129e95ba6f5c7a42043c269405002b8507a8ff21743224db4";
+      sha512 = "bcd36733e157ae4e5c8580fd9deeb4e5d37084db4e7a4539ff2cdc7532bce95dfd26b4810c098d22ba89ae107f62272625a9702399ac2678c461efd7825142ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-US/firefox-64.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "df29871a2b3d44680781c8fd1436f92fe983e57d63c3952aa2ef67946165ae2ec55862c16678fa80e3edffffd604a9aa56c318deb9ab758d5d396802b762ca76";
+      sha512 = "5bf5c1cdd79d6bffd7137bc19ed0fd4ed91d4c9263e1d50c128fc06def9021cf9df67fa2f3b591a512189d7a0af98e85078b69382928417dc17881edddb11985";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-ZA/firefox-64.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "a7e97961d8900024fc546329e328cb01187407362186ca7b0285aa45ed8c201ead6bafcd3eb4576f2afdb97ab8204786723823830b3d889a889a377fd89f0e4c";
+      sha512 = "b39a6b3b404997a2379cabe03ce8c62ad0ab85dc48bb6ef76541fe3b91b0e51996ef02ec0c84d0f418814bf216344283cdb0a5f5ff7a6b554a69fb36bff02b69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eo/firefox-64.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "4a9b84fdc1962dd7de8878d6fe69f7eb541e61ce19522735f7a9cfaa07682d9ce4e85d7afc21258164b6687b2f99b232a6c8aeb4eb801cd136d49702458fc263";
+      sha512 = "50a61fe7e83bd540233773f9ba2684f4a9da9dd5ebd8a34dd05f1f56df7b442494263d83ac8114dfcf0d169548c02dfad9c3df5e05082718eb9ecd645fcd5e2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-AR/firefox-64.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "0e5d63725b14fa54fdc3303d94e23ad22fa0b705bd76a625652aac62e51038b4e0e24374b619c85d9b22ebede4a21bb42ad8085641dbb2a0bffbe58f62891a86";
+      sha512 = "352493a6c32f7108239f56cb6ff49e21d06a2c9dabace1ac11032023822b6b6ef7b38c1d9b1c7cd4832d2b120b60020608b51c286ee8d12757153fcc134aea0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-CL/firefox-64.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7973b9defe83a8af0b34085edb76ca4fbfcf82c22180aacbecede0fc6c19ad78cf45ae85f2621204b95cc5040240a287812001f22d3d3d199abb5759baebf65f";
+      sha512 = "093e218a562c96b54eed599dbed1aa41c2c396f5bba58e87888dfffae5a11084eaa6d8fdcb58c8f128346234d1df78241c0f6ae741b93e3f91a4c27481227b8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-ES/firefox-64.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8be4155ee76c366b8505133117dd3fc6c1cd19441d336b2541d9e118adb555d75dc63192f03f24ece93e007239b4a367199af1fd239dffa092637971817b4533";
+      sha512 = "60f46eb602026ed148e3b9d7728c9ed750e1e650e7d048b8dd4b4310ea1dcdf5d5b9b497d0a6719cfbbc8e390107d10836919ddd09cf4ee1fa156a841cc17424";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-MX/firefox-64.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b24773ebf3a61ccd304936269bf5e0ff84a0e3730d72f30efc068709c5282b3eb5a5405b0e690ad08f113433a32dac45cd0a2867f818225c99d69270e9fd036c";
+      sha512 = "05880045040e12908f563fc7b6e0b093ebd0452ad780e166f897a36caf38438d45844d784291720d6cb341adb7c983d2077f9327b433e05f1bb737d200fdad32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/et/firefox-64.0b14.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3767557a7e7e7452ed9703a9916d568a01e6e540b85e698dce5c7c8bdd238f495ce3001f9b81bfa7587f1ea35e4631de238c9153687cc9f745a6676d72e7a6b8";
+      sha512 = "4013943318b6d50be6a2f0f77bc5843915ac2d45ebf230fd69d005df4360b3e6e15b99212d32b7f48f250f6294f48604c57b325107b9e39c4934af325c21c4cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eu/firefox-64.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "55ea423b5127d1217c5b006f9e2f1e4b0cccf133c10be88d8058ce30bac1fe6fca49792924a0a3e0c0b601ac1c9c42d7c7cc0d73eca9624380cd733421572e24";
+      sha512 = "05cb185b8de02664e16170686d59fe32c55415002c9c75631ea1d105cbe6e7a2d144aef5d185948a051ef1841f7dddb7ba093d559421a49e0b458659009d1495";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fa/firefox-64.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "acc15a2dc4569a3d185a53fa70aa617320ff799a1f2dc9117d6c683385aac4d38232b3a6764cfe7af358095acd2c3392cab841b6c4d9df3e40a591de78b4523a";
+      sha512 = "78dff03e7719da65e6b96deb2ef9890bca4d79f8937fd012805876dea8ff3f66d9613bd805587fb5057f0bc2bb310933748484a7bde28ff4d1fc7f8982f20867";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ff/firefox-64.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b4bd8fb4f6124a4d669044be697d54867e172f13f589fb93c3369f57827d1e3ac2c3e82ae943babccde27cac9781b3c7d17b2315f2485b269553aacb293c8b17";
+      sha512 = "28b3e96c1ea34f3fe07c60442d3808698f9950ff818fea8a05a4b0298caf8195b602d6860837e91ec0a1129d389184ab0e2b577811b9c4e5d9b0c734c7cbe14e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fi/firefox-64.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "b7718b4ffe415b9ad394920dfb1f5fd63369aa77b94eba8d3e30ec15c38cf968869a84628aaebde70b3645fff387476ebb0b3ca1f55d304329b26256f4dea50f";
+      sha512 = "98825f294ad8a3c1eb8488e5600c1fa2b6b471b7a305b434775c07b8fd267656c160fa7c8d5f73c847f48714d1d5ebf108fae57e14ecff10ed7cca5cb5825c8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fr/firefox-64.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2f8b421c7d8ad9d56bf95e433f7062ea8565f08c7eb573c8ffe55615a4de2ee405035c1eada3bb6d0ab104c80869bbddc74a9930d7a890d2942c8b6f792325e6";
+      sha512 = "889f5fc32f9e547c602011d9d5d0af411b8ed6e98830293003d28bd397aacbc1f5d61ac30e171b379c311371a6dac1dc9df3ae27c671f303d15cbd52e5363498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fy-NL/firefox-64.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b3afff8338fdc2a93b3c3a848ddcb8ae2daf69954c577014d90bdf59255cec51deded49337ec5f44dab7d727364b4b58a1dc6b42bc50b8105d19123702646abe";
+      sha512 = "5d038c764a8eb3f07be729dc1adb5f84dd7a94d8f84521f42ee4192f5f432eb1e181871ef7be3acdbb9f158bb605eb3d99f2f788c876c6441811064672ca82eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ga-IE/firefox-64.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "8a67d8e7fc0b1a5463f460858aae93b3837a8005f80c2bf63bc209e610d153dc4eaa849c1f41394a79334d38d9f028b4e1fc0b91780bab9b7552ea4a32bcbb36";
+      sha512 = "01ab65cf6c3976aa305ade2ce5e04f5ff159289d2d808142e8dbbe537659de1d25a4da9cbafc6be839a50a63cffa6e8f3d2fd2d29feac8bfe5173ff42ddc8e9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gd/firefox-64.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "dd5824ab3d5934c3dba7d9ac98e0b9142a13b11f78d6530250fa0556b6e2fa2c4cd8df8519b245c8b2e50e74b67c8e983864aca8510a665b331d352f2ac6e623";
+      sha512 = "23f4dca508152ba7fd6b13dc20409d6b14c714fd8860ddeb66ed94b88ccd48f0b64d839a6ce852c974bbd3f142758fed42aaa817abac23bd58854e7f2c07c8bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gl/firefox-64.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "765241eb0ae051adcfa6624c9a68f2546856c981125d6a3dd789b5fc391d55059af5b1e46b196cd7e536aee67878d63ed6a4afb86cdfa1d4d7352e901ba8f63c";
+      sha512 = "ec7372f3fdd0e26f93d2251be0ded3b821dcf5927b6fc5a7a4b433d26f6900c775980b379a67a4414ba537443ce93523c2b6dec699401efcae0ab9c5d8e8bf90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gn/firefox-64.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "3b006caecfcafe9bfeafc2012b89326e219bf95a123aaaa4f3daeda2090754d6d33c8c7ff0f975042ac1ccd11737274e1f0582d4183bcb2ddc974355017ae1f4";
+      sha512 = "4f3057757e35632ee9b108310df950b0279ca9f47562416e955112f484caf8314a80c8296c39dec71a6d7a10aac13160898b662b2528c08cee8e497803ca5bd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gu-IN/firefox-64.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "fddeadb90c65301992851150e778ac57fa2c2466acd88ca6fbdd13f92c31eade24d4298dd19e75f7a381a435d4af77ab994ab3455f755f95dfc9ce6dcdfb478c";
+      sha512 = "4e1cb8376b86e68ebcffc42bf8b30cd78803df0e041371820db59de7eaeff8f982ff1222db88dc6f8c70f0dd2ed3491a9879c10d89ee1e4b98e9a266da538ba1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/he/firefox-64.0b14.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "88fbf1913ff9691593802d957b8b4477d66054f5c6e946f1384e7938d4e278c08a10a8b276e414a97fc95884667407528603424ac216242f59d55b3192541060";
+      sha512 = "7b617bb361bc9eadb83ee7b86e256dc0168014dc59e425effb9a2bbb765690a7ba0a2e89341f1d80ab86cd167b9a6f983ea963f06002d138dc9789445abcd79d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hi-IN/firefox-64.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "c7468faebc10827e741427658b6bad7e362ce3db6870bf262c52e715b0bdd58f797dd4f7d445d4e6f01ded022e0b352de4d0c81393e561247e6e37c972e4b60e";
+      sha512 = "b42be8e9b1a9271cd445cb7c939450ac92e7ce298e819d848c19af36c0fb0188aa86ccbd63acdd5499485ff543eee8c125515105f3ac46523112710aefc245b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hr/firefox-64.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "58417ccdb0885b74be71734d4dfaafedb024f15d11533840b0a50222c31f0e3029be6e154ae652f12691e6e05784c7fcf423fd8c89bb2e43db8cfd17791c4f7e";
+      sha512 = "51952b6eae0cb140653bac6130ad04f56d9e4325b872f3ae3bbe95fd7f151f58b3c67db294a1fb4919b8b184043c474bffd686208b7095ccfb7fa1574ab769c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hsb/firefox-64.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b1103601e66b63ba0ab01daae4f97fe8f5e69557f01728d0071802074b8eb2f91afba848139c0f8268bfc7fef627d3ef819b01900d377d7a7f1ae85e7d754bb1";
+      sha512 = "a2d414c1a227b5958571857ccd63a1a4c4a9bdb7fe73416c5040af71add3d8241d6edaf4529789961d170803463ac24c10e80da75352f8a1df77a47cf538fa8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hu/firefox-64.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "c1b30805a91e046cb606c5c51551f9b074b01fb03a822386d80c9c2dd5ffa468f755ca57baccb540e17125ae3a1d99e66d7dced48b739fdcc3626043876bb9fd";
+      sha512 = "eea04e03d76172c840e1c41bef9a3052337e22e98077db17be869aa7f825acbff5851411ff83d38a16d2d44b445ed0ed708ee967cd1f33d2ebe45b4e50ba71a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hy-AM/firefox-64.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "af29a30a9ac60fd744971e5a659b1fe9595b40be0f2427660ce9bcf6b504c11449410ed11c33eb750fc2397c1207d0b083cd0e448b0e068ebe9f5484c13415cb";
+      sha512 = "de09a05251e51d66aed8855779977c9b1173bd69e43744af6e36c5a24042c063e0d9a46c80080e19c37027df9603767d21fed2da90363d029388f675f06a041b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ia/firefox-64.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "9fd96091f9eda42525842c324a8977ad7d5ad5c50e52503f50719db6e4120ac2054e316b700d3c4578ac2e86b5258e6c54c7ed97504dd481b8fe83595e78257c";
+      sha512 = "0dcb346cfd2cbfa7f56e787eec952ed24e4621d0f265324c445423638239d954b60a82f7581f2f0afa913d7932577f16817795235efc9f8aac929e7c289e7ef6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/id/firefox-64.0b14.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2ccf109f956c82485b5dc3d93cbf11bbce8b4444c9c3cf823daa5510979c8ff10928d530422fa5e94f82903d464385ad1aeda67ccb675bc0234767d4cc4807e9";
+      sha512 = "1ef2790d719d4ffd3bd9a7b8aa5202fdf3e380e7d040503890f74f29eda74405bd19c88e0440db399852330d168323ca94766b0409d33af25f6d42018531e072";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/is/firefox-64.0b14.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "2bf59ce3fc5cff4b4e8d20d8f7ae83f4f12b1fffe891a737a21c1cb705e4b29d6cfde667716b10d665f7cfe04c2dc579977098edce6a2f321ff1c083bf94148e";
+      sha512 = "0e32f06993b335588ed8a27869b6b12daeaf79c2606d329ad8df94fa54abe425c694d7c7c48168123bf1bd561648654a26b8c308e50e882de328ba281d764acb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/it/firefox-64.0b14.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "52ee298ac6fd29ee68b0aa809253b7f35a583b305ba0effd03e4eb0e8087aff9614ccaf050b664bb0c136c196b7373b8f9507317c70df412bf9324bfd3845e1d";
+      sha512 = "632a2de491d1d791498c0ff1282151d42259bfa808c6fb3c05fbb8454e8e256a6b42cc4bbc4d9999b8d2303880110168be2adb872cc9c4dffd95445288b98d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ja/firefox-64.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "84a343da647255f25dec77be6225a47e5b129875e108a9ec41ac14fe4a006c6e1653114454595c5327f3c088073f44abb761b27abbb744bfc4163fd3208c827f";
+      sha512 = "c23a99e8f1b8b895402100c00409f5ee0ea602f69c998d0d05a8358223303d9f20e33e7894b54de30ee9395ce1e484526cbbdc1e9ddc99e23902833abbe91a22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ka/firefox-64.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9d110814322e9fc20026af9c9954ce76c9a2d782d64874f63ea46034660cc86fc5ec0789e4c2508fb729704623043e0a0c05e755faa9c62f7bad2ae3501936fc";
+      sha512 = "e6d6b1b9e5e44b002ffa7cf55cccf47cfe79d3056305443e891dec87e471b6be8f2bc4cb5c13d739f40ec9284588e62347c4c4a2e5b49839a4547aca2faf8a56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kab/firefox-64.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ec9d23bf953f1f3c0bcec9fa1059aa7d08ed51a781c1983fe71811a4b56e4727248941675745e7b83eef6a84de36d93068f0c574ff1d3e42d39a02b3415b5699";
+      sha512 = "b84b2505624f5356a6544ddd8279b6a77483a8d0574406b1e0f17b136895674b311fb57fd7025a0e1b2ee53577d57bb45b0f02ffb94ec1cedd3c93298589e7d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kk/firefox-64.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "c284fd70d033383e77faeb03afa658c0bc1be03e56b5b5d29db1bac6ec95c48d5150b17124cfefcd7a5ec04c016e68571c7d5624b89a58b185cab5c8cab9c1bf";
+      sha512 = "82732dbfc100ffc987fba5a721d7ba2c04bde1a750e1966bf6579fb9e1e9d23f00ba5ec239b6af3198fa8f8f1dc8b7cd6fb80598b24e54ec2aee1ba488858077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/km/firefox-64.0b14.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "fb838bf6f694ed93bdaef8a55f905daeec4ebdd7bbb57c133641ec017ed155b53452b6045dce7961283022605345a26f76e5e48f3b75bd056c2a69cf3662d741";
+      sha512 = "8deddc2f4559506870bcf4e5c26b7de898b48cc2544469df92ca3f617f5d8ddf86e9f9e7a77fdb9727fe5e5e166ef2257dd70c7d10105bce59734a4289b927c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kn/firefox-64.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a14ddd39b083eff5530badfb709dc32c9b5690372ccf88f333ccf9e0f67c1e73fe5182d580423e4f6d8a10356221ca34888605b0445ab494e2933dc259a4580f";
+      sha512 = "4d0e809945c3b5a874b72343be82484b99a10aaba0d70b85dffb3e6d7e3ebf6b8304b6b4dab648bf48c5c11722138e2275744295b86e4e1c2af07fad05b6960a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ko/firefox-64.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "b87aa42c208a3c71f874a0ab9e67e5b65b75749246f474efd9e5ed0f44873055810dec07c7674c69d197c5cd98c01ccf9af1d20c79563abb7415fd0e62b86d04";
+      sha512 = "eea6b2534ed9a368abd8dad636ea3b0d4298a9262795d694bc20c27136b325653113d077b57d361213395e916c29522daa5c8e0e8c9d151ef2243215ef97fd88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lij/firefox-64.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "0ca6688930361db90025a32b197f1f243bfd9c5e2231ac899f2ffd24278d6254fa498af67d4fcd11caf3422af814f5cf71897ff7bca885722e74bf2ffbaedb88";
+      sha512 = "bd941e32b3517a599c7f5bac36f8a9feffbdbf93bcfcaf776d84ea9d5f0408a3973431e1b9b6feded677b48ac4af26e6b888800e5acface9da7c6cd37fd250bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lt/firefox-64.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ce71aa99ba12d9ed490e7241b4350cb7a4f0e6ae9275306f5362fab4ac51a2fb1d7cf42feff1a2c682f6ed8b1845fbcaee5194f487b4912720c27e43546e7c1f";
+      sha512 = "efc4cdc50cda00b35d1f69033f76f1a9c0d4c530a08675c041423a8d0b4d5d24f3185a9d63cad594a5df6b7bde750cfa2fc13b9f7847944aa5243cc7b55f6d11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lv/firefox-64.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "bb5988a33aff18e4e050be8113b143158390b28e4bb7cbabc4b9e806644bf42bc7a5f0f5174bb9aaa6c46756fe04ee0a2aa402f33e2403fcc3e6601cf31d0abb";
+      sha512 = "8ad8ac07fa756b649a334f06f9795c3577e3e9128ca66b00541bc440711027d4ec8572eda71a0eaad38696e59031d3f23714f6372fe22e8ad38fb4029b322b28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mai/firefox-64.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "0541f86fce20e6bf565b84acd5bed5d954d1de412f0f584cf40ac2ba84b827fef95f7f055b3cb1a7cce824f5eeac3a905368c3c1f1d33202e091e7edb3537b14";
+      sha512 = "8627f3afd45555cd254c571070bf5100a25770c306f63f091fe61501fa0eb6e37e7ccb5bd3b9378bc494ae6025d39c45ab6dbd20cf5f7d744eff8b3ac02e724d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mk/firefox-64.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6138dcf84a21235861750e0d615862581e205bbea71d61861dbb17fd74c0e61d6bd9f223acfcb8eb623864cbfa800062293cae68748a320db143e1f509f54b41";
+      sha512 = "800cef931052b49ffe875464ec8756e96785d9d122aaf3b2dcc9397fcf524ed0375cd9cdc67681b99439e23556b0150b14bb02a5e9d7cbb6f3a806674b904030";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ml/firefox-64.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "4befe6de671de14fbac4ebee28018cea0402a0931bc3140f89b2dfccfb23de0d106f6236670730df9460ced8056cdd234c401b7a8a37d6fe6e70c9c61eb4094c";
+      sha512 = "ce8f90f83923cdfd0ed7cfcb63f4a225c7b5505f73671acdfeffe4dfd5d96dfd4b8746a6e956df22623b57f0ca2ef873f6508cd09c3335f460f8f87e5d0e4a94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mr/firefox-64.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "24f85d8cfb190770b3feeb78f46779e303a8e3037db75515bf7b2c99e1c836591913ff0a0c4f882c0c17d077bfd29a9762b92692c99dd77727e1bea4439a1a49";
+      sha512 = "df86766636cdec2dbf094f9a48e6b613df4a18371bb85862623a99a5cf095281f926c5bec51bba089183db363b14abd82ba771522dd4367ccca7ddafd532ea21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ms/firefox-64.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "90b81a464db5b992eccaeb08f7acaa383872f7d8e037eb53016b2db337658fb97a8afcb7a9fed9e39a9d6bb44bac0766656ce065e38a4485f5723ca6cc242cf6";
+      sha512 = "9e20aa9964c2036beeb4b5598f57d8f066062fc514229bff088a36bbffb46a9b6131b4ab7af77d785b98e6544a5e102e84cafae581ce7a2ac0ae8e5223dc8aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/my/firefox-64.0b14.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "afe60863fd0443e3a9069e0ca28025df53eef9b822be6b0a35144cc8ed3af1982bfce1c6e40c4aa17159f02836efceda6dfedb1a7bd7aa96d3de0eb348a60c38";
+      sha512 = "65c94ffa537b72cc89c09342ddeb8915a7e3cc0164bc3191e3e289e8c5217b175190465e49afbf5adf0f21864c787ccbbfd8b5eb2975ce4917e8d5cd5aefbc08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nb-NO/firefox-64.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4007d3e7623488754b3f2f80c6590727d0595e240374c67a057da1fbd64f106553c1fc2f5a8a4cc6ffea753790e522de188dcf0ea4bb6eb40df05b4b822da86e";
+      sha512 = "1ea09c94a276f6ea18b4f759d46197af94bbfcf313ddc3d60bf9b0b6c406fe4bca248ce13f6c54f9f0d01f54804ce13792be998b2bdf35db1fa39d0a1a4ce688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ne-NP/firefox-64.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "3b0edf144a57e656a44e8d7ebf2c4967280557be024a844ec230dd4d2a184966463ba6b39828653df67c2a6715d6f02873f5c5349705446ad487c6640806cd43";
+      sha512 = "b35addebf27849b8c9b7d486d73d8273b58f706e8bb23599628b973f558aa486c793446e3a4c05389fef1664b6a261460a47b2abc482ae5c7d8cca26963fa6b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nl/firefox-64.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8527ea936e66a182720ffa439d2893318c7af343ae5acf758f44d2293a3857dbc28f13d7147cc43e9644f4b174f73e8e4426c43c58038a582dc379a1e5e0f5ec";
+      sha512 = "e5b514b4582ee116910875887f8cd47573c6b8d63b451ce0471bc02c2f93bae7f52ad8e03eff732005eb40f4807cd2d9e5dd088045f1c3c7a0644629b9fb6968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nn-NO/firefox-64.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4a15662aa9aa8ca6b7a3f46868d4b7e3114fc644da9c4f141af0ee50fe4502ea1f37b7b007551460efb26cac9d788491615103cf442078ca678d4407b53d199a";
+      sha512 = "caed8e08167575fd143679f72c4d48eac7238f168e335f56b813c2f6e55f31c781ba423cac018ccc6cb69b4b73ae5d3bf6a9af48e7e087af42286b436ec95b85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/oc/firefox-64.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "77436ff6c82f3356a0b092274fb26543da73ae7ecc4f4d8ec8dd1ba6d282114ad01c557f5be9b541b5d41059a40699d5da5f15178ac6f9cf65b110812925ddf0";
+      sha512 = "6635eaa118bbc7f8f7945456c2fb8470f2398d68ae7a00266194e23d5a56c3c28dc4accfe0cd354c0d468229669c38547bd8cf0219db61ab21083163db3688bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/or/firefox-64.0b14.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "efe9b2b6237d2fa7ee679a535295ba3143ab00d226b611cd09bcf96934f55632b7f5498c03be50034c925c69a4fc25632b40c9ec5302dcdf43648542fddf4b5a";
+      sha512 = "360b38e0c605a332cb0fbd66d6c61fd419dbedd2589655e019e62fc40bff6d6fbe8e40a59812f44b3cae1ca21dd5c69971b7e9501744d75392bc377e3d3e36a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pa-IN/firefox-64.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e6879a8ad1d379a0562d9c5ab5cf521fbc3d195d5aae54bc5713f3f4fe4dedb42bd2d0b3c434ca77cb357f8665f03a32d5772a466f9ce802d0c1f123287e2557";
+      sha512 = "5368aee673272ca741ce4589bb191f654df557d9a929091bd430d47179e8007590233cd671184efa7bdde57f4d9db20700b5828c7d39a562d421280047bf4a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pl/firefox-64.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ae362910b20f6c9dcc1ab56a9f14532d1bce343f009ecb1d71d1907e15c11e78d532e9a1dc477c3070f63e1d6d9b322b8b3c629b5d11d18207ddf61fecd257dd";
+      sha512 = "557199b4c193d1bc6dbd09b84aad4a7c7a863725790c05ac3978bb393fdefa6dbb088a0c7a41415ec2e16bd8e355142b9956075f60d049db7a713b4d138053b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-BR/firefox-64.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "c6224a6a582ec2ba09de0c4f570a63ea79f03d34fcbc37adddded768758a5936ea9ac9661d429a0e500381ad7a9879d5afe222a6981fb45f5e23d15d5680271a";
+      sha512 = "f5db4fe1ccb3ef02bbb32b180a59af92fcf124b6bfd2a8e9e95452a61fc5740ee6a1084b842383d38bd59620ee1a542df79344640e7ee5e776c58b83830f4be9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-PT/firefox-64.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "b275a56a93f5332b9ae1aab11c896c0b971d9fb4aa9f574668e0d43edf0fa19d013afca12cf2b82cb493dea47caf262b2a0c504d9d1906de203622334d55eb7f";
+      sha512 = "f38d13ec454db404f40b2dbbebfc38c56e30f57ab586739e346d5a69da7fffb942ec2e9e1b76bf483f64c40dbd6641323fea3da3714926ca95d00b87847a5564";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/rm/firefox-64.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "76443d9234bf38a04820a25997a46fffcef58c3ed2593d50c7ab28280fae5c518dc353611a9b8b3070c337ca3815cf63b41826547ef673e6fbbd4037951e3c4a";
+      sha512 = "668790acf5664b71df38ff060a6e830cf646b685a7dcb5452eb21fd545bebac5a9533d6b424fadae7f3cb875955e7213b034d5ad0ef078a8a9ebe3372a4130a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ro/firefox-64.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "bc7b68dc5d6a05c66cb7aa6d39ab56c3f28174539caf5e27dbd2b3fae500fe439b51084d0ecd16d7cd9ea52dad5bdadcd5ebaaaf7e03256d30bd2229e0c7f89c";
+      sha512 = "bbf67517b93a28f6b5cb6ade1d0df2b6e89930ed172e56d76fff0b5d1ac0a8d30a2be46b4a7dc9300e3acb1fd69d79c2b757c79bb8746d25281970812e6bf70f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ru/firefox-64.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6daf35184d294395de7f4b203b38b0ef4071956fde1839f75265cf45b1f887640067e2eb17d5e5bfdb4f7cc0d4874579ea691ca8d5301f76ec2052c824d8331d";
+      sha512 = "ecf73f6633b502c6b5fde6b8dcd22a1688edd881360f87c7f399d7594474c753c7b6df2d1fde652ae9ab9938c16dff44f01c47b33a5988c00ee636291cddcbbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/si/firefox-64.0b14.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "db7f827ed173044811b994a89b8625f37f0a92994e0bf748f18082e5ab842dc147184b6b552c5b7bdb888d9c3ef4e6ed8555074936263c49f0517686213dec21";
+      sha512 = "7f3ed166ba6e8a9d223b881a26753fe255c441034b61f8ec06b0b67d83c20c08aadd28b86befe362a475f77ccbe26e9828eb81e116831d1e1251662163eb0d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sk/firefox-64.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e7dfb26f8f8d763d66b7d9f924fa30f55e55728cd9178602646504759c8d83864107f759983b95c5706d0438bcc534ee3020875ba2b06e161d669b7be2e38f0e";
+      sha512 = "e1e08ca8a53395abbc26b428d82cdc763db39dbb45fda351f3815d770f696e6629969bbc2a15053d87a589ad3755ffea29fe897004aeedfeeb166cf206f75ac6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sl/firefox-64.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c6a36cdbc579cef430ef91064c8c1fa6c1b63831701f5f0a416e0d41742f0e827e90cac66ad5684fca32e7bd69c8c40703b5a22055e84f83fde51ae1af3d60e7";
+      sha512 = "5fb47da8d75472bcb36b958cdc604f8d9c5ee92ebad423c3adcfe362c7f0e2e9f2bdb08aa2bc5e8e93fc3c8a619e2ec1796fa40d0a6634fb2cc22b163d978758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/son/firefox-64.0b14.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "1cf6b1c9ffdb1862258e0e0f54543c36d90f1dee02507ac4cf6d8c8c4a1be18902403870642231a721398dc757267e41e411bdc221303b0fd081845b474b22fc";
+      sha512 = "1020c0d63535096fe0c90907f5fc24753fc32d20fe53123c43ea58b4666f20486e4e1383a96f499e4b8abfa941a18d69f74d7f6fbf52f7b77201f19317bd8f2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sq/firefox-64.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "4e628b5cf477fd18c4ce325ae356e35eab9b40a40a653428864b2e1e2ba80cbbfded05ce6e280aedee76eb92a113486a460f77b70cc52ede270c7d04bb7987b3";
+      sha512 = "cbc20da6a33130b02683b8f5e3ee128f162f15728cfb40655c92ea94291dd614129e409a08d2a9d0def9557b48e8c548288ddf2d2b529855064ea17af3757844";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sr/firefox-64.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1b659513229e2f37bf797a703041c249d187ddf7bb3e239b67a49ffc42ecdf9d3affee300e3e3885c5961d1e57eb7590450f5bdf822503c8889cb782bd070457";
+      sha512 = "7c27e12229cd86a74917f6eda2c6a43711e7e1a20610c169c0da65e4eb6b646236e5dd31be22d679d74391387aa3b375863c2f0d8875d8d9abd701fc14ed011a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sv-SE/firefox-64.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "96317452a323db8fe04c4c83a40bb5112074f82f6a074e3b3a901bdd7d0e67f6bc3efaf230440e20d0f39fe27a6d2d2b14e6c5a34384b0c1aab11836af44432e";
+      sha512 = "c564b2af8421990b0efb90f81f226aa63224275bc0b9ca614bcdbd0a95c3f85970b783d301b122d5198478ae8e7dc3ebe5f29fed417c0d5ea63e6a9e8b62a087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ta/firefox-64.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5c87b548553e34586a8f3bcec429735c4e7ac89027888b60be89e68710a79bdc2000787cc5000cbda771d0cb704c8e3edd404d4b4148f1aec87a9b5cf7e82754";
+      sha512 = "9f7a8321bf8333992bb3888005646cc0af4362ad447ed3024196426c43289669ae791f24c09553e275ad184625f910de8e09345ccf28d231741b5dd2ff1b280e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/te/firefox-64.0b14.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b75bd0e03305cff00d4ab904545b1d5b075abba9d1e27e4cbfb158c109506c72494242be9b3e5728c47d5f93a302efca3c8c9661c9e7fdec3dff3b6424009796";
+      sha512 = "d53f9bcde30f9c884a67abe5d1d83f6fa9a33757b73fb026cc32535563a3fb4f97ad98f924054016e7102962eab3a858dd9004b171396b10b01535bc62771d4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/th/firefox-64.0b14.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6df43a8e11ccef31995e7fc3ad47e8666c08a3663be3b3c055900896c9f0379e85066fc6387e35546a4ba73781cec631a73cc92a4e648cc0b31efec16c652ccf";
+      sha512 = "0d122ecbd5c22cb3c1d05156fc446ec4bceebf63675bd7d2789972bfa9acef83fb247080172f04f7341be0c59d478606bfae73a1c73f55139788b40b7851a58e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/tr/firefox-64.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "9cbf8d659be4a7e32da95bc9d76b435b22e1e83e10a93771f247540eb313e0d476f231c436d1e39bba4ebb7264a1be4e5f1a677bee5b0af3fd83c42887cf173d";
+      sha512 = "ff2165f42c5916cabe416804af8e0bf8c24f4da91ff5c30731e0c05c84aec3099e15abd02c9d4d37bb42b7d749b9bb50374c24d51b2fc83c3b22476dd2eff47c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uk/firefox-64.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bf79b845f6ac4eccbeca2de07bc0f9668541ecf62f109919c15b6348428dab7b748de330861f2c77de6bec4609608a9927ccf7743446c879d8c7cd99ec021ee9";
+      sha512 = "1dedde0a990ca3e32b2110d13a3c270bb615ce6609632ad6a2d014cc96a950690c795e8336b75b0c492f0577d0d4d43876d285ce1f2292fd8591d5d648a442a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ur/firefox-64.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "7609d8c93d71f20898d77d08066ff51a418d9cd7fe616c42669bb5879856dae2c1b40cf6a74ccd65d6360857369a96b5eb7e03ecc1babaef95d6baf9b52b85e6";
+      sha512 = "1d2d39cd8db329b7f717cee5cab6e56be05e93091752a1ae02e4a3fe36bbfe9391cd6117775b63821540f0de708ddaae4dd1a1b998d755269568c7810c07fe86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uz/firefox-64.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "342aac005ea6aaab04988133d27154c6a2c1d8404b9865413d07febc42325b3c63c2b85ab11cacb4120e74693c3a8e447b396b8fdff93ab913041b73ccb91372";
+      sha512 = "83b17251083ac9790ce57a7d6ed62e7df86c97770b6ed4b6b3eb4d583f1edbba9ce06c3c3b10596e237f79b4afc11483cf926225a5834f7e1c4ab7ab27abdffe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/vi/firefox-64.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5c44ce438816a7ebfee3e3eaac121845a53750439387b4d01c9a846bcc344a85cc95705d1bbe514de11297909be425f0d5134863be4f0901b963c7dfa552957e";
+      sha512 = "3ee2013dc094b0b77533d88548fb5906f1a7ca1440a50a1585e04f09d1aa62c853f0837a6b218e1818ae93f0e838cbda1915f40b2030e10386a2642820fa9729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/xh/firefox-64.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "21b9ac22d9167cf830f6594cce7b3b1deef155c6c7baf60ed74769bff792f57a58e3f2db351a1df41a479963cdc3dc81e120ff4d47d7aefeeb330994a98326cd";
+      sha512 = "2bc8af3262deb7c3ee5087921f721066ebaef6cc9c93a36b1dfe8fb2b43afcb276a78a32d959d52cafc33b0a869860c0963d6f1389cd0f3860bc0c95963a916e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-CN/firefox-64.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7b1a10588bb981006e0e28c8725e69c9acb9a029d8cc8e587fe47b59eb9021a3718bc4a2dee658b5cedf426051d23d55c4d6c4dfc0df0867fabc2a0fdd0fa874";
+      sha512 = "b51a683f3a8f52c41d9ef0e8aada1007fcd3db95cff4c36b353698de3f406f232e78134e4095f3fe3f8b8b2445d095141fa2ac3a5186943db5d35027e63319a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-TW/firefox-64.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8a30a6cf262adf1a65dd4964c5970ef2d3641561ec1f085f8606b5492570f43e7e5a0e2562f4e873056c3a9a3b4b8377b2e85f952c2d382ca800576b64a3d866";
+      sha512 = "811498331ce6e2c9b7297069f4b5990f092b7330ffd4ef296612bc542bbad0839180753d09cfbfefde965b6ccc6a8783ec1eee891817e665675f08bb4e8e3b0a";
     }
     ];
 }

From 1f7266cbbb1579238b7e5958accd9668dce87022 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:33:36 -0500
Subject: [PATCH 155/199] linux: 4.9.142 -> 4.9.143

---
 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 013282501863..d05eead7f7f1 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.142";
+  version = "4.9.143";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil";
+    sha256 = "1grcmh85n6ya8h2v0qx2pxryjxx3501kjbknz3a5yrwnlrj69dqf";
   };
 } // (args.argsOverride or {}))

From e945771e4ca6780fd8df8520ad595bcdc529ed6f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:34:13 -0500
Subject: [PATCH 156/199] linux: 4.14.85 -> 4.14.86

---
 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 008c23ee9af9..a493ae359f7b 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.85";
+  version = "4.14.86";
 
   # 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 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4";
+    sha256 = "0a3f4rn9aixmx6ssqw0yqcr37js790qvb28v40rpg49b0aln14ns";
   };
 } // (args.argsOverride or {}))

From 808d52ee05d2672963e3da8d3ca25e4dc022840f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Dec 2018 17:34:29 -0500
Subject: [PATCH 157/199] linux: 4.19.6 -> 4.19.7

---
 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 ccdb95b14115..d432680d4459 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.6";
+  version = "4.19.7";
 
   # 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 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4";
+    sha256 = "1lm2s9yhzyqra1f16jrjwd66m3jl43n5k7av2r9hns8hdr1smmw4";
   };
 } // (args.argsOverride or {}))

From 8942a3e00c678102e1412170e44b49aa885cd955 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 5 Dec 2018 12:27:25 +0100
Subject: [PATCH 158/199] chromium: 70.0.3538.110 -> 71.0.3578.80

CVE-2018-17480 CVE-2018-17481 CVE-2018-18335 CVE-2018-18336
CVE-2018-18337 CVE-2018-18338 CVE-2018-18339 CVE-2018-18340
CVE-2018-18341 CVE-2018-18342 CVE-2018-18343 CVE-2018-18344
CVE-2018-18345 CVE-2018-18346 CVE-2018-18347 CVE-2018-18348
CVE-2018-18349 CVE-2018-18350 CVE-2018-18351 CVE-2018-18352
CVE-2018-18353 CVE-2018-18354 CVE-2018-18355 CVE-2018-18356
CVE-2018-18357 CVE-2018-18358 CVE-2018-18359
---
 .../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 c2a73480b987..a6dc397cbc5a 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 = "0nxxqfncw9ci3rhg8fiqaxy6zvh9x3j10lw8yw7c0cg2yni10qsp";
-    sha256bin64 = "0frcaplyzhkxzzcfcf0vigqpzixar4jg9hhrh4i8z8vx2gnxkwwy";
-    version = "71.0.3578.53";
+    sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
+    sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay";
+    version = "71.0.3578.80";
   };
   dev = {
-    sha256 = "11bsn77kvjqdwpiwjf4gaindfj0sx932wp6g7cald0638wdz7pqv";
-    sha256bin64 = "1j5pd8imc35ch7l3jmnmjm2yda2xzdwha5im34240wm6rrdr2v2j";
-    version = "72.0.3610.2";
+    sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4";
+    sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87";
+    version = "72.0.3622.0";
   };
   stable = {
-    sha256 = "0bwlq5xii26b3yngwkwb7l2mx03c30ffpym4xg0hcci8ry7zhpj4";
-    sha256bin64 = "1gnhjbpkp2gn3y5pingwv153bakidq60pr4fj2iq1kniyllsmmpg";
-    version = "70.0.3538.110";
+    sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2";
+    sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4";
+    version = "71.0.3578.80";
   };
 }

From 8af15af15cab4bc6bdda1d272e008a818616c1e2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 5 Dec 2018 19:37:06 -0500
Subject: [PATCH 159/199] pythonPackages.flake8-future-import: fix build on
 Python 3.7

---
 .../python-modules/flake8-future-import/default.nix    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index eaed804245fa..c9cf3fe4ca84 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
+{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
@@ -12,6 +12,14 @@ buildPythonPackage rec {
     sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr";
   };
 
+  patches = [
+    # Add Python 3.7 support. Remove with the next release
+    (fetchpatch {
+      url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch;
+      sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r";
+    })
+  ];
+
   propagatedBuildInputs = [ flake8 six ];
 
   meta = {

From 561959bab88c589b6e3bd02c1ca1f8f7674864b7 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 5 Dec 2018 20:30:03 +0100
Subject: [PATCH 160/199] x2goclient: 4.1.2.1 -> unstable-2018-11-30, fix build

---
 .../networking/remote/x2goclient/default.nix  | 19 +++++++++----------
 .../networking/remote/x2goclient/qt511.patch  | 15 ---------------
 2 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/networking/remote/x2goclient/qt511.patch

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 01aaa2219bf3..3d65b7a621b3 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
-makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
+{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh
+, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "x2goclient-${version}";
-  version = "4.1.2.1";
+  pname = "x2goclient";
+  version = "unstable-2018-11-30";
 
-  src = fetchurl {
-    url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w";
+  src = fetchgit {
+   url = "git://code.x2go.org/x2goclient.git";
+   rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8";
+   sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh
-                  qtbase qtsvg qtx11extras qttools phonon ];
+                  qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
   nativeBuildInputs = [ makeWrapper ];
 
-  patches = [ ./qt511.patch ];
-
   postPatch = ''
      substituteInPlace Makefile \
        --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch
deleted file mode 100644
index 8f02cd62277d..000000000000
--- a/pkgs/applications/networking/remote/x2goclient/qt511.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/printwidget.cpp b/src/printwidget.cpp
-index 58a8af7..131d340 100644
---- a/src/printwidget.cpp
-+++ b/src/printwidget.cpp
-@@ -23,6 +23,7 @@
- #include "x2gosettings.h"
- #include "x2gologdebug.h"
- #include <QDir>
-+#include <QButtonGroup>
- #ifdef Q_OS_WIN
- #include "wapi.h"
- #endif
--- 
-2.17.1
-

From 71dbc5a77b7e36ecada78ed9eb061b35edb4a288 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 01:07:10 +0100
Subject: [PATCH 161/199] terraform-providers: update

---
 .../cluster/terraform-providers/data.nix      | 51 +++++++++++--------
 .../cluster/terraform-providers/providers.txt |  2 +-
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 8271346f25ea..2e02b121afcb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -11,8 +11,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.23.0";
-      sha256  = "14hs58lqlj9vkmr4bxbyga8yz4h6mrx6zla587sqwgj5bjrg5vld";
+      version = "1.25.0";
+      sha256  = "09f0vdzkifj2mk1qccacpnlqiihbhhb2sfd21rpxbqscmj6a7vj1";
     };
   archive =
     {
@@ -39,8 +39,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.46.0";
-      sha256  = "1xp02cwyl9sf8swl7x3wah3bg0ssm7y0svq8bkfki6632nfw9vzi";
+      version = "1.51.0";
+      sha256  = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg";
     };
   azurerm =
     {
@@ -137,8 +137,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      version = "1.5.0";
-      sha256  = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz";
+      version = "1.6.0";
+      sha256  = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh";
     };
   digitalocean =
     {
@@ -235,8 +235,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-hcloud";
-      version = "1.5.0";
-      sha256  = "135h811qh1l1kn66n371f00b422xi4zw15cgs3id866za5cavxf3";
+      version = "1.6.0";
+      sha256  = "19kax1l2l6vr8cwgy14ahhafnvlxgkw86xx2g9ajfg70d0q4zs3g";
     };
   helm =
     {
@@ -270,8 +270,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-icinga2";
-      version = "0.1.1";
-      sha256  = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
+      version = "0.2.0";
+      sha256  = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0";
     };
   ignition =
     {
@@ -291,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-kubernetes";
-      version = "1.3.0";
-      sha256  = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3";
+      version = "1.4.0";
+      sha256  = "14bhqrpx0z4qn51xwcklafva46ipx05q6myy7xh5wf6wpjz69j9p";
     };
   librato =
     {
@@ -305,8 +305,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-linode";
-      version = "1.2.0";
-      sha256  = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l";
+      version = "1.3.0";
+      sha256  = "1683nkpq7wnc67pphablcmaifq2l1pz3gc9y5y9jbslllphy92v5";
     };
   local =
     {
@@ -396,8 +396,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      version = "3.7.0";
-      sha256  = "10d8hvcr019cr8fh54klnr9xhi0y3l5w4nb2h9bny84nv2rznk38";
+      version = "3.9.0";
+      sha256  = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97";
     };
   oneandone =
     {
@@ -459,8 +459,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "1.2.0";
-      sha256  = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf";
+      version = "1.2.1";
+      sha256  = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n";
     };
   panos =
     {
@@ -536,8 +536,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.7.0";
-      sha256  = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk";
+      version = "1.8.0";
+      sha256  = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2";
+    };
+  selvpc =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-selvpc";
+      version = "0.3.0";
+      sha256  = "1s1p0qa9x007hq26i4h0gcqpyx54jnwvg8d6ya044gm7gghhviz4";
     };
   softlayer =
     {
@@ -592,8 +599,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tfe";
-      version = "0.3.0";
-      sha256  = "125k1hgpzwlsgslnz2nwz4mc5yl3hqyg48xdcn7bxvmvaf6kw9gd";
+      version = "0.4.0";
+      sha256  = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn";
     };
   tls =
     {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index 16305b4b90c6..1161094df387 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -7,7 +7,7 @@
 #  <organisation>/<repo>                                         - include only the named repository.
 
 # include all terraform-providers
-terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
+terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\)
 
 # include terraform-provider-matchbox
 coreos/terraform-provider-matchbox

From ae49c73644c05f1eaf8fbd5e88d0971e3dd6a8c5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 01:07:22 +0100
Subject: [PATCH 162/199] terraform-providers: add terraform-provider-secret

---
 .../networking/cluster/terraform-providers/data.nix        | 7 +++++++
 .../networking/cluster/terraform-providers/providers.txt   | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 2e02b121afcb..a69229735f8b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -658,4 +658,11 @@
       version = "0.0.1";
       sha256  = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
     };
+  secret =
+    {
+      owner   = "tweag";
+      repo    = "terraform-provider-secret";
+      version = "0.0.1";
+      sha256  = "1mqs1il8y97hf9havcmxdfwjcpkrxa1hpkifzzy4rjc88m2m4q9r";
+    };
 }
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index 1161094df387..d5db0b91ae25 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -14,3 +14,6 @@ coreos/terraform-provider-matchbox
 
 # include terraform-provider-nixos
 tweag/terraform-provider-nixos
+
+# include terraform-provider-secret
+tweag/terraform-provider-secret

From 129502ec3f9142d3eabd45afa9ca41b22328717c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 12:40:42 +0800
Subject: [PATCH 163/199] pythonPackages.flask_login: fetch from PyPi so we can
 override the version

---
 .../development/python-modules/flask-login/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix
index 1a01666d799d..d466a78a6811 100644
--- a/pkgs/development/python-modules/flask-login/default.nix
+++ b/pkgs/development/python-modules/flask-login/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
+{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast
 , flask, blinker, nose, mock, semantic-version }:
 
 buildPythonPackage rec {
   pname = "Flask-Login";
   version = "0.4.1";
 
-  src = fetchFromGitHub {
-    owner = "maxcountryman";
-    repo = "flask-login";
-    rev = version;
-    sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8";
   };
 
   checkInputs = [ nose mock semantic-version ];

From 547cd5bfd4fe47ce868394bdbf2e2020169d60dd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 12:43:36 +0800
Subject: [PATCH 164/199] octoprint: 1.3.8 -> 1.3.9

At the same time, clean up how we handle dependencies (shamelessly stolen from
home-assistant) and override version constraints.
---
 pkgs/applications/misc/octoprint/default.nix | 149 +++++++------------
 1 file changed, 51 insertions(+), 98 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 41bc94a51300..9622689199a8 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,91 +1,62 @@
-{ stdenv, fetchFromGitHub, python2 }:
+{ stdenv, lib, fetchFromGitHub, python2 }:
 
 let
-
-  pythonPackages = python2.pkgs.override {
-    overrides = self: super: with self; {
-      backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec {
-        version = "3.4.0.2";
+  mkOverride = attrname: version: sha256:
+    self: super: {
+      ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
+        inherit version;
         src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
-        };
-      });
-
-      flask = super.flask.overridePythonAttrs (oldAttrs: rec {
-        version = "0.12.4";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
-        };
-      });
-
-      tornado = buildPythonPackage rec {
-        pname = "tornado";
-        version = "4.0.2";
-
-        propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
-        };
-      };
-
-      flask_login = buildPythonPackage rec {
-        pname = "Flask-Login";
-        version = "0.2.2";
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
-        };
-
-        propagatedBuildInputs = [ flask ];
-        checkInputs = [ nose ];
-
-        # No tests included
-        doCheck = false;
-      };
-
-      jinja2 = buildPythonPackage rec {
-        pname = "Jinja2";
-        version = "2.8.1";
-
-        src = fetchPypi {
-          inherit pname version;
-          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
-        };
-
-        propagatedBuildInputs = [ markupsafe ];
-
-        # No tests included
-        doCheck = false;
-      };
-
-      pylru = super.pylru.overridePythonAttrs (oldAttrs: rec {
-        version = "1.0.9";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c";
+          inherit version sha256;
         };
       });
     };
+
+  py = python2.override {
+    packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
+      (mkOverride "flask"       "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc")
+      (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3")
+      (mkOverride "jinja2"      "2.8.1"  "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m")
+      (mkOverride "pylru"       "1.0.9"  "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi")
+      (mkOverride "sarge"       "0.1.4"  "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar")
+      (mkOverride "tornado"     "4.5.3"  "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
+    ]);
   };
 
-in pythonPackages.buildPythonApplication rec {
+  ignoreVersionConstraints = [
+    "Click"
+    "Flask-Assets"
+    "Flask-Babel"
+    "Flask-Principal"
+    "PyYAML"
+    "emoji"
+    "flask"
+    "future"
+    "futures"
+    "pkginfo"
+    "psutil"
+    "pyserial"
+    "python-dateutil"
+    "requests"
+    "rsa"
+    "scandir"
+    "semantic_version"
+    "websocket-client"
+    "werkzeug"
+    "wrapt"
+  ];
+
+in py.pkgs.buildPythonApplication rec {
   pname = "OctoPrint";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
-    owner = "foosel";
-    repo = "OctoPrint";
-    rev = version;
-    sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3";
+    owner  = "foosel";
+    repo   = "OctoPrint";
+    rev    = version;
+    sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
   };
 
-  # We need old Tornado
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with py.pkgs; [
     awesome-slugify flask_assets rsa requests pkginfo watchdog
     semantic-version flask_principal werkzeug flaskbabel tornado
     psutil pyserial flask_login netaddr markdown sockjs-tornado
@@ -94,31 +65,13 @@ in pythonPackages.buildPythonApplication rec {
     frozendict
   ];
 
-  checkInputs = with pythonPackages; [ nose mock ddt ];
+  checkInputs = with py.pkgs; [ nose mock ddt ];
 
-  # Jailbreak dependencies.
   postPatch = ''
-    sed -i \
-      -e 's,pkginfo>=[^"]*,pkginfo,g' \
-      -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-      -e 's,websocket-client>=[^"]*,websocket-client,g' \
-      -e 's,Click>=[^"]*,Click,g' \
-      -e 's,rsa>=[^"]*,rsa,g' \
-      -e 's,flask>=[^"]*,flask,g' \
-      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
-      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,PyYAML>=[^"]*,PyYAML,g' \
-      -e 's,scandir>=[^"]*,scandir,g' \
-      -e 's,werkzeug>=[^"]*,werkzeug,g' \
-      -e 's,psutil==[^"]*,psutil,g' \
-      -e 's,requests>=[^"]*,requests,g' \
-      -e 's,future>=[^"]*,future,g' \
-      -e 's,pyserial>=[^"]*,pyserial,g' \
-      -e 's,semantic_version>=[^"]*,semantic_version,g' \
-      -e 's,wrapt>=[^"]*,wrapt,g' \
-      -e 's,python-dateutil>=[^"]*,python-dateutil,g' \
-      -e 's,emoji>=[^"]*,emoji,g' \
-      -e 's,futures>=[^"]*,futures,g' \
+    sed -r -i \
+      ${lib.concatStringsSep "\n" (map (e:
+        ''-e 's@${e}[<>=]+.*@${e}",@g' \''
+      ) ignoreVersionConstraints)}
       setup.py
   '';
 

From d354f7cbe638715fd3258934ba611b6fa236f2ba Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Thu, 6 Dec 2018 14:57:30 +1000
Subject: [PATCH 165/199] atom, atom-beta: Fixing Exec= line in app launcher

Prior to this commit the application launchers of Atom and Atom Beta executed `/usr/bin/${pname}` instead of what it is meant to `$out/bin/${pname}`. This is because upstream changed the `Exec=` line from `Exec=/usr/share/${pname}/${pname}` to `Exec=/usr/bin/${pname}` and the `substituteInPlace` line that was in the default.nix file was not appropriately adjusted.
---
 pkgs/applications/editors/atom/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 834c6bedf3c0..73a9f26a1221 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -44,8 +44,7 @@ let
     buildCommand = ''
       mkdir -p $out/usr/
       ar p $src data.tar.xz | tar -C $out -xJ ./usr
-      substituteInPlace $out/usr/share/applications/${pname}.desktop \
-        --replace /usr/share/${pname} $out/bin
+      sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop
       mv $out/usr/* $out/
       rm -r $out/share/lintian
       rm -r $out/usr/

From 7ff4f5be26ddb2f9f5014e265eb259901002c90e Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Thu, 6 Dec 2018 07:04:03 +0200
Subject: [PATCH 166/199] rambox: 0.6.2 -> 0.6.3

---
 .../networking/instant-messengers/rambox/bare.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 8f0f06c07cc4..29ed30dd27f6 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "rambox-bare-${version}";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "ramboxapp";
     repo = "community-edition";
     rev = version;
-    sha256 = "150vf62cp739l9dgpnksgpkffabs2wi15q217m3nai34irhwzk8m";
+    sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
+    sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6";
   };
 
   patches = [ ./isDev.patch ];

From f9fc51c5533a4c9e0d99d6abedff86ea702acca9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Dec 2018 13:05:27 +0800
Subject: [PATCH 167/199] octoprint-mqtt: init at 0.8.0

At the same time:

 - build plugins against python2 as that is what octoprint uses
 - do not run checks are there aren't any
 - use buildPythonPackage as these are not applications
---
 pkgs/applications/misc/octoprint/plugins.nix | 30 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index bd65acf5e5e9..2e3bc058280a 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, octoprint, python2Packages }:
 
 let
-  buildPlugin = args: pythonPackages.buildPythonApplication (args // {
-    buildInputs = (args.buildInputs or []) ++ [ octoprint ];
+  buildPlugin = args: python2Packages.buildPythonPackage (args // {
+    propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ];
+    # none of the following have tests
+    doCheck = false;
   });
 
   self = {
@@ -42,6 +44,28 @@ let
       };
     };
 
+    mqtt = buildPlugin rec {
+      name = "OctoPrint-MQTT-${version}";
+      version = "0.8.0";
+
+      src = fetchFromGitHub {
+        owner = "OctoPrint";
+        repo = "OctoPrint-MQTT";
+        rev = version;
+        sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7";
+      };
+
+      propagatedBuildInputs = with python2Packages; [ paho-mqtt ];
+
+      meta = with stdenv.lib; {
+        homepage = https://github.com/OctoPrint/OctoPrint-MQTT;
+        description = "Publish printer status MQTT";
+        platforms = platforms.all;
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ peterhoeg ];
+      };
+    };
+
     titlestatus = buildPlugin rec {
       name = "OctoPrint-TitleStatus-${version}";
       version = "0.0.4";

From 69baf44674ffe70c2c541256815113f2144216d6 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Thu, 6 Dec 2018 18:53:09 +0800
Subject: [PATCH 168/199] solc: 0.5.0 -> 0.5.1

---
 pkgs/development/compilers/solc/default.nix   | 15 ++++-------
 .../solc/patches/shared-libs-install.patch    | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 283d036d412c..af9ddb872f9c 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
 
 let
-  version = "0.5.0";
-  rev = "1d4f565a64988a3400847d2655ca24f73f234bc6";
-  sha256 = "0phzk2whvgrrf8xpl5pz886glhd5s40y1hbbvq9q3fxf6vc3lisy";
+  version = "0.5.1";
+  rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981";
+  sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -28,11 +28,6 @@ stdenv.mkDerivation {
     echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
-
-    # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
-    substituteInPlace cmake/jsoncpp.cmake \
-      --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
-      --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
   '';
 
   cmakeFlags = [
@@ -42,7 +37,7 @@ stdenv.mkDerivation {
   ];
 
   doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
-  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
+  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
                "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
 
   nativeBuildInputs = [ cmake ];
@@ -56,7 +51,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/ethereum/solidity;
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ dbrock akru ];
+    maintainers = with maintainers; [ dbrock akru lionello ];
     inherit version;
   };
 }
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 70162bfbcb6a..fa30655e04e8 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -2,11 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0c05208f..8893648e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
  add_subdirectory(libsolidity)
  add_subdirectory(libsolc)
  
-+
 +install(DIRECTORY libdevcore/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
 +        FILES_MATCHING PATTERN "*.h")
@@ -16,6 +15,12 @@ index 0c05208f..8893648e 100644
 +install(DIRECTORY libsolidity/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
 +        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY libyul/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul
++        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY liblangutil/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
++        FILES_MATCHING PATTERN "*.h")
 +install(DIRECTORY liblll/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
 +        FILES_MATCHING PATTERN "*.h")
@@ -57,8 +62,23 @@ index 0bdec4b4..e876177e 100644
 @@ -29,6 +29,7 @@ endif()
  
  add_library(solidity ${sources} ${headers})
- target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
  if (${Z3_FOUND})
    target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
+--- a/libyul/CMakeLists.txt
++++ b/libyul/CMakeLists.txt
+@@ -42,3 +42,4 @@ endif()
+ 	optimiser/VarDeclPropagator.cpp
+ )
+-target_link_libraries(yul PUBLIC devcore)
++target_link_libraries(yul PUBLIC evmasm devcore langutil)
++install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+--- a/liblangutil/CMakeLists.txt
++++ b/liblangutil/CMakeLists.txt
+@@ -11,3 +11,4 @@ endif()
+ 
+ add_library(langutil ${sources})
+ target_link_libraries(langutil PUBLIC devcore)
++install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

From e4d06cbab6e994c9b339eaaf7c84cf3f1b7b3858 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Dec 2018 12:10:36 +0100
Subject: [PATCH 169/199] terraform-docs: init at 0.5.0 (#51579)

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

diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix
new file mode 100644
index 000000000000..708b59fce243
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  pname = "terraform-docs";
+  version = "0.5.0";
+
+  goPackagePath = "github.com/segmentio/${pname}";
+
+  src = fetchFromGitHub {
+    owner  = "segmentio";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg";
+  };
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.version=${version}")
+  '';
+
+  meta = with lib; {
+    description = "A utility to generate documentation from Terraform modules in various output formats";
+    homepage = "https://github.com/segmentio/terraform-docs/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e939afa1808a..a0cd819e4c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22673,6 +22673,8 @@ in
     callPackage ../applications/networking/cluster/terraform-providers {}
   );
 
+  terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};
+
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};

From 73dc9b4832e634db969c6194d6b0f6f145463fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 6 Dec 2018 11:12:30 +0000
Subject: [PATCH 170/199] crashplan: mark as broken

the download link no longer works
---
 pkgs/applications/backup/crashplan/crashplan-small-business.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 529b0dbd42b6..2016d21c5926 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ xvapx ];
+    broken = true; # 2018-12-06
   };
-
 }

From b63bb15612bb94f279d70749c4cca0c7465a9771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 29 Nov 2018 12:10:43 +0100
Subject: [PATCH 171/199] home-assistant: 0.82.1 -> 0.83.3

---
 nixos/tests/home-assistant.nix                |  3 ++
 .../home-assistant/component-packages.nix     | 53 +++++++++++++++++--
 pkgs/servers/home-assistant/default.nix       | 12 ++---
 pkgs/servers/home-assistant/frontend.nix      |  4 +-
 4 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 0b3da0d59c68..7627bb07901d 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -31,6 +31,9 @@ in {
               latitude = "0.0";
               longitude = "0.0";
               elevation = 0;
+              auth_providers = [
+                { type = "legacy_api_password"; }
+              ];
             };
             frontend = { };
             http.api_password = apiPassword;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8c0ba2a49242..30fe7354f65b 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.82.1";
+  version = "0.83.3";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -21,6 +21,7 @@
     "alarm_control_panel.homematicip_cloud" = ps: with ps; [  ];
     "alarm_control_panel.ialarm" = ps: with ps; [  ];
     "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
+    "alarm_control_panel.lupusec" = ps: with ps; [  ];
     "alarm_control_panel.manual" = ps: with ps; [  ];
     "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ];
     "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -48,6 +49,7 @@
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
+    "asuswrt" = ps: with ps; [  ];
     "august" = ps: with ps; [  ];
     "auth" = ps: with ps; [ aiohttp-cors ];
     "auth.indieauth" = ps: with ps; [  ];
@@ -95,6 +97,7 @@
     "binary_sensor.envisalink" = ps: with ps; [  ];
     "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
     "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
+    "binary_sensor.fibaro" = ps: with ps; [  ];
     "binary_sensor.flic" = ps: with ps; [  ];
     "binary_sensor.fritzbox" = ps: with ps; [  ];
     "binary_sensor.gc100" = ps: with ps; [  ];
@@ -110,6 +113,7 @@
     "binary_sensor.knx" = ps: with ps; [  ];
     "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "binary_sensor.linode" = ps: with ps; [ linode-api ];
+    "binary_sensor.lupusec" = ps: with ps; [  ];
     "binary_sensor.maxcube" = ps: with ps; [  ];
     "binary_sensor.modbus" = ps: with ps; [  ];
     "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -124,6 +128,7 @@
     "binary_sensor.openuv" = ps: with ps; [  ];
     "binary_sensor.pilight" = ps: with ps; [  ];
     "binary_sensor.ping" = ps: with ps; [  ];
+    "binary_sensor.point" = ps: with ps; [  ];
     "binary_sensor.qwikswitch" = ps: with ps; [  ];
     "binary_sensor.rachio" = ps: with ps; [  ];
     "binary_sensor.raincloud" = ps: with ps; [  ];
@@ -156,6 +161,7 @@
     "binary_sensor.verisure" = ps: with ps; [  ];
     "binary_sensor.volvooncall" = ps: with ps; [  ];
     "binary_sensor.vultr" = ps: with ps; [ vultr ];
+    "binary_sensor.w800rf32" = ps: with ps; [  ];
     "binary_sensor.wemo" = ps: with ps; [  ];
     "binary_sensor.wink" = ps: with ps; [  ];
     "binary_sensor.wirelesstag" = ps: with ps; [  ];
@@ -250,6 +256,7 @@
     "climate.toon" = ps: with ps; [  ];
     "climate.touchline" = ps: with ps; [  ];
     "climate.tuya" = ps: with ps; [  ];
+    "climate.velbus" = ps: with ps; [  ];
     "climate.venstar" = ps: with ps; [  ];
     "climate.vera" = ps: with ps; [  ];
     "climate.wink" = ps: with ps; [  ];
@@ -260,6 +267,7 @@
     "cloud.const" = ps: with ps; [  ];
     "cloud.http_api" = ps: with ps; [  ];
     "cloud.iot" = ps: with ps; [  ];
+    "cloud.prefs" = ps: with ps; [  ];
     "cloudflare" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
@@ -286,6 +294,7 @@
     "cover.command_line" = ps: with ps; [  ];
     "cover.deconz" = ps: with ps; [  ];
     "cover.demo" = ps: with ps; [  ];
+    "cover.fibaro" = ps: with ps; [  ];
     "cover.garadget" = ps: with ps; [  ];
     "cover.gogogate2" = ps: with ps; [  ];
     "cover.group" = ps: with ps; [  ];
@@ -339,6 +348,7 @@
     "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
     "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.google_maps" = ps: with ps; [  ];
+    "device_tracker.googlehome" = ps: with ps; [  ];
     "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.hitron_coda" = ps: with ps; [  ];
     "device_tracker.huawei_lte" = ps: with ps; [  ];
@@ -356,8 +366,7 @@
     "device_tracker.mysensors" = ps: with ps; [  ];
     "device_tracker.netgear" = ps: with ps; [  ];
     "device_tracker.nmap_tracker" = ps: with ps; [  ];
-    "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
-    "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];
+    "device_tracker.owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
     "device_tracker.ping" = ps: with ps; [  ];
     "device_tracker.quantum_gateway" = ps: with ps; [  ];
     "device_tracker.ritassist" = ps: with ps; [  ];
@@ -370,6 +379,7 @@
     "device_tracker.tile" = ps: with ps; [  ];
     "device_tracker.tomato" = ps: with ps; [  ];
     "device_tracker.tplink" = ps: with ps; [  ];
+    "device_tracker.traccar" = ps: with ps; [  ];
     "device_tracker.trackr" = ps: with ps; [  ];
     "device_tracker.ubus" = ps: with ps; [  ];
     "device_tracker.unifi" = ps: with ps; [ pyunifi ];
@@ -417,6 +427,7 @@
     "fan.zwave" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
+    "fibaro" = ps: with ps; [  ];
     "folder_watcher" = ps: with ps; [ watchdog ];
     "foursquare" = ps: with ps; [ aiohttp-cors ];
     "freedns" = ps: with ps; [  ];
@@ -427,6 +438,7 @@
     "geo_location.demo" = ps: with ps; [  ];
     "geo_location.geo_json_events" = ps: with ps; [  ];
     "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [  ];
+    "geofency" = ps: with ps; [ aiohttp-cors ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
     "google_assistant" = ps: with ps; [ aiohttp-cors ];
@@ -534,6 +546,7 @@
     "light.elkm1" = ps: with ps; [  ];
     "light.enocean" = ps: with ps; [  ];
     "light.eufy" = ps: with ps; [  ];
+    "light.fibaro" = ps: with ps; [  ];
     "light.flux_led" = ps: with ps; [  ];
     "light.futurenow" = ps: with ps; [  ];
     "light.greenwave" = ps: with ps; [  ];
@@ -563,6 +576,7 @@
     "light.mysensors" = ps: with ps; [  ];
     "light.mystrom" = ps: with ps; [  ];
     "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ];
+    "light.niko_home_control" = ps: with ps; [  ];
     "light.opple" = ps: with ps; [  ];
     "light.osramlightify" = ps: with ps; [  ];
     "light.piglow" = ps: with ps; [  ];
@@ -574,6 +588,7 @@
     "light.sensehat" = ps: with ps; [  ];
     "light.sisyphus" = ps: with ps; [  ];
     "light.skybell" = ps: with ps; [  ];
+    "light.switch" = ps: with ps; [  ];
     "light.tellduslive" = ps: with ps; [  ];
     "light.tellstick" = ps: with ps; [  ];
     "light.template" = ps: with ps; [  ];
@@ -622,6 +637,10 @@
     "logger" = ps: with ps; [  ];
     "logi_circle" = ps: with ps; [  ];
     "lovelace" = ps: with ps; [  ];
+    "luftdaten" = ps: with ps; [ luftdaten ];
+    "luftdaten.config_flow" = ps: with ps; [  ];
+    "luftdaten.const" = ps: with ps; [  ];
+    "lupusec" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
     "mailbox" = ps: with ps; [ aiohttp-cors ];
@@ -671,6 +690,7 @@
     "media_player.nadtcp" = ps: with ps; [  ];
     "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
     "media_player.openhome" = ps: with ps; [  ];
+    "media_player.panasonic_bluray" = ps: with ps; [  ];
     "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ];
     "media_player.pandora" = ps: with ps; [ pexpect ];
     "media_player.philips_js" = ps: with ps; [  ];
@@ -707,6 +727,7 @@
     "mqtt.const" = ps: with ps; [  ];
     "mqtt.discovery" = ps: with ps; [  ];
     "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ];
+    "mqtt.subscription" = ps: with ps; [  ];
     "mqtt_eventstream" = ps: with ps; [ paho-mqtt ];
     "mqtt_statestream" = ps: with ps; [ paho-mqtt ];
     "mychevy" = ps: with ps; [  ];
@@ -715,6 +736,8 @@
     "mysensors.const" = ps: with ps; [  ];
     "mysensors.device" = ps: with ps; [  ];
     "mysensors.gateway" = ps: with ps; [  ];
+    "mysensors.handler" = ps: with ps; [  ];
+    "mysensors.helpers" = ps: with ps; [  ];
     "namecheapdns" = ps: with ps; [  ];
     "neato" = ps: with ps; [  ];
     "nest" = ps: with ps; [  ];
@@ -779,6 +802,7 @@
     "notify.syslog" = ps: with ps; [  ];
     "notify.telegram" = ps: with ps; [ python-telegram-bot ];
     "notify.tibber" = ps: with ps; [  ];
+    "notify.tplink_lte" = ps: with ps; [  ];
     "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twitter" = ps: with ps; [  ];
@@ -795,11 +819,16 @@
     "openuv" = ps: with ps; [  ];
     "openuv.config_flow" = ps: with ps; [  ];
     "openuv.const" = ps: with ps; [  ];
+    "owntracks" = ps: with ps; [ aiohttp-cors libnacl ];
+    "owntracks.config_flow" = ps: with ps; [  ];
     "panel_custom" = ps: with ps; [ aiohttp-cors ];
     "panel_iframe" = ps: with ps; [ aiohttp-cors ];
     "persistent_notification" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
     "plant" = ps: with ps; [  ];
+    "point" = ps: with ps; [ aiohttp-cors ];
+    "point.config_flow" = ps: with ps; [  ];
+    "point.const" = ps: with ps; [  ];
     "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
     "proximity" = ps: with ps; [  ];
     "python_script" = ps: with ps; [  ];
@@ -808,6 +837,8 @@
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
     "rainmachine" = ps: with ps; [  ];
+    "rainmachine.config_flow" = ps: with ps; [  ];
+    "rainmachine.const" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
     "recorder" = ps: with ps; [ sqlalchemy ];
     "recorder.const" = ps: with ps; [  ];
@@ -864,6 +895,7 @@
     "sensor.arest" = ps: with ps; [  ];
     "sensor.arlo" = ps: with ps; [  ];
     "sensor.arwn" = ps: with ps; [ paho-mqtt ];
+    "sensor.asuswrt" = ps: with ps; [  ];
     "sensor.bbox" = ps: with ps; [  ];
     "sensor.bh1750" = ps: with ps; [  ];
     "sensor.bitcoin" = ps: with ps; [  ];
@@ -922,6 +954,7 @@
     "sensor.fail2ban" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
     "sensor.fedex" = ps: with ps; [  ];
+    "sensor.fibaro" = ps: with ps; [  ];
     "sensor.fido" = ps: with ps; [  ];
     "sensor.file" = ps: with ps; [  ];
     "sensor.filesize" = ps: with ps; [  ];
@@ -929,6 +962,7 @@
     "sensor.fints" = ps: with ps; [  ];
     "sensor.fitbit" = ps: with ps; [ aiohttp-cors ];
     "sensor.fixer" = ps: with ps; [  ];
+    "sensor.flunearyou" = ps: with ps; [  ];
     "sensor.folder" = ps: with ps; [  ];
     "sensor.foobot" = ps: with ps; [  ];
     "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
@@ -973,6 +1007,7 @@
     "sensor.kwb" = ps: with ps; [  ];
     "sensor.lacrosse" = ps: with ps; [  ];
     "sensor.lastfm" = ps: with ps; [ pylast ];
+    "sensor.launch_library" = ps: with ps; [  ];
     "sensor.linky" = ps: with ps; [  ];
     "sensor.linux_battery" = ps: with ps; [ batinfo ];
     "sensor.logi_circle" = ps: with ps; [  ];
@@ -982,7 +1017,6 @@
     "sensor.luftdaten" = ps: with ps; [ luftdaten ];
     "sensor.lyft" = ps: with ps; [  ];
     "sensor.magicseaweed" = ps: with ps; [  ];
-    "sensor.melissa" = ps: with ps; [  ];
     "sensor.meteo_france" = ps: with ps; [  ];
     "sensor.metoffice" = ps: with ps; [  ];
     "sensor.mfi" = ps: with ps; [  ];
@@ -1026,6 +1060,7 @@
     "sensor.pilight" = ps: with ps; [  ];
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
+    "sensor.point" = ps: with ps; [  ];
     "sensor.pollen" = ps: with ps; [ numpy ];
     "sensor.postnl" = ps: with ps; [  ];
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
@@ -1045,6 +1080,7 @@
     "sensor.ripple" = ps: with ps; [  ];
     "sensor.rmvtransport" = ps: with ps; [  ];
     "sensor.rtorrent" = ps: with ps; [  ];
+    "sensor.ruter" = ps: with ps; [  ];
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
@@ -1052,6 +1088,7 @@
     "sensor.sensehat" = ps: with ps; [  ];
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
+    "sensor.seventeentrack" = ps: with ps; [  ];
     "sensor.shodan" = ps: with ps; [  ];
     "sensor.sht31" = ps: with ps; [  ];
     "sensor.sigfox" = ps: with ps; [  ];
@@ -1068,12 +1105,13 @@
     "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.srp_energy" = ps: with ps; [  ];
     "sensor.starlingbank" = ps: with ps; [  ];
     "sensor.startca" = ps: with ps; [ xmltodict ];
     "sensor.statistics" = ps: with ps; [  ];
     "sensor.steam_online" = ps: with ps; [  ];
     "sensor.supervisord" = ps: with ps; [  ];
-    "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
+    "sensor.swiss_hydrological_data" = ps: with ps; [  ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
     "sensor.syncthru" = ps: with ps; [  ];
     "sensor.synologydsm" = ps: with ps; [  ];
@@ -1082,6 +1120,7 @@
     "sensor.tado" = ps: with ps; [  ];
     "sensor.tahoma" = ps: with ps; [  ];
     "sensor.tank_utility" = ps: with ps; [  ];
+    "sensor.tautulli" = ps: with ps; [  ];
     "sensor.tcp" = ps: with ps; [  ];
     "sensor.ted5000" = ps: with ps; [ xmltodict ];
     "sensor.teksavvy" = ps: with ps; [  ];
@@ -1188,6 +1227,7 @@
     "switch.elkm1" = ps: with ps; [  ];
     "switch.enocean" = ps: with ps; [  ];
     "switch.eufy" = ps: with ps; [  ];
+    "switch.fibaro" = ps: with ps; [  ];
     "switch.flux" = ps: with ps; [  ];
     "switch.fritzbox" = ps: with ps; [  ];
     "switch.fritzdect" = ps: with ps; [  ];
@@ -1208,6 +1248,7 @@
     "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "switch.linode" = ps: with ps; [ linode-api ];
     "switch.litejet" = ps: with ps; [  ];
+    "switch.lupusec" = ps: with ps; [  ];
     "switch.lutron_caseta" = ps: with ps; [  ];
     "switch.mfi" = ps: with ps; [  ];
     "switch.mochad" = ps: with ps; [  ];
@@ -1285,6 +1326,7 @@
     "tibber" = ps: with ps; [  ];
     "timer" = ps: with ps; [  ];
     "toon" = ps: with ps; [  ];
+    "tplink_lte" = ps: with ps; [  ];
     "tradfri" = ps: with ps; [  ];
     "tradfri.config_flow" = ps: with ps; [  ];
     "tradfri.const" = ps: with ps; [  ];
@@ -1325,6 +1367,7 @@
     "verisure" = ps: with ps; [  ];
     "volvooncall" = ps: with ps; [  ];
     "vultr" = ps: with ps; [ vultr ];
+    "w800rf32" = ps: with ps; [  ];
     "wake_on_lan" = ps: with ps; [ wakeonlan ];
     "water_heater" = ps: with ps; [  ];
     "water_heater.demo" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c09aeb0f33f1..88b824530631 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -34,10 +34,10 @@ let
       "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
     (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
       "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
-    (mkOverride "requests" "2.20.0"
-      "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c")
-    (mkOverride "ruamel_yaml" "0.15.72"
-      "97652b9e3a76958cf6684d5d963674adf345d8cc192ddd95e2a21b22cda29f40")
+    (mkOverride "requests" "2.20.1"
+      "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263")
+    (mkOverride "ruamel_yaml" "0.15.78"
+      "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f")
     (mkOverride "voluptuous" "0.11.5"
       "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
     (mkOverride "voluptuous-serialize" "2.0.0"
@@ -85,7 +85,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.82.1";
+  hassVersion = "0.83.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0d53xp5miz1vm1b5qfznzx33qzxcxi65plp412dyk4r1ag7rh38v";
+    sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index c51a6f0472f4..1695a6eb95d6 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20181103.3";
+  version = "20181121.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b1b598f637ffc4c37a3d35aa3b912216f0340cb43fa6c50f4617536669d19499";
+    sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433";
   };
 
   propagatedBuildInputs = [ user-agents ];

From 6b9bcfe6fd8bd09f1476f09bca6a2f74f90e9a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 6 Dec 2018 11:27:05 +0000
Subject: [PATCH 172/199] pyflame: also install flame-chart-json

This is useful to use chrome's flamechart viewer.
---
 .../tools/profiling/pyflame/default.nix            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix
index 31ecbcaacbf0..ede8499694d3 100644
--- a/pkgs/development/tools/profiling/pyflame/default.nix
+++ b/pkgs/development/tools/profiling/pyflame/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig
 # pyflame needs one python version per ABI
-# are currently supported 
+# are currently supported
 # * 2.6 or 2.7 for 2.x ABI
 # * 3.4 or 3.5 for 3.{4,5} ABI
 # * 3.6        for 3.6+ ABI
 # if you want to disable support for some ABI, make the corresponding argument null
-, python2, python35, python36
+, python2, python35, python36, python3
 }:
 stdenv.mkDerivation rec {
   pname = "pyflame";
-  version = "1.6.7"; 
+  version = "1.6.7";
   src = fetchFromGitHub {
     owner = "uber";
     repo = "pyflame";
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
     # some tests will fail in the sandbox
     substituteInPlace tests/test_end_to_end.py \
       --replace 'skipif(IS_DOCKER' 'skipif(True'
+
+    # don't use patchShebangs here to be explicit about the python version
+    substituteInPlace utils/flame-chart-json \
+      --replace '#!usr/bin/env python' '#!${python3.interpreter}'
+  '';
+
+  postInstall = ''
+    install	-D utils/flame-chart-json $out/bin/flame-chart-json
   '';
 
   doCheck = true;

From f7a266d44aa88c314d1f9469c0ab61156bdc700f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 5 Dec 2018 21:13:07 +0900
Subject: [PATCH 173/199] flashplayer: 31.0.0.153 -> 32.0.0.101

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 1acbf4fa57b9..54e7216544e4 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -100,11 +100,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "31.0.0.153";
+    version = "32.0.0.101";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0c7vh1h9lzx09njf7w1acvj2v91girlzflqxzli8nxza7pd1zb2v";
+      sha256 = "1bmmjraqzdz03jzbgs1l932gka1zhiyiis06r4yi4f93mdy31w72";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 9aee9ef8c00e..96db22ecaba8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,25 +74,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "31.0.0.153";
+  version = "32.0.0.101";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9"
+          "0383r5pl1jrspy06mpxq50kkip5q5v052kz9aymk4qylgy1dwpn2"
         else
-          "1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f"
+          "1vx2map0wlj6bj8dqyxxaymmz9awjjfhi6097knpmqp6j8dj7l5g"
       else
         if arch == "x86_64" then
-          "114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc"
+          "003mr9mqkg0agj3zlmci5a1m3lnhj27mnvqswjaffdg5rlihvxyi"
         else
-          "0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327";
+          "1smmdsnnlsssakzqas5268svyv3rk717zr7kwpkj4rd5d1pqwcps";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index b1a22673d015..9713f7d69718 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,19 +50,19 @@
 
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "31.0.0.153";
+  version = "32.0.0.101";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k"
+        "1i59vfhxrlksxwmr3kj3dfbasfjgnx9aimmv400z07fw3zmdrbpw"
       else
-        "0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s";
+        "0fz9zhp0qn9xda5pg37dfnvx04n8d7156h1qayf2l3la94apsacq";
   };
 
   nativeBuildInputs = [ unzip ];

From 0d649c8423cc6ae0bb62b3e208131669cb1dae71 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 5 Dec 2018 18:04:45 +0100
Subject: [PATCH 174/199] qr-filetransfer: init at unstable-2018-10-22

---
 .../networking/qr-filetransfer/default.nix    | 30 +++++++++
 .../tools/networking/qr-filetransfer/deps.nix | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/tools/networking/qr-filetransfer/default.nix
 create mode 100644 pkgs/tools/networking/qr-filetransfer/deps.nix

diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix
new file mode 100644
index 000000000000..581405f63c05
--- /dev/null
+++ b/pkgs/tools/networking/qr-filetransfer/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "qr-filetransfer-unstable-${version}";
+  version = "2018-10-22";
+
+  goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
+
+  src = fetchFromGitHub {
+    rev = "b1e5b91aa2aa469f870c62074e879d46e353edae";
+    owner = "claudiodangelis";
+    repo = "qr-filetransfer";
+    sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/claudiodangelis/qr-filetransfer;
+    description = "Transfer files over wifi by scanning a QR code from your terminal";
+    longDescription = ''
+      qr-filetransfer binds a web server to the address of your Wi-Fi network
+      interface on a random port and creates a handler for it. The default
+      handler serves the content and exits the program when the transfer is
+      complete.
+    '';
+    license = licenses.mit;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/pkgs/tools/networking/qr-filetransfer/deps.nix
new file mode 100644
index 000000000000..a15dd9689433
--- /dev/null
+++ b/pkgs/tools/networking/qr-filetransfer/deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
+      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
+      sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
+      sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
+    };
+  }
+  {
+    goPackagePath = "github.com/mdp/qrterminal";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdp/qrterminal";
+      rev = "6967d3624af633162b77160078e12a4c14174470";
+      sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42";
+      sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/cheggaaa/pb.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/cheggaaa/pb.v1";
+      rev = "007b75a044e968336a69a6c0c617251ab62ac14c";
+      sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/qr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/qr";
+      rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
+      sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0cd819e4c88..c75e9db940f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5062,6 +5062,8 @@ in
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
+
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   quickserve = callPackage ../tools/networking/quickserve { };

From bb0214c991bd00b962767ed91deff40d85243ced Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Mon, 3 Dec 2018 02:28:04 +0100
Subject: [PATCH 175/199] assaultcube: correct version

---
 pkgs/games/assaultcube/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index 6f742bb64f79..71e885a04d34 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
 
   # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix.
   pname = "assaultcube";
-  version = "01052017";
-  name = "${pname}-${version}";
+  version = "unstable-2017-05-01";
 
   meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";

From 015b2b1a3568a0d59a87d4a1a27201e57fb391cc Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 3 Dec 2018 12:31:30 +0100
Subject: [PATCH 176/199] kube-router: init at 0.2.3

---
 .../cluster/kube-router/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kube-router/default.nix

diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix
new file mode 100644
index 000000000000..8caa3cd75245
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kube-router-${version}";
+  version = "0.2.3";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/cloudnativelabs/kube-router";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "cloudnativelabs";
+    repo = "kube-router";
+    sha256 = "1dsr76dq6sycwgh75glrcb4scv52lrrd0aivskhc7mwq30plafcj";
+  };
+
+  buildFlagsArray = ''
+    -ldflags=
+    -X
+    ${goPackagePath}/pkg/cmd.version=${version}
+    -X
+    ${goPackagePath}/pkg/cmd.buildDate=Nix
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.kube-router.io/";
+    description = "All-in-one router, firewall and service proxy for Kubernetes";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ colemickens johanot ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c75e9db940f0..234faea624ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3675,6 +3675,8 @@ in
 
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
+  kube-router = callPackage ../applications/networking/cluster/kube-router { };
+
   kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
 
   peruse = libsForQt5.callPackage ../tools/misc/peruse { };

From 3b445042ac00fb28aa0a74568a2c30f65afde807 Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Thu, 6 Dec 2018 17:22:31 +0100
Subject: [PATCH 177/199] rPackages.littler: fix build (#51282)

littler gives a wrapped called `r` (or `lr` for non-case-preserving
systems like Darwin) which works as shebang or pipe target.

The build was completely broken before (missing deps).

Symlink executables and manpage into standard locations so that this
packages also works in `environment.systemPackages`.
---
 pkgs/development/r-modules/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 428d6c60546e..27b38138f6dc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -950,6 +950,18 @@ let
       preConfigure = "patchShebangs configure";
     });
 
+    littler = old.littler.overrideAttrs (attrs: with pkgs; {
+      buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs;
+      postInstall = ''
+        install -d $out/bin $out/share/man/man1
+        ln -s ../library/littler/bin/r $out/bin/r
+        ln -s ../library/littler/bin/r $out/bin/lr
+        ln -s ../../../library/littler/man-page/r.1 $out/share/man/man1
+        # these won't run without special provisions, so better remove them
+        rm -r $out/library/littler/script-tests
+      '';
+    });
+
   };
 in
   self

From 0c1a4e808aa0ea455c2fda943d286221192bda27 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 6 Dec 2018 16:34:10 +0000
Subject: [PATCH 178/199] libpqxx: fix license

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

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index fbee81ab677a..4aa06c0cd704 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A C++ library to access PostgreSQL databases";
     homepage = http://pqxx.org/development/libpqxx/;
-    license = lib.licenses.postgresql;
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.eelco ];
   };

From c26dbef830a2bc10a0cee7f77936af83116597df Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 3 Dec 2018 21:47:27 +0100
Subject: [PATCH 179/199] luppp: init at 1.2.0

---
 .../audio/luppp/build-install.patch           | 16 ++++++++
 pkgs/applications/audio/luppp/default.nix     | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/audio/luppp/build-install.patch
 create mode 100644 pkgs/applications/audio/luppp/default.nix

diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch
new file mode 100644
index 000000000000..4dae65438cb5
--- /dev/null
+++ b/pkgs/applications/audio/luppp/build-install.patch
@@ -0,0 +1,16 @@
+commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090
+Author: Pavol Rusnak <stick@gk2.sk>
+Date:   Tue Dec 4 12:06:22 2018 +0100
+
+    build: add install: true to executable in meson.build
+
+diff --git a/meson.build b/meson.build
+index 050e1b1..9224ed5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -39,4 +39,5 @@ endforeach
+ 
+ # compile the main project
+ executable('luppp', luppp_src + [version_hxx],
++    install: true,
+     dependencies: deps)
diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix
new file mode 100644
index 000000000000..fdba836a6ae2
--- /dev/null
+++ b/pkgs/applications/audio/luppp/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, jack2
+, cairo
+, liblo
+, libsndfile
+, libsamplerate
+, ntk
+}:
+
+stdenv.mkDerivation rec {
+  pname = "luppp";
+  version = "1.2.0";
+  patches = [ ./build-install.patch ];
+
+  src = fetchFromGitHub {
+    owner = "openAVproductions";
+    repo = "openAV-Luppp";
+    rev = "release-${version}";
+    sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig
+  ];
+
+  buildInputs = [
+    jack2 cairo liblo libsndfile libsamplerate ntk
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://openavproductions.com/luppp/;
+    description = "A music creation tool, intended for live use";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ prusnak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 234faea624ff..293935a51e1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17878,6 +17878,8 @@ in
     lua = lua5_1;
   };
 
+  luppp = callPackage ../applications/audio/luppp { };
+
   lv2bm = callPackage ../applications/audio/lv2bm { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };

From ce728ce4960cef3d9d5586206c2130d6542f8b70 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 6 Dec 2018 22:10:41 +0200
Subject: [PATCH 180/199] python: astroid: 2.0.4 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index d773c08e189a..4cef66a5c2e9 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.0.4";
+  version = "2.1.0";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
+    sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m";
   };
 
   # From astroid/__pkginfo__.py

From 6b5963ea2266e2c37c43ed9c7bdc8ad4ebfb0540 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 6 Dec 2018 22:11:12 +0200
Subject: [PATCH 181/199] python: pylint: 2.1.1 -> 2.2.2

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 4f4eb3cfc731..d5eec0f73bd1 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.1.1";
+  version = "2.2.2";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
+    sha256 = "14klyan9lqanyi8qhrbn65k7bgv9p7i7ply662r2lr27wydf57b8";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

From 007e177f90408bc0f549731642c6fddf88f399ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCr?= <gurkan.gur@innogames.com>
Date: Thu, 6 Dec 2018 19:36:01 +0100
Subject: [PATCH 182/199] passExtensions.pass-genphrase: init at 0.1

---
 maintainers/maintainer-list.nix               |  5 +++
 .../security/pass/extensions/default.nix      |  1 +
 .../security/pass/extensions/genphrase.nix    | 32 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/security/pass/extensions/genphrase.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8058927a9c4a..1c8ee9ff8e1d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3940,6 +3940,11 @@
     github = "seppeljordan";
     name = "Sebastian Jordan";
   };
+  seqizz = {
+    email = "seqizz@gmail.com";
+    github = "seqizz";
+    name = "Gurkan Gur";
+  };
   sfrijters = {
     email = "sfrijters@gmail.com";
     github = "sfrijters";
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
index f69687e512b8..96d79a8daceb 100644
--- a/pkgs/tools/security/pass/extensions/default.nix
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -12,4 +12,5 @@ with pkgs;
   pass-otp = callPackage ./otp.nix {};
   pass-tomb = callPackage ./tomb.nix {};
   pass-update = callPackage ./update.nix {};
+  pass-genphrase = callPackage ./genphrase.nix {};
 }
diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix
new file mode 100644
index 000000000000..0413234bad2a
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@@ -0,0 +1,32 @@
+{ stdenv, pass, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "pass-genphrase-${version}";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "congma";
+    repo = "pass-genphrase";
+    rev = "${version}";
+    sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd";
+  };
+
+  dontBuild = true;
+
+  installTargets = "globalinstall";
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    substituteInPlace $out/lib/password-store/extensions/genphrase.bash \
+      --replace '$EXTENSIONS' "$out/lib/password-store/extensions/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that generates memorable passwords";
+    homepage = https://github.com/congma/pass-genphrase;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ seqizz ];
+    platforms = platforms.unix;
+  };
+}

From 20c6acb4360a005555127aa90f32c4bcb4c6ebe3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 11:51:28 +0100
Subject: [PATCH 183/199] tdesktopPackages.preview: 1.4.7 -> 1.4.8

---
 .../telegram/tdesktop/default.nix                 |  4 ++--
 .../telegram/tdesktop/generic.nix                 | 15 +++++++++++++--
 2 files changed, 15 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 b5994d03bc68..6953b3bc6e8e 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -13,8 +13,8 @@ let
 in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
-    version = "1.4.7";
-    sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp";
+    version = "1.4.8";
+    sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj";
     stable = false;
   });
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 7736c8b66bd1..900e0980e74c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -8,7 +8,15 @@
 
 with lib;
 
-mkDerivation rec {
+let
+  # TODO: Not optimal (maybe we should only package the stable versions)
+  previewPatches = fetchFromGitHub {
+    owner = "primeos";
+    repo = "nixpkgs-tdesktop-patches";
+    rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6";
+    sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9";
+  };
+in mkDerivation rec {
   name = "telegram-desktop-${version}";
   inherit version;
 
@@ -29,7 +37,10 @@ mkDerivation rec {
   };
 
   # TODO: libtgvoip.patch no-gtk2.patch
-  patches = [ "${archPatches}/tdesktop.patch" ]
+  patches =
+    (if stable
+      then [ "${archPatches}/tdesktop.patch" ]
+      else [ "${previewPatches}/tdesktop.patch" ])
     # TODO: Only required to work around a compiler bug.
     # This should be fixed in GCC 7.3.1 (or later?)
     ++ [ ./fix-internal-compiler-error.patch ];

From 3a905059a7bd30ac41c804fc487a7270c7528b8b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 21:53:41 +0100
Subject: [PATCH 184/199] androidStudioPackages.{dev,canary}: 3.4.0.5 ->
 3.4.0.6

---
 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 de7e3977ad83..c8c6d74868a8 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.5"; # "Android Studio 3.4 Canary 6"
-    build = "183.5146016";
-    sha256Hash = "1z2asimpsw15iild7c4aqicph6v327qx3ffjgvl2n8vr5rspsns1";
+    version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"
+    build = "183.5159543";
+    sha256Hash = "0r685qqx4w1hwbd8jgrh7ks8bw9m7823ffhd3x6pl7j4b9hpc858";
   };
 in rec {
   # Old alias

From 577d73e486e5899132ff24b2c248e8ec56a26aec Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Dec 2018 21:58:25 +0100
Subject: [PATCH 185/199] androidStudioPackages.beta: 3.3.0.17 -> 3.3.0.18

---
 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 c8c6d74868a8..8e54dd6f9eea 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
   };
   betaVersion = {
-    version = "3.3.0.17"; # "Android Studio 3.3 RC 1"
-    build = "182.5138683";
-    sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7";
+    version = "3.3.0.18"; # "Android Studio 3.3 RC 2"
+    build = "182.5160847";
+    sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5";
   };
   latestVersion = { # canary & dev
     version = "3.4.0.6"; # "Android Studio 3.4 Canary 7"

From 67aa6cd8777206bede8d9ded039f540773d8ece4 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 6 Dec 2018 15:13:56 -0600
Subject: [PATCH 186/199] btrfs-progs: 4.19 -> 4.19.1

Fixes build of snapper
---
 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 252f25ad8fa8..8f3d41e8f4e9 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
-  version = "4.19";
+  version = "4.19.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm";
+    sha256 = "1f7gpk9206ph081fr0af8k57i58zjb03xwd8k69177a7rzsjmn04";
   };
 
   nativeBuildInputs = [

From d01082aebc354d4aadf0f266ec0423d6098f7486 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Fri, 7 Dec 2018 00:18:09 +0100
Subject: [PATCH 187/199] tectonic: 0.1.9 -> 0.1.11

- handles unicode filenames correctly (since 0.1.10)
- switch to hopefully more reliable permantent URL for the default bundle (in 0.1.11)
---
 pkgs/tools/typesetting/tectonic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index bcc69c7b223e..e49707256c31 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tectonic-${version}";
-  version = "0.1.9";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "v${version}";
-    sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq";
+    sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x";
   };
 
-  cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq";
+  cargoSha256 = "1zgav5zxfvdnrr7himykj5ha20cb5ldxpcpl8y6d19dirxvcmpc6";
 
   nativeBuildInputs = [ pkgconfig ];
 

From b17eaa3aa96d5d2153301860087f569a7e553a82 Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Sun, 2 Dec 2018 22:26:10 -0500
Subject: [PATCH 188/199] scrcpy: 1.3 -> 1.5

---
 pkgs/misc/scrcpy/default.nix | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index b446363d7f3b..afe8c0b7b676 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "1.3";
+  version = "1.5";
   prebuilt_server = fetchurl {
-    url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
-    sha256 = "1ha04wfmghblwr9ajfl96cswacfgrk0b7klq2ixfvw1kgwhmm6hg";
+    url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar";
+    sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr";
   };
 in
 stdenv.mkDerivation rec {
@@ -21,10 +21,23 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Genymobile";
     repo = "scrcpy";
-    rev = "v${version}";
-    sha256 = "02szi8w3w0lacyz42hlayxififi863qpm63yg9qir3jcl2vs7vdk";
+    rev = "v${version}-fixversion";
+    sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i";
   };
 
+  # postPatch:
+  #   screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
+  #   This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
+  #   It would be better to fix the OpenGL problem, but that seems much more intrusive.
+  #
+  #   command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally.
+  postPatch = ''
+    substituteInPlace app/src/screen.c \
+      --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
+    substituteInPlace app/src/command.c \
+      --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};'
+  '';
+
   nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];
 
   buildInputs = [ ffmpeg SDL2 ];
@@ -34,6 +47,7 @@ stdenv.mkDerivation rec {
     echo -n > server/meson.build
   '';
 
+  mesonFlags = ["-Doverride_server_path=${prebuilt_server}"];
   postInstall = ''
     mkdir -p "$out/share/scrcpy"
     ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar"

From 5256cfd006a046ddc2ef9aba95091b79afe32600 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 6 Dec 2018 21:33:39 -0500
Subject: [PATCH 189/199] vivaldi: correct hash

Fixes #51635
---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 89dd6775719a..e3269f15ac63 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "08x6abyz65vx4ycj8ys8sib9z1adb8ybmnrqjck69b30kbz78rj2";
+    sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
   };
 
   unpackPhase = ''

From b684e3d24b9ad824dfe77112f6abe3aa640a884e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Nov 2018 02:24:54 +0000
Subject: [PATCH 190/199] ocamlPackages.javalib: 2.3.5 -> 3.0

ocamlPackages.sawja: 1.5.3 -> 1.5.6
---
 .../ocaml-modules/javalib/default.nix         | 19 ++++++-------------
 .../ocaml-modules/sawja/default.nix           |  6 +++---
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 6e533092dc64..dde86bf3e526 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, ocaml, findlib, camlp4
+{ stdenv, fetchzip, which, ocaml, findlib, camlp4
 , camlzip, camomile, extlib
 }:
 
@@ -8,15 +8,14 @@ else
 
 let
   pname = "javalib";
-  webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "2.3.5";
+  version = "3.0";
 
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2";
-    sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd";
+  src = fetchzip {
+    url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
+    sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
   };
 
   buildInputs = [ which ocaml findlib camlp4 ];
@@ -30,17 +29,11 @@ stdenv.mkDerivation rec {
   configureScript = "./configure.sh";
   dontAddPrefix = "true";
 
-  preBuild = ''
-    make ptrees;
-    make installptrees;
-    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
-  '';
-
   propagatedBuildInputs = [ camlzip camomile extlib ];
 
   meta = with stdenv.lib; {
     description = "A library that parses Java .class files into OCaml data structures";
-    homepage = "${webpage}";
+    homepage = https://javalib-team.github.io/javalib/;
     license = licenses.lgpl3;
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 92d9cef351bf..94120f2f8b9d 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
 let
   pname = "sawja";
-  version = "1.5.3";
+  version = "1.5.6";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2;
-    sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2";
+    url = https://gforge.inria.fr/frs/download.php/file/37819/sawja-1.5.6.tar.bz2;
+    sha256 = "0dkfdc8h94r7kj4p8q57fz7fssypgmjrix8xff0va7x1nya5sdp3";
   };
 
   buildInputs = [ which perl ocaml findlib camlp4 ];

From 9852c74249cddb0bd857efc235205b7b1a68071e Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Sat, 1 Dec 2018 16:12:52 -0500
Subject: [PATCH 191/199] teyjus: fix build by using omake from ocaml 4.02
 package set

---
 pkgs/top-level/all-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c03f3c85d27b..7111ff722eac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7534,10 +7534,11 @@ in
     lua = lua5_1;
   };
 
-  teyjus = callPackage ../development/compilers/teyjus {
-    inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
-    omake = omake_rc1;
-  };
+  teyjus = callPackage ../development/compilers/teyjus (
+    with ocaml-ng.ocamlPackages_4_02; {
+      inherit ocaml;
+      omake = omake_rc1;
+  });
 
   thrust = callPackage ../development/tools/thrust {
     gconf = pkgs.gnome2.GConf;

From cf9743da48aeb0da81f0932f09ea47bbc14e89e5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@ramanujan>
Date: Sun, 2 Dec 2018 12:17:49 -0500
Subject: [PATCH 192/199] remove omake_rc1 from all-packages.nix since it
 doesn't build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7111ff722eac..2ebb6f6f7b48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8814,8 +8814,6 @@ in
 
   omake = callPackage ../development/tools/ocaml/omake { };
 
-  inherit (ocamlPackages) omake_rc1;
-
   omniorb = callPackage ../development/tools/omniorb { };
 
   opengrok = callPackage ../development/tools/misc/opengrok { };

From 88b48753acfa4403b2d0676ca5b097882c474882 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:39:24 -0500
Subject: [PATCH 193/199] flow: 0.86.0 -> 0.87.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 175114017f30..9457e88ed834 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "0.86.0";
+  version = "0.87.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp";
+    sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k";
   };
 
   installPhase = ''

From 0c9abf6436dca26e686c89c2be2e21713b36e38b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 7 Dec 2018 04:22:10 +0000
Subject: [PATCH 194/199] ocamlPackages.camlimages: 5.0.0 -> 5.0.1

---
 pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index 065c5a650b84..8b0b70cae60e 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
+{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }:
 
 buildDunePackage rec {
   pname = "camlimages";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchzip {
     url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz";
-    sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
+    sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5";
   };
 
   buildInputs = [ configurator cppo lablgtk ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     branch = "5.0";
     homepage = https://bitbucket.org/camlspotter/camlimages;
     description = "OCaml image processing library";

From 776f084cf1bc7d174184e2d51b224e168fcd6fa4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 7 Dec 2018 05:56:53 +0100
Subject: [PATCH 195/199] nixos/tests: Fix wrong arch in runInMachine test

Since 83b27f60ceff23967e477c90bef8e78cc96d50a2, the tests were moved
into all-tests.nix and some of the tooling has changed so that
subattributes of test expressions are now recursively evaluated until a
derivation with a .test attribute has been found.

Unfortunately this isn't the case for all of the tests and the
runInMachine doesn't use the makeTest function other tests are using but
instead uses runInMachine, which doesn't generate a .test attribute.

Whener a .test attribute wasn't found by the new handleTest function, it
recurses down again until there is no value left that is an attribute
set and subsequently returns its unchanged value. This however has the
drawback that instead of getting different attributes for each
architecture we only get the last architecture in the supportedSystems
list.

In the case of the release.nix, the last architecture in
supportedSystems is "aarch64-linux", so the runInMachine test is always
built on that architecture.

In order to work around this, I changed runInMachine to emit a .test
attribute so that it looks to handleTest like it was a test created via
makeTest.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/tests/run-in-machine.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 116f5dc28a62..339a4b9a7404 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -10,11 +10,14 @@ let
     drv = pkgs.hello;
     machine = { ... }: { /* services.sshd.enable = true; */ };
   };
-in pkgs.runCommand "verify-output" { inherit output; } ''
-  if [ ! -e "$output/bin/hello" ]; then
-    echo "Derivation built using runInMachine produced incorrect output:" >&2
-    ls -laR "$output" >&2
-    exit 1
-  fi
-  "$output/bin/hello" > "$out"
-''
+
+  test = pkgs.runCommand "verify-output" { inherit output; } ''
+    if [ ! -e "$output/bin/hello" ]; then
+      echo "Derivation built using runInMachine produced incorrect output:" >&2
+      ls -laR "$output" >&2
+      exit 1
+    fi
+    "$output/bin/hello" > "$out"
+  '';
+
+in test // { inherit test; } # To emulate behaviour of makeTest

From 0fc90852d9eef3b7e50a351fe4800a44e482f5db Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Fri, 7 Dec 2018 11:35:16 +0100
Subject: [PATCH 196/199] bloop: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index c535740e5c82..c53ff2b505fd 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.1.0";
+  version = "1.1.1";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,12 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "090ig5k1bd3pv4i8x6byyf9wda1430xysnbcllflcz6cf2ccjy2k";
+    outputHash     = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "0c8b937b";
+  nailgunCommit = "6992a3bf";
 
   buildInputs = [ jdk makeWrapper deps ];
 

From bf050b13b0c10c9ffdb8d6c59edd973755c7c515 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Fri, 7 Dec 2018 13:19:04 +0100
Subject: [PATCH 197/199] libopusenc: init at 0.2.1

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

diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
new file mode 100644
index 000000000000..4ca0849447f3
--- /dev/null
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, libopus }:
+
+let
+  version = "0.2.1";
+in
+stdenv.mkDerivation rec {
+  name = "libopusenc-${version}";
+
+  src = fetchurl {
+    url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
+    sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  doCheck = true;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libopus ];
+
+  meta = with stdenv.lib; {
+    description = "Library for encoding .opus audio files and live streams";
+    license = licenses.bsd3;
+    homepage = http://www.opus-codec.org/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebb6f6f7b48..a9a1a08efca1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11123,6 +11123,8 @@ in
 
   libopus = callPackage ../development/libraries/libopus { };
 
+  libopusenc = callPackage ../development/libraries/libopusenc { };
+
   libosinfo = callPackage ../development/libraries/libosinfo {
     inherit (gnome3) libsoup;
   };

From 3df463d351df149eb0657a2f01836dc648e98c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 7 Dec 2018 14:16:26 +0100
Subject: [PATCH 198/199] seafile-shared: 6.2.7 -> 6.2.8

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

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 2cff1edfc51e..a1f695641664 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec {
-  version = "6.2.7";
+  version = "6.2.8";
   name = "seafile-shared-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "0f8h7x6q830q4pw6f6bbykiyj3lkdlgvjzg2sdaqm4bhj2c4k1n0";
+    sha256 = "1sgrsj60gy4pqxjz1rxn4nyzmc67x3kx16kd2vmwbzr44hasnp46";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

From cb2a447c510848c925977c0ecc440eef7443c12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 7 Dec 2018 14:16:49 +0100
Subject: [PATCH 199/199] seafile-client: 6.2.7 -> 6.2.8

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

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 3e6a057c422b..5ac50da649d9 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.2.7";
+  version = "6.2.8";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "16ikl6vkp9v16608bq2sfg48idn2p7ik3q8n6j866zxkmgdvkpsg";
+    sha256 = "1y57cw789cmssgl39kj94q259kba08v5i1yc1cmx7qxyigrpwyv6";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];