Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'

author: Alyssa Ross <hi@alyssa.is> 2019-06-18 18:30:18 +0000
committer: Alyssa Ross <hi@alyssa.is> 2019-06-18 18:30:18 +0000
commit: ef93931efff0323fd13c4270415b578c73b5ef35 (patch)
tree: e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs
parent: c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff)
parent: a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff)
download: nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip
396 files changed, 14014 insertions, 9482 deletions
diff --git a/nixpkgs/lib/licenses.nix b/nixpkgs/lib/licenses.nix
index 3b9d7f1986fc..c964060d2a5c 100644
--- a/nixpkgs/lib/licenses.nix
+++ b/nixpkgs/lib/licenses.nix
@@ -457,9 +457,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "libpng License";
   };
 
-  libpng2 = {
-    fullName = "libpng License v2"; # 1.6.36+
-    url = "http://www.libpng.org/pub/png/src/libpng-LICENSE.txt";
+  libpng2 = spdx {
+    spdxId = "libpng-2.0"; # Used since libpng 1.6.36.
+    fullName = "PNG Reference Library version 2";
   };
 
   libtiff = spdx {
diff --git a/nixpkgs/lib/options.nix b/nixpkgs/lib/options.nix
index a16a980398d6..d2eae3ae3a98 100644
--- a/nixpkgs/lib/options.nix
+++ b/nixpkgs/lib/options.nix
@@ -101,7 +101,7 @@ rec {
   mergeOneOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then
-      throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
+      throw "The unique option `${showOption loc}' is defined multiple times, in:\n - ${concatStringsSep "\n - " (getFiles defs)}."
     else (head defs).value;
 
   /* "Merge" option definitions by checking that they all have the same value. */
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix
index 91f5f7c26f14..12c663170600 100644
--- a/nixpkgs/maintainers/maintainer-list.nix
+++ b/nixpkgs/maintainers/maintainer-list.nix
@@ -507,6 +507,11 @@
     github = "aszlig";
     name = "aszlig";
   };
+  athas = {
+    email = "athas@sigkill.dk";
+    github = "athas";
+    name = "Troels Henriksen";
+  };
   atnnn = {
     email = "etienne@atnnn.com";
     github = "atnnn";
@@ -1333,6 +1338,11 @@
     github = "dmjio";
     name = "David Johnson";
   };
+  dmvianna = {
+    email = "dmlvianna@gmail.com";
+    github = "dmvianna";
+    name = "Daniel Vianna";
+  };
   dochang = {
     email = "dochang@gmail.com";
     github = "dochang";
@@ -5160,6 +5170,11 @@
     github = "tobimpub";
     name = "Tobias Mayer";
   };
+  tobiasBora = {
+    email = "tobias.bora.list@gmail.com";
+    github = "tobiasBora";
+    name = "Tobias Bora";
+  };
   tohl = {
     email = "tom@logand.com";
     github = "tohl";
diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml
index 951040a0648f..2a3e565a6f6a 100644
--- a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml
@@ -137,6 +137,40 @@
     </para>
    </listitem>
    <listitem>
+     <para>
+      The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option>
+      was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option>
+      (capital <literal>L</literal>). This follows
+      <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c">
+        upstreams renaming
+      </link> of the setting.
+     </para>
+   </listitem>
+   <listitem>
+    <para>
+      As of this release the NixOps feature <literal>autoLuks</literal> is deprecated. It no longer works
+      with our systemd version without manual intervention.
+    </para>
+    <para>
+      Whenever the usage of the module is detected the evaluation will fail with a message
+      explaining why and how to deal with the situation.
+    </para>
+    <para>
+      A new knob named <literal>nixops.enableDeprecatedAutoLuks</literal>
+      has been introduced to disable the eval failure and to acknowledge the notice was received and read.
+      If you plan on using the feature please note that it might break with subsequent updates.
+    </para>
+    <para>
+      Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block
+      devices provided by the autoLuks module. Not doing this might render the system in a
+      state where it doesn't boot anymore.
+    </para>
+    <para>
+      If you are actively using the <literal>autoLuks</literal> module please let us know in
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue #62211</link>.
+    </para>
+  </listitem>
+  <listitem>
     <para>
       The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
       <xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
@@ -211,6 +245,50 @@
       RuntimeDirectory and tmpfiles.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      With the upgrade to systemd version 242 the <literal>systemd-timesyncd</literal>
+      service is no longer using <literal>DynamicUser=yes</literal>. In order for the
+      upgrade to work we rely on an activation script to move the state from the old
+      to the new directory. The older directory (prior <literal>19.09</literal>) was
+      <literal>/var/lib/private/systemd/timesync</literal>.
+    </para>
+    <para>
+      As long as the <literal>system.config.stateVersion</literal> is below
+      <literal>19.09</literal> the state folder will migrated to its proper location
+      (<literal>/var/lib/systemd/timesync</literal>), if required.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      Since version 0.1.19, <literal>cargo-vendor</literal> honors package
+      includes that are specified in the <filename>Cargo.toml</filename>
+      file of Rust crates. <literal>rustPlatform.buildRustPackage</literal> uses
+      <literal>cargo-vendor</literal> to collect and build dependent crates.
+      Since this change in <literal>cargo-vendor</literal> changes the set of
+      vendored files for most Rust packages, the hash that use used to verify
+      the dependencies, <literal>cargoSha256</literal>, also changes.
+    </para>
+    <para>
+      The <literal>cargoSha256</literal> hashes of all in-tree derivations that
+      use <literal>buildRustPackage</literal> have been updated to reflect this
+      change. However, third-party derivations that use
+      <literal>buildRustPackage</literal> may have to be updated as well.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+      The default resample-method for PulseAudio has been changed from the upstream default <literal>speex-float-1</literal>
+      to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this
+      so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
+     <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixpkgs/nixos/modules/config/pulseaudio.nix b/nixpkgs/nixos/modules/config/pulseaudio.nix
index e61a3a731201..5c3e39302583 100644
--- a/nixpkgs/nixos/modules/config/pulseaudio.nix
+++ b/nixpkgs/nixos/modules/config/pulseaudio.nix
@@ -245,6 +245,9 @@ in {
       # Disable flat volumes to enable relative ones
       hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no";
 
+      # Upstream defaults to speex-float-1 which results in audible artifacts
+      hardware.pulseaudio.daemon.config.resample-method = mkDefault "speex-float-5";
+
       # Allow PulseAudio to get realtime priority using rtkit.
       security.rtkit.enable = true;
 
diff --git a/nixpkgs/nixos/modules/installer/netboot/netboot.nix b/nixpkgs/nixos/modules/installer/netboot/netboot.nix
index 303d9fce3f9a..cdfba5ab9e31 100644
--- a/nixpkgs/nixos/modules/installer/netboot/netboot.nix
+++ b/nixpkgs/nixos/modules/installer/netboot/netboot.nix
@@ -65,8 +65,7 @@ with lib;
       [ config.system.build.toplevel ];
 
     # Create the squashfs image that contains the Nix store.
-    system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
-      inherit (pkgs) stdenv squashfsTools closureInfo;
+    system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix {
       storeContents = config.netboot.storeContents;
     };
 
diff --git a/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
index b7e5b99a9e01..0ccdac30d915 100644
--- a/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -258,6 +258,11 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") {
     }
 }
 
+# Add bcache module, if needed.
+my @bcacheDevices = glob("/dev/bcache*");
+if (scalar @bcacheDevices > 0) {
+    push @initrdAvailableKernelModules, "bcache";
+}
 
 my $virt = `systemd-detect-virt`;
 chomp $virt;
diff --git a/nixpkgs/nixos/modules/misc/nixops-autoluks.nix b/nixpkgs/nixos/modules/misc/nixops-autoluks.nix
new file mode 100644
index 000000000000..2153c6f975ad
--- /dev/null
+++ b/nixpkgs/nixos/modules/misc/nixops-autoluks.nix
@@ -0,0 +1,44 @@
+{ config, options, lib, ... }:
+let
+  path = [ "deployment" "autoLuks" ];
+  hasAutoLuksOption = lib.hasAttrByPath path options;
+  hasAutoLuksConfig = lib.hasAttrByPath path config && (lib.attrByPath path {} config) != {};
+
+  inherit (config.nixops) enableDeprecatedAutoLuks;
+in {
+  options.nixops.enableDeprecatedAutoLuks = lib.mkEnableOption "Enable the deprecated NixOps AutoLuks module";
+
+  config = {
+    assertions = [
+      {
+        assertion = if hasAutoLuksConfig then hasAutoLuksConfig && enableDeprecatedAutoLuks else true;
+        message = ''
+          ⚠️  !!! WARNING !!! ⚠️
+
+            NixOps autoLuks is deprecated. The feature was never widely used and the maintenance did outgrow the benefit.
+            If you still want to use the module:
+              a) Please raise your voice in the issue tracking usage of the module:
+                 https://github.com/NixOS/nixpkgs/issues/62211
+              b) make sure you set the `_netdev` option for each of the file
+                 systems referring to block devices provided by the autoLuks module.
+
+                 ⚠️ If you do not set the option your system will not boot anymore! ⚠️
+
+                  {
+                    fileSystems."/secret" = { options = [ "_netdev" ]; };
+                  }
+
+              b) set the option >nixops.enableDeprecatedAutoLuks = true< to remove this error.
+
+
+            For more details read through the following resources:
+              - https://github.com/NixOS/nixops/pull/1156
+              - https://github.com/NixOS/nixpkgs/issues/47550
+              - https://github.com/NixOS/nixpkgs/issues/62211
+              - https://github.com/NixOS/nixpkgs/pull/61321
+        '';
+      }
+    ];
+  };
+
+}
diff --git a/nixpkgs/nixos/modules/misc/version.nix b/nixpkgs/nixos/modules/misc/version.nix
index c576cf4cb925..c9b374b6d7b1 100644
--- a/nixpkgs/nixos/modules/misc/version.nix
+++ b/nixpkgs/nixos/modules/misc/version.nix
@@ -95,6 +95,7 @@ in
         PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
         LOGO="nix-snowflake"
         HOME_URL="https://nixos.org/"
+        DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html"
         SUPPORT_URL="https://nixos.org/nixos/support.html"
         BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
       '';
diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix
index 062f2bca8df1..12ecec62a226 100644
--- a/nixpkgs/nixos/modules/module-list.nix
+++ b/nixpkgs/nixos/modules/module-list.nix
@@ -84,6 +84,7 @@
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
+  ./misc/nixops-autoluks.nix
   ./programs/adb.nix
   ./programs/atop.nix
   ./programs/autojump.nix
@@ -91,6 +92,7 @@
   ./programs/bcc.nix
   ./programs/blcr.nix
   ./programs/browserpass.nix
+  ./programs/captive-browser.nix
   ./programs/ccache.nix
   ./programs/cdemu.nix
   ./programs/chromium.nix
@@ -327,6 +329,7 @@
   ./services/hardware/tcsd.nix
   ./services/hardware/tlp.nix
   ./services/hardware/thinkfan.nix
+  ./services/hardware/throttled.nix
   ./services/hardware/trezord.nix
   ./services/hardware/triggerhappy.nix
   ./services/hardware/u2f.nix
@@ -442,7 +445,6 @@
   ./services/misc/packagekit.nix
   ./services/misc/paperless.nix
   ./services/misc/parsoid.nix
-  ./services/misc/phd.nix
   ./services/misc/plex.nix
   ./services/misc/tautulli.nix
   ./services/misc/pykms.nix
diff --git a/nixpkgs/nixos/modules/programs/captive-browser.nix b/nixpkgs/nixos/modules/programs/captive-browser.nix
new file mode 100644
index 000000000000..55d474e5c9db
--- /dev/null
+++ b/nixpkgs/nixos/modules/programs/captive-browser.nix
@@ -0,0 +1,122 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.captive-browser;
+in
+{
+  ###### interface
+
+  options = {
+    programs.captive-browser = {
+      enable = mkEnableOption "captive browser";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.captive-browser;
+        defaultText = "pkgs.captive-browser";
+        description = "Which package to use for captive-browser";
+      };
+
+      interface = mkOption {
+        type = types.str;
+        description = "your public network interface (wlp3s0, wlan0, eth0, ...)";
+      };
+
+      # the options below are the same as in "captive-browser.toml"
+      browser = mkOption {
+        type = types.str;
+        default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium''
+                                         ''--user-data-dir=$HOME/.chromium-captive''
+                                         ''--proxy-server="socks5://$PROXY"''
+                                         ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
+                                         ''--no-first-run''
+                                         ''--new-window''
+                                         ''--incognito''
+                                         ''http://cache.nixos.org/''
+                                       ];
+        description = ''
+          The shell (/bin/sh) command executed once the proxy starts.
+          When browser exits, the proxy exits. An extra env var PROXY is available.
+
+          Here, we use a separate Chrome instance in Incognito mode, so that
+          it can run (and be waited for) alongside the default one, and that
+          it maintains no state across runs. To configure this browser open a
+          normal window in it, settings will be preserved.
+
+          @volth: chromium is to open a plain HTTP (not HTTPS nor redirect to HTTPS!) website.
+                  upstream uses http://example.com but I have seen captive portals whose DNS server resolves "example.com" to 127.0.0.1
+        '';
+      };
+
+      dhcp-dns = mkOption {
+        type = types.str;
+        description = ''
+          The shell (/bin/sh) command executed to obtain the DHCP
+          DNS server address. The first match of an IPv4 regex is used.
+          IPv4 only, because let's be real, it's a captive portal.
+        '';
+      };
+
+      socks5-addr = mkOption {
+        type = types.str;
+        default = "localhost:1666";
+        description = ''the listen address for the SOCKS5 proxy server'';
+      };
+
+      bindInterface = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Binds <package>captive-browser</package> to the network interface declared in
+          <literal>cfg.interface</literal>. This can be used to avoid collisions
+          with private subnets.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    programs.captive-browser.dhcp-dns = mkOptionDefault (
+      if config.networking.networkmanager.enable then
+        "${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
+      else if config.networking.dhcpcd.enable then
+        "${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
+      else if config.networking.useNetworkd then
+        "${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}"
+      else
+        "${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${
+            pkgs.writeScript "udhcp-script" ''
+              #!/bin/sh
+              if [ "$1" = bound ]; then
+                echo "$dns"
+              fi
+            ''}"
+    );
+
+    security.wrappers.udhcpc = {
+      capabilities  = "cap_net_raw+p";
+      source        = "${pkgs.busybox}/bin/udhcpc";
+    };
+
+    security.wrappers.captive-browser = {
+      capabilities  = "cap_net_raw+p";
+      source        = pkgs.writeScript "captive-browser" ''
+                        #!${pkgs.bash}/bin/bash
+                        export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
+                                                  browser = """${cfg.browser}"""
+                                                  dhcp-dns = """${cfg.dhcp-dns}"""
+                                                  socks5-addr = """${cfg.socks5-addr}"""
+                                                  ${optionalString cfg.bindInterface ''
+                                                    bind-device = """${cfg.interface}"""
+                                                  ''}
+                                                ''}
+                        exec ${cfg.package}/bin/captive-browser
+                      '';
+    };
+  };
+}
diff --git a/nixpkgs/nixos/modules/services/databases/cassandra.nix b/nixpkgs/nixos/modules/services/databases/cassandra.nix
index 688938868020..e2ea9fcda6b0 100644
--- a/nixpkgs/nixos/modules/services/databases/cassandra.nix
+++ b/nixpkgs/nixos/modules/services/databases/cassandra.nix
@@ -8,18 +8,21 @@ let
   cassandraConfig = flip recursiveUpdate cfg.extraConfig
     ({ commitlog_sync = "batch";
        commitlog_sync_batch_window_in_ms = 2;
+       start_native_transport = cfg.allowClients;
+       cluster_name = cfg.clusterName;
        partitioner = "org.apache.cassandra.dht.Murmur3Partitioner";
        endpoint_snitch = "SimpleSnitch";
-       seed_provider =
-         [{ class_name = "org.apache.cassandra.locator.SimpleSeedProvider";
-            parameters = [ { seeds = "127.0.0.1"; } ];
-         }];
        data_file_directories = [ "${cfg.homeDir}/data" ];
        commitlog_directory = "${cfg.homeDir}/commitlog";
        saved_caches_directory = "${cfg.homeDir}/saved_caches";
-     } // (if builtins.compareVersions cfg.package.version "3" >= 0
-             then { hints_directory = "${cfg.homeDir}/hints"; }
-             else {})
+     } // (lib.optionalAttrs (cfg.seedAddresses != []) {
+       seed_provider = [{
+         class_name = "org.apache.cassandra.locator.SimpleSeedProvider";
+         parameters = [ { seeds = concatStringsSep "," cfg.seedAddresses; } ];
+       }];
+     }) // (lib.optionalAttrs (lib.versionAtLeast cfg.package.version "3") {
+       hints_directory = "${cfg.homeDir}/hints";
+     })
     );
   cassandraConfigWithAddresses = cassandraConfig //
     ( if cfg.listenAddress == null
@@ -39,15 +42,42 @@ let
         mkdir -p "$out"
 
         echo "$cassandraYaml" > "$out/cassandra.yaml"
-        ln -s "$cassandraEnvPkg" "$out/cassandra-env.sh"
         ln -s "$cassandraLogbackConfig" "$out/logback.xml"
+
+        cp "$cassandraEnvPkg" "$out/cassandra-env.sh"
+
+        # Delete default JMX Port, otherwise we can't set it using env variable
+        sed -i '/JMX_PORT="7199"/d' "$out/cassandra-env.sh"
+
+        # Delete default password file
+        sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh"
       '';
     };
+  defaultJmxRolesFile = builtins.foldl'
+     (left: right: left + right) ""
+     (map (role: "${role.username} ${role.password}") cfg.jmxRoles);
+  fullJvmOptions = cfg.jvmOpts
+    ++ lib.optionals (cfg.jmxRoles != []) [
+      "-Dcom.sun.management.jmxremote.authenticate=true"
+      "-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}"
+    ]
+    ++ lib.optionals cfg.remoteJmx [
+      "-Djava.rmi.server.hostname=${cfg.rpcAddress}"
+    ];
 in {
   options.services.cassandra = {
     enable = mkEnableOption ''
       Apache Cassandra – Scalable and highly available database.
     '';
+    clusterName = mkOption {
+      type = types.str;
+      default = "NixOS Test Cluster";
+      description = ''
+        The name of the cluster.
+        This setting prevents nodes in one logical cluster from joining
+        another. All nodes in a cluster must have the same value.
+      '';
+    };
     user = mkOption {
       type = types.str;
       default = defaultUser;
@@ -162,6 +192,28 @@ in {
         XML logback configuration for cassandra
       '';
     };
+    seedAddresses = mkOption {
+      type = types.listOf types.str;
+      default = [ "127.0.0.1" ];
+      description = ''
+        The addresses of hosts designated as contact points in the cluster. A
+        joining node contacts one of the nodes in the seeds list to learn the
+        topology of the ring.
+        Set to 127.0.0.1 for a single node cluster.
+      '';
+    };
+    allowClients = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Enables or disables the native transport server (CQL binary protocol).
+        This server uses the same address as the <literal>rpcAddress</literal>,
+        but the port it uses is not <literal>rpc_port</literal> but
+        <literal>native_transport_port</literal>. See the official Cassandra
+        docs for more information on these variables and set them using
+        <literal>extraConfig</literal>.
+      '';
+    };
     extraConfig = mkOption {
       type = types.attrs;
       default = {};
@@ -178,11 +230,11 @@ in {
       example = literalExample "null";
       description = ''
           Set the interval how often full repairs are run, i.e.
-          `nodetool repair --full` is executed. See
+          <literal>nodetool repair --full</literal> is executed. See
           https://cassandra.apache.org/doc/latest/operating/repair.html
           for more information.
 
-          Set to `null` to disable full repairs.
+          Set to <literal>null</literal> to disable full repairs.
         '';
     };
     fullRepairOptions = mkOption {
@@ -199,11 +251,11 @@ in {
       example = literalExample "null";
       description = ''
           Set the interval how often incremental repairs are run, i.e.
-          `nodetool repair` is executed. See
+          <literal>nodetool repair</literal> is executed. See
           https://cassandra.apache.org/doc/latest/operating/repair.html
           for more information.
 
-          Set to `null` to disable incremental repairs.
+          Set to <literal>null</literal> to disable incremental repairs.
         '';
     };
     incrementalRepairOptions = mkOption {
@@ -214,20 +266,135 @@ in {
           Options passed through to the incremental repair command.
         '';
     };
+    maxHeapSize = mkOption {
+      type = types.nullOr types.string;
+      default = null;
+      example = "4G";
+      description = ''
+        Must be left blank or set together with heapNewSize.
+        If left blank a sensible value for the available amount of RAM and CPU
+        cores is calculated.
+
+        Override to set the amount of memory to allocate to the JVM at
+        start-up. For production use you may wish to adjust this for your
+        environment. MAX_HEAP_SIZE is the total amount of memory dedicated
+        to the Java heap. HEAP_NEWSIZE refers to the size of the young
+        generation.
+
+        The main trade-off for the young generation is that the larger it
+        is, the longer GC pause times will be. The shorter it is, the more
+        expensive GC will be (usually).
+      '';
+    };
+    heapNewSize = mkOption {
+      type = types.nullOr types.string;
+      default = null;
+      example = "800M";
+      description = ''
+        Must be left blank or set together with heapNewSize.
+        If left blank a sensible value for the available amount of RAM and CPU
+        cores is calculated.
+
+        Override to set the amount of memory to allocate to the JVM at
+        start-up. For production use you may wish to adjust this for your
+        environment. HEAP_NEWSIZE refers to the size of the young
+        generation.
+
+        The main trade-off for the young generation is that the larger it
+        is, the longer GC pause times will be. The shorter it is, the more
+        expensive GC will be (usually).
+
+        The example HEAP_NEWSIZE assumes a modern 8-core+ machine for decent pause
+        times. If in doubt, and if you do not particularly want to tweak, go with
+        100 MB per physical CPU core.
+      '';
+    };
+    mallocArenaMax = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      example = 4;
+      description = ''
+        Set this to control the amount of arenas per-thread in glibc.
+      '';
+    };
+    remoteJmx = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Cassandra ships with JMX accessible *only* from localhost.
+        To enable remote JMX connections set to true.
+
+        Be sure to also enable authentication and/or TLS.
+        See: https://wiki.apache.org/cassandra/JmxSecurity
+      '';
+    };
+    jmxPort = mkOption {
+      type = types.int;
+      default = 7199;
+      description = ''
+        Specifies the default port over which Cassandra will be available for
+        JMX connections.
+        For security reasons, you should not expose this port to the internet.
+        Firewall it if needed.
+      '';
+    };
+    jmxRoles = mkOption {
+      default = [];
+      description = ''
+        Roles that are allowed to access the JMX (e.g. nodetool)
+        BEWARE: The passwords will be stored world readable in the nix-store.
+                It's recommended to use your own protected file using
+                <literal>jmxRolesFile</literal>
+
+        Doesn't work in versions older than 3.11 because they don't like that
+        it's world readable.
+      '';
+      type = types.listOf (types.submodule {
+        options = {
+          username = mkOption {
+            type = types.string;
+            description = "Username for JMX";
+          };
+          password = mkOption {
+            type = types.string;
+            description = "Password for JMX";
+          };
+        };
+      });
+    };
+    jmxRolesFile = mkOption {
+      type = types.nullOr types.path;
+      default = if (lib.versionAtLeast cfg.package.version "3.11")
+                then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile
+                else null;
+      example = "/var/lib/cassandra/jmx.password";
+      description = ''
+        Specify your own jmx roles file.
+
+        Make sure the permissions forbid "others" from reading the file if
+        you're using Cassandra below version 3.11.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
     assertions =
-      [ { assertion =
-          (cfg.listenAddress == null || cfg.listenInterface == null)
-          && !(cfg.listenAddress == null && cfg.listenInterface == null);
+      [ { assertion = (cfg.listenAddress == null) != (cfg.listenInterface == null);
           message = "You have to set either listenAddress or listenInterface";
         }
-        { assertion =
-          (cfg.rpcAddress == null || cfg.rpcInterface == null)
-          && !(cfg.rpcAddress == null && cfg.rpcInterface == null);
+        { assertion = (cfg.rpcAddress == null) != (cfg.rpcInterface == null);
           message = "You have to set either rpcAddress or rpcInterface";
         }
+        { assertion = (cfg.maxHeapSize == null) == (cfg.heapNewSize == null);
+          message = "If you set either of maxHeapSize or heapNewSize you have to set both";
+        }
+        { assertion = cfg.remoteJmx -> cfg.jmxRolesFile != null;
+          message = ''
+            If you want JMX available remotely you need to set a password using
+            <literal>jmxRoles</literal> or <literal>jmxRolesFile</literal> if
+            using Cassandra older than v3.11.
+          '';
+        }
       ];
     users = mkIf (cfg.user == defaultUser) {
       extraUsers."${defaultUser}" =
@@ -245,7 +412,12 @@ in {
         after = [ "network.target" ];
         environment =
           { CASSANDRA_CONF = "${cassandraEtc}";
-            JVM_OPTS = builtins.concatStringsSep " " cfg.jvmOpts;
+            JVM_OPTS = builtins.concatStringsSep " " fullJvmOptions;
+            MAX_HEAP_SIZE = toString cfg.maxHeapSize;
+            HEAP_NEWSIZE = toString cfg.heapNewSize;
+            MALLOC_ARENA_MAX = toString cfg.mallocArenaMax;
+            LOCAL_JMX = if cfg.remoteJmx then "no" else "yes";
+            JMX_PORT = toString cfg.jmxPort;
           };
         wantedBy = [ "multi-user.target" ];
         serviceConfig =
diff --git a/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix b/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
index 7ec326e599e5..d9d5d539e422 100644
--- a/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
+++ b/nixpkgs/nixos/modules/services/desktops/deepin/deepin.nix
@@ -35,6 +35,7 @@
         pkgs.deepin.dde-calendar
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
+        pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
         pkgs.deepin.deepin-anything
         pkgs.deepin.deepin-image-viewer
@@ -46,6 +47,7 @@
         pkgs.deepin.dde-calendar
         pkgs.deepin.dde-daemon
         pkgs.deepin.dde-dock
+        pkgs.deepin.dde-file-manager
         pkgs.deepin.dde-session-ui
         pkgs.deepin.deepin-anything
         pkgs.deepin.deepin-image-viewer
@@ -55,6 +57,7 @@
       systemd.packages = [
         pkgs.deepin.dde-api
         pkgs.deepin.dde-daemon
+        pkgs.deepin.dde-file-manager
         pkgs.deepin.deepin-anything
       ];
 
diff --git a/nixpkgs/nixos/modules/services/hardware/80-net-setup-link.rules b/nixpkgs/nixos/modules/services/hardware/80-net-setup-link.rules
deleted file mode 100644
index 18547f170a3f..000000000000
--- a/nixpkgs/nixos/modules/services/hardware/80-net-setup-link.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copied from systemd 203.
-ACTION=="remove", GOTO="net_name_slot_end"
-SUBSYSTEM!="net", GOTO="net_name_slot_end"
-NAME!="", GOTO="net_name_slot_end"
-
-IMPORT{cmdline}="net.ifnames"
-ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
-
-NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
-NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
-NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
-
-LABEL="net_name_slot_end"
diff --git a/nixpkgs/nixos/modules/services/hardware/throttled.nix b/nixpkgs/nixos/modules/services/hardware/throttled.nix
new file mode 100644
index 000000000000..cd5b01450e44
--- /dev/null
+++ b/nixpkgs/nixos/modules/services/hardware/throttled.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.throttled;
+in {
+  options = {
+    services.throttled = {
+      enable = mkEnableOption "fix for Intel CPU throttling";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.packages = [ pkgs.throttled ];
+    # The upstream package has this in Install, but that's not enough, see the NixOS manual
+    systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ];
+
+    environment.etc."lenovo_fix.conf".source = "${pkgs.throttled}/etc/lenovo_fix.conf";
+  };
+}
diff --git a/nixpkgs/nixos/modules/services/hardware/udev.nix b/nixpkgs/nixos/modules/services/hardware/udev.nix
index 0266286aaacf..cb2f1e6621ae 100644
--- a/nixpkgs/nixos/modules/services/hardware/udev.nix
+++ b/nixpkgs/nixos/modules/services/hardware/udev.nix
@@ -116,10 +116,6 @@ let
         exit 1
       fi
 
-      ${optionalString config.networking.usePredictableInterfaceNames ''
-        cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules
-      ''}
-
       # If auto-configuration is disabled, then remove
       # udev's 80-drivers.rules file, which contains rules for
       # automatically calling modprobe.
@@ -282,6 +278,8 @@ in
 
     services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
 
+    boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
+
     environment.etc =
       [ { source = udevRules;
           target = "udev/rules.d";
diff --git a/nixpkgs/nixos/modules/services/misc/gitea.nix b/nixpkgs/nixos/modules/services/misc/gitea.nix
index 6fd4183bd6b4..7daa2dd0d4cc 100644
--- a/nixpkgs/nixos/modules/services/misc/gitea.nix
+++ b/nixpkgs/nixos/modules/services/misc/gitea.nix
@@ -159,7 +159,8 @@ in
 
         socket = mkOption {
           type = types.nullOr types.path;
-          default = null;
+          default = if (cfg.database.createDatabase && usePostgresql) then "/run/postgresql" else if (cfg.database.createDatabase && useMysql) then "/run/mysqld/mysqld.sock" else null;
+          defaultText = "null";
           example = "/run/mysqld/mysqld.sock";
           description = "Path to the unix socket file to use for authentication.";
         };
@@ -173,10 +174,7 @@ in
         createDatabase = mkOption {
           type = types.bool;
           default = true;
-          description = ''
-            Whether to create a local postgresql database automatically.
-            This only applies if database type "postgres" is selected.
-          '';
+          description = "Whether to create a local database automatically.";
         };
       };
 
@@ -277,7 +275,46 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.postgresql.enable = mkIf usePostgresql (mkDefault true);
+    assertions = [
+      { assertion = cfg.database.createDatabase -> cfg.database.user == cfg.user;
+        message = "services.gitea.database.user must match services.gitea.user if the database is to be automatically provisioned";
+      }
+    ];
+
+    services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
+      enable = mkDefault true;
+
+      ensureDatabases = [ cfg.database.name ];
+      ensureUsers = [
+        { name = cfg.database.user;
+          ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
+        }
+      ];
+    };
+
+    services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) {
+      enable = mkDefault true;
+      package = mkDefault pkgs.mariadb;
+
+      ensureDatabases = [ cfg.database.name ];
+      ensureUsers = [
+        { name = cfg.database.user;
+          ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
+        }
+      ];
+    };
+
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - ${cfg.user} gitea - -"
+      "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
+      "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
+      "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
+      "Z '${cfg.stateDir}' - ${cfg.user} gitea - -"
+
+      # If we have a folder or symlink with gitea locales, remove it
+      # And symlink the current gitea locales in place
+      "L+ '${cfg.stateDir}/conf/locale' - - - - ${gitea.out}/locale"
+    ];
 
     systemd.services.gitea = {
       description = "gitea";
@@ -289,12 +326,8 @@ in
         runConfig = "${cfg.stateDir}/custom/conf/app.ini";
         secretKey = "${cfg.stateDir}/custom/conf/secret_key";
       in ''
-        # Make sure that the stateDir exists, as well as the conf dir in there
-        mkdir -p ${cfg.stateDir}/conf
-
         # copy custom configuration and generate a random secret key if needed
         ${optionalString (cfg.useWizard == false) ''
-          mkdir -p ${cfg.stateDir}/custom/conf
           cp -f ${configFile} ${runConfig}
 
           if [ ! -e ${secretKey} ]; then
@@ -309,7 +342,6 @@ in
           chmod 640 ${runConfig} ${secretKey}
         ''}
 
-        mkdir -p ${cfg.repositoryRoot}
         # update all hooks' binary paths
         HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*")
         if [ "$HOOKS" ]
@@ -319,43 +351,19 @@ in
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
         fi
-        # If we have a folder or symlink with gitea locales, remove it
-        if [ -e ${cfg.stateDir}/conf/locale ]
-        then
-          rm -r ${cfg.stateDir}/conf/locale
-        fi
-        # And symlink the current gitea locales in place
-        ln -s ${gitea.out}/locale ${cfg.stateDir}/conf/locale
+
         # update command option in authorized_keys
         if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
         then
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
         fi
-      '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
-        if ! test -e "${cfg.stateDir}/db-created"; then
-          echo "CREATE ROLE ${cfg.database.user}
-                  WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})'
-                  NOCREATEDB NOCREATEROLE LOGIN"   |
-            ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql
-          ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
-            ${pg.package}/bin/createdb             \
-            --owner=${cfg.database.user}           \
-            --encoding=UTF8                        \
-            --lc-collate=C                         \
-            --lc-ctype=C                           \
-            --template=template0                   \
-            ${cfg.database.name}
-          touch "${cfg.stateDir}/db-created"
-        fi
-      '' + ''
-        chown ${cfg.user} -R ${cfg.stateDir}
       '';
 
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
+        Group = "gitea";
         WorkingDirectory = cfg.stateDir;
-        PermissionsStartOnly = true;
         ExecStart = "${gitea.bin}/bin/gitea web";
         Restart = "always";
       };
@@ -367,15 +375,17 @@ in
       };
     };
 
-    users = mkIf (cfg.user == "gitea") {
-      users.gitea = {
+    users.users = mkIf (cfg.user == "gitea") {
+      gitea = {
         description = "Gitea Service";
         home = cfg.stateDir;
-        createHome = true;
         useDefaultShell = true;
+        group = "gitea";
       };
     };
 
+    users.groups.gitea = {};
+
     warnings = optional (cfg.database.password != "")
       ''config.services.gitea.database.password will be stored as plaintext
         in the Nix store. Use database.passwordFile instead.'';
diff --git a/nixpkgs/nixos/modules/services/misc/phd.nix b/nixpkgs/nixos/modules/services/misc/phd.nix
deleted file mode 100644
index e605ce5de16e..000000000000
--- a/nixpkgs/nixos/modules/services/misc/phd.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.phd;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.phd = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Enable daemons for phabricator.
-        ";
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    systemd.services.phd = {
-      path = [ pkgs.phabricator pkgs.php pkgs.mercurial pkgs.git pkgs.subversion ];
-
-      after = [ "httpd.service" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
-        ExecStop = "${pkgs.phabricator}/phabricator/bin/phd stop";
-        User = "wwwrun";
-        RestartSec = "30s";
-        Restart = "always";
-        StartLimitInterval = "1m";
-      };
-    };
-
-  };
-
-}
diff --git a/nixpkgs/nixos/modules/services/networking/bind.nix b/nixpkgs/nixos/modules/services/networking/bind.nix
index 98486cefd528..7f89cff22329 100644
--- a/nixpkgs/nixos/modules/services/networking/bind.nix
+++ b/nixpkgs/nixos/modules/services/networking/bind.nix
@@ -184,7 +184,7 @@ in
       preStart = ''
         mkdir -m 0755 -p /etc/bind
         if ! [ -f "/etc/bind/rndc.key" ]; then
-          ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
+          ${pkgs.bind.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
         fi
 
         ${pkgs.coreutils}/bin/mkdir -p /run/named
diff --git a/nixpkgs/nixos/modules/services/networking/openvpn.nix b/nixpkgs/nixos/modules/services/networking/openvpn.nix
index b94b4026fd91..f47122ee70bf 100644
--- a/nixpkgs/nixos/modules/services/networking/openvpn.nix
+++ b/nixpkgs/nixos/modules/services/networking/openvpn.nix
@@ -85,7 +85,7 @@ in
         {
           server = {
             config = '''
-              # Simplest server configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html.
+              # Simplest server configuration: https://community.openvpn.net/openvpn/wiki/StaticKeyMiniHowto
               # server :
               dev tun
               ifconfig 10.8.0.1 10.8.0.2
diff --git a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
index 89f56a726f46..0f9d2420903b 100644
--- a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
@@ -4,7 +4,15 @@ with lib;
 
 let
 
-  sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } ''
+  # The splicing information needed for nativeBuildInputs isn't available
+  # on the derivations likely to be used as `cfgc.package`.
+  # This middle-ground solution ensures *an* sshd can do their basic validation
+  # on the configuration.
+  validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform
+    then [ cfgc.package ]
+    else [ pkgs.buildPackages.openssh ];
+
+  sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } ''
     cat >$out <<EOL
     ${cfg.extraConfig}
     EOL
diff --git a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
deleted file mode 100644
index efd4a7b5f0fb..000000000000
--- a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  phabricatorRoot = pkgs.phabricator;
-in {
-
-  enablePHP = true;
-  extraApacheModules = [ "mod_rewrite" ];
-  DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
-
-  options = {
-      git = mkOption {
-          default = true;
-          description = "Enable git repositories.";
-      };
-      mercurial = mkOption {
-          default = true;
-          description = "Enable mercurial repositories.";
-      };
-      subversion = mkOption {
-          default = true;
-          description = "Enable subversion repositories.";
-      };
-  };
-
-  extraConfig = ''
-      DocumentRoot ${phabricatorRoot}/phabricator/webroot
-
-      RewriteEngine on
-      RewriteRule ^/rsrc/(.*) - [L,QSA]
-      RewriteRule ^/favicon.ico - [L,QSA]
-      RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
-  '';
-
-  extraServerPath = [
-      "${pkgs.which}"
-      "${pkgs.diffutils}"
-      ] ++
-      (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
-      (if config.subversion then ["${pkgs.subversion.out}"] else []) ++
-      (if config.git then ["${pkgs.git}"] else []);
-
-  startupScript = pkgs.writeScript "activatePhabricator" ''
-      mkdir -p /var/repo
-      chown wwwrun /var/repo
-  '';
-
-}
diff --git a/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
index e6a054c296dc..4ec4a5a3359e 100644
--- a/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -44,6 +44,8 @@ in
       example = ''
         cache-size=1000
         scan-path=/srv/git
+        source-filter=''${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
+        about-filter=''${pkgs.cgit}/lib/cgit/filters/about-formatting.sh
       '';
       type = types.lines;
       description = ''
diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 4da146940648..527e4b18045b 100644
--- a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -34,7 +34,7 @@ in
       pkgs.gtk2 # To get GTK+'s themes.
       pkgs.tango-icon-theme
 
-      pkgs.gnome2.gnomeicontheme
+      pkgs.gnome2.gnome_icon_theme
       pkgs.xorg.xcursorthemes
     ];
 
diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 9a0f77a856a7..41903b33fae9 100644
--- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -195,7 +195,7 @@ in
       ]);
 
     fonts.fonts = with pkgs; [
-      opensans-ttf
+      open-sans
       roboto-mono
       pantheon.elementary-redacted-script # needed by screenshot-tool
     ];
diff --git a/nixpkgs/nixos/modules/system/boot/luksroot.nix b/nixpkgs/nixos/modules/system/boot/luksroot.nix
index 9dcb683eff43..b5c8d5241a3d 100644
--- a/nixpkgs/nixos/modules/system/boot/luksroot.nix
+++ b/nixpkgs/nixos/modules/system/boot/luksroot.nix
@@ -438,6 +438,7 @@ in
       default =
         [ "aes" "aes_generic" "blowfish" "twofish"
           "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
+          "af_alg" "algif_skcipher"
 
           (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
         ];
diff --git a/nixpkgs/nixos/modules/system/boot/networkd.nix b/nixpkgs/nixos/modules/system/boot/networkd.nix
index 63a6f7fbe099..f1aa9064bef4 100644
--- a/nixpkgs/nixos/modules/system/boot/networkd.nix
+++ b/nixpkgs/nixos/modules/system/boot/networkd.nix
@@ -203,7 +203,7 @@ let
 
   checkRoute = checkUnitConfig "Route" [
     (assertOnlyFields [
-      "Gateway" "GatewayOnlink" "Destination" "Source" "Metric"
+      "Gateway" "GatewayOnLink" "Destination" "Source" "Metric"
       "IPv6Preference" "Scope" "PreferredSource" "Table" "Protocol" "Type"
       "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck"
       "MTUBytes"
@@ -669,7 +669,7 @@ let
     };
   };
 
-  commonMatchText = def: ''
+  commonMatchText = def: optionalString (def.matchConfig != {}) ''
     [Match]
     ${attrsToSection def.matchConfig}
   '';
diff --git a/nixpkgs/nixos/modules/system/boot/systemd.nix b/nixpkgs/nixos/modules/system/boot/systemd.nix
index 18ee2ef1b8f5..cf35504e5182 100644
--- a/nixpkgs/nixos/modules/system/boot/systemd.nix
+++ b/nixpkgs/nixos/modules/system/boot/systemd.nix
@@ -186,6 +186,9 @@ let
       "sockets.target"
       "sound.target"
       "systemd-exit.service"
+      "systemd-tmpfiles-clean.service"
+      "systemd-tmpfiles-clean.timer"
+      "systemd-tmpfiles-setup.service"
       "timers.target"
     ];
 
@@ -940,7 +943,6 @@ in
     # Don't bother with certain units in containers.
     systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
     systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
-
   };
 
   # FIXME: Remove these eventually.
@@ -949,5 +951,4 @@ in
       (mkRenamedOptionModule [ "boot" "systemd" "targets" ] [ "systemd" "targets" ])
       (mkRenamedOptionModule [ "boot" "systemd" "services" ] [ "systemd" "services" ])
     ];
-
 }
diff --git a/nixpkgs/nixos/modules/system/boot/timesyncd.nix b/nixpkgs/nixos/modules/system/boot/timesyncd.nix
index 8d8bfe5900a9..8282cdd6f3aa 100644
--- a/nixpkgs/nixos/modules/system/boot/timesyncd.nix
+++ b/nixpkgs/nixos/modules/system/boot/timesyncd.nix
@@ -40,6 +40,15 @@ with lib;
     users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync;
     users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
 
+    system.activationScripts.systemd-timesyncd-migration = mkIf (versionOlder config.system.stateVersion "19.09") ''
+      # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes
+      #  - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742
+      #  - https://github.com/systemd/systemd/issues/12131
+      if [ -L /var/lib/systemd/timesync ]; then
+        rm /var/lib/systemd/timesync
+        mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync
+      fi
+    '';
   };
 
 }
diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
index 2318bdd1d582..857aaf1e6e30 100644
--- a/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -12,7 +12,7 @@ let
     i.ipv4.addresses
     ++ optionals cfg.enableIPv6 i.ipv6.addresses;
 
-  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "none";
+  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no";
 
   slaves =
     concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
@@ -59,7 +59,14 @@ in
           in {
             DHCP = override (dhcpStr cfg.useDHCP);
           } // optionalAttrs (gateway != [ ]) {
-            gateway = override gateway;
+            routes = override [
+              {
+                routeConfig = {
+                  Gateway = gateway;
+                  GatewayOnLink = false;
+                };
+              }
+            ];
           } // optionalAttrs (domains != [ ]) {
             domains = override domains;
           };
diff --git a/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/nixpkgs/nixos/modules/testing/test-instrumentation.nix
index ed4cfa7805e2..1a11d9ce7c26 100644
--- a/nixpkgs/nixos/modules/testing/test-instrumentation.nix
+++ b/nixpkgs/nixos/modules/testing/test-instrumentation.nix
@@ -129,9 +129,6 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
     users.users.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
-
-    # set default stateVersion to avoid warnings during eval
-    system.stateVersion = mkDefault "18.03";
   };
 
 }
diff --git a/nixpkgs/nixos/modules/virtualisation/containers.nix b/nixpkgs/nixos/modules/virtualisation/containers.nix
index 97243e3304ee..2235eec9d95a 100644
--- a/nixpkgs/nixos/modules/virtualisation/containers.nix
+++ b/nixpkgs/nixos/modules/virtualisation/containers.nix
@@ -465,20 +465,24 @@ in
                 merge = loc: defs: (import ../../lib/eval-config.nix {
                   inherit system;
                   modules =
-                    let extraConfig =
-                      { 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
-                            '';
-                          }
-                        ];
+                    let
+                      extraConfig = {
+                        _file = "module at ${__curPos.file}:${toString __curPos.line}";
+                        config = {
+                          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 ];
diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix
index 8b38e802e62e..359f62751b99 100644
--- a/nixpkgs/nixos/tests/all-tests.nix
+++ b/nixpkgs/nixos/tests/all-tests.nix
@@ -36,6 +36,7 @@ in
   borgbackup = handleTest ./borgbackup.nix {};
   buildbot = handleTest ./buildbot.nix {};
   cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
+  cassandra = handleTest ./cassandra.nix {};
   ceph = handleTestOn ["x86_64-linux"] ./ceph.nix {};
   certmgr = handleTest ./certmgr.nix {};
   cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
@@ -82,6 +83,7 @@ in
   fish = handleTest ./fish.nix {};
   flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
   flatpak = handleTest ./flatpak.nix {};
+  flatpak-builder = handleTest ./flatpak-builder.nix {};
   fsck = handleTest ./fsck.nix {};
   fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
   gdk-pixbuf = handleTest ./gdk-pixbuf.nix {};
@@ -239,6 +241,7 @@ in
   syncthing-relay = handleTest ./syncthing-relay.nix {};
   systemd = handleTest ./systemd.nix {};
   systemd-confinement = handleTest ./systemd-confinement.nix {};
+  systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   pdns-recursor = handleTest ./pdns-recursor.nix {};
   taskserver = handleTest ./taskserver.nix {};
   telegraf = handleTest ./telegraf.nix {};
diff --git a/nixpkgs/nixos/tests/cassandra.nix b/nixpkgs/nixos/tests/cassandra.nix
index 60d0c6d76068..aea4fa4d1c95 100644
--- a/nixpkgs/nixos/tests/cassandra.nix
+++ b/nixpkgs/nixos/tests/cassandra.nix
@@ -1,26 +1,43 @@
-import ./make-test.nix ({ pkgs, ...}:
+import ./make-test.nix ({ pkgs, lib, ... }:
 let
   # Change this to test a different version of Cassandra:
   testPackage = pkgs.cassandra;
-  cassandraCfg = 
+  clusterName = "NixOS Automated-Test Cluster";
+
+  testRemoteAuth = lib.versionAtLeast testPackage.version "3.11";
+  jmxRoles = [{ username = "me"; password = "password"; }];
+  jmxRolesFile = ./cassandra-jmx-roles;
+  jmxAuthArgs = "-u ${(builtins.elemAt jmxRoles 0).username} -pw ${(builtins.elemAt jmxRoles 0).password}";
+
+  # Would usually be assigned to 512M
+  numMaxHeapSize = "400";
+  getHeapLimitCommand = ''
+    nodetool info | grep "^Heap Memory" | awk \'{print $NF}\'
+  '';
+  checkHeapLimitCommand = ''
+    [ 1 -eq "$(echo "$(${getHeapLimitCommand}) < ${numMaxHeapSize}" | ${pkgs.bc}/bin/bc)" ]
+  '';
+
+  cassandraCfg = ipAddress:
     { enable = true;
-      listenAddress = null;
-      listenInterface = "eth1";
-      rpcAddress = null;
-      rpcInterface = "eth1";
-      extraConfig =
-        { start_native_transport = true;
-          seed_provider =
-            [{ class_name = "org.apache.cassandra.locator.SimpleSeedProvider";
-               parameters = [ { seeds = "cass0"; } ];
-            }];
-        };
+      inherit clusterName;
+      listenAddress = ipAddress;
+      rpcAddress = ipAddress;
+      seedAddresses = [ "192.168.1.1" ];
       package = testPackage;
+      maxHeapSize = "${numMaxHeapSize}M";
+      heapNewSize = "100M";
     };
-  nodeCfg = extra: {pkgs, config, ...}:
+  nodeCfg = ipAddress: extra: {pkgs, config, ...}:
     { environment.systemPackages = [ testPackage ];
-      networking.firewall.enable = false;
-      services.cassandra = cassandraCfg // extra;
+      networking = {
+        firewall.allowedTCPPorts = [ 7000 7199 9042 ];
+        useDHCP = false;
+        interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+          { address = ipAddress; prefixLength = 24; }
+        ];
+      };
+      services.cassandra = cassandraCfg ipAddress // extra;
       virtualisation.memorySize = 1024;
     };
 in
@@ -28,40 +45,65 @@ in
   name = "cassandra-ci";
 
   nodes = {
-    cass0 = nodeCfg {};
-    cass1 = nodeCfg {};
-    cass2 = nodeCfg { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; };
+    cass0 = nodeCfg "192.168.1.1" {};
+    cass1 = nodeCfg "192.168.1.2" (lib.optionalAttrs testRemoteAuth { inherit jmxRoles; remoteJmx = true; });
+    cass2 = nodeCfg "192.168.1.3" { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; };
   };
 
   testScript = ''
-    subtest "timers exist", sub {
+    # Check configuration
+    subtest "Timers exist", sub {
       $cass0->succeed("systemctl list-timers | grep cassandra-full-repair.timer");
       $cass0->succeed("systemctl list-timers | grep cassandra-incremental-repair.timer");
     };
-    subtest "can connect via cqlsh", sub {
+    subtest "Can connect via cqlsh", sub {
       $cass0->waitForUnit("cassandra.service");
       $cass0->waitUntilSucceeds("nc -z cass0 9042");
       $cass0->succeed("echo 'show version;' | cqlsh cass0");
     };
-    subtest "nodetool is operational", sub {
+    subtest "Nodetool is operational", sub {
       $cass0->waitForUnit("cassandra.service");
       $cass0->waitUntilSucceeds("nc -z localhost 7199");
       $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass0'");
     };
-    subtest "bring up cluster", sub {
+    subtest "Cluster name was set", sub {
+      $cass0->waitForUnit("cassandra.service");
+      $cass0->waitUntilSucceeds("nc -z localhost 7199");
+      $cass0->waitUntilSucceeds("nodetool describecluster | grep 'Name: ${clusterName}'");
+    };
+    subtest "Heap limit set correctly", sub {
+      # Nodetool takes a while until it can display info
+      $cass0->waitUntilSucceeds('nodetool info');
+      $cass0->succeed('${checkHeapLimitCommand}');
+    };
+
+    # Check cluster interaction
+    subtest "Bring up cluster", sub {
       $cass1->waitForUnit("cassandra.service");
-      $cass1->waitUntilSucceeds("nodetool status | egrep -c '^UN' | grep 2");
+      $cass1->waitUntilSucceeds("nodetool ${jmxAuthArgs} status | egrep -c '^UN' | grep 2");
       $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'");
     };
-    subtest "break and fix node", sub {
+  '' + lib.optionalString testRemoteAuth ''
+    subtest "Remote authenticated jmx", sub {
+      # Doesn't work if not enabled
+      $cass0->waitUntilSucceeds("nc -z localhost 7199");
+      $cass1->fail("nc -z 192.168.1.1 7199");
+      $cass1->fail("nodetool -h 192.168.1.1 status");
+
+      # Works if enabled
+      $cass1->waitUntilSucceeds("nc -z localhost 7199");
+      $cass0->succeed("nodetool -h 192.168.1.2 ${jmxAuthArgs} status");
+    };
+  '' + ''
+    subtest "Break and fix node", sub {
       $cass1->block;
       $cass0->waitUntilSucceeds("nodetool status --resolve-ip | egrep -c '^DN[[:space:]]+cass1'");
       $cass0->succeed("nodetool status | egrep -c '^UN'  | grep 1");
       $cass1->unblock;
-      $cass1->waitUntilSucceeds("nodetool status | egrep -c '^UN'  | grep 2");
+      $cass1->waitUntilSucceeds("nodetool ${jmxAuthArgs} status | egrep -c '^UN'  | grep 2");
       $cass0->succeed("nodetool status | egrep -c '^UN'  | grep 2");
     };
-    subtest "replace crashed node", sub {
+    subtest "Replace crashed node", sub {
       $cass1->crash;
       $cass2->waitForUnit("cassandra.service");
       $cass0->waitUntilFails("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'");
diff --git a/nixpkgs/nixos/tests/containers-imperative.nix b/nixpkgs/nixos/tests/containers-imperative.nix
index 0c101037aa7f..2e7e4b2f1d69 100644
--- a/nixpkgs/nixos/tests/containers-imperative.nix
+++ b/nixpkgs/nixos/tests/containers-imperative.nix
@@ -35,7 +35,17 @@ import ./make-test.nix ({ pkgs, ...} : {
       ];
     };
 
-  testScript =
+  testScript = let
+    tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" ''
+      {
+        systemd.tmpfiles.rules = [ "d /foo - - - - -" ];
+        systemd.services.foo = {
+          serviceConfig.Type = "oneshot";
+          script = "ls -al /foo";
+          wantedBy = [ "multi-user.target" ];
+        };
+      }
+    ''; in
     ''
       # Make sure we have a NixOS tree (required by ‘nixos-container create’).
       $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
@@ -93,6 +103,15 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->succeed("nixos-container stop $id1");
       $machine->succeed("nixos-container start $id1");
 
+      # Ensure tmpfiles are present
+      $machine->log("creating container tmpfiles");
+      $machine->succeed("nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}");
+      $machine->log("created, starting…");
+      $machine->succeed("nixos-container start tmpfiles");
+      $machine->log("done starting, investigating…");
+      $machine->succeed("echo \$(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;");
+      $machine->succeed("nixos-container destroy tmpfiles");
+
       # Execute commands via the root shell.
       $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
 
diff --git a/nixpkgs/nixos/tests/flatpak-builder.nix b/nixpkgs/nixos/tests/flatpak-builder.nix
new file mode 100644
index 000000000000..2100631ec7f4
--- /dev/null
+++ b/nixpkgs/nixos/tests/flatpak-builder.nix
@@ -0,0 +1,19 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "flatpak-builder";
+  meta = {
+    maintainers = pkgs.flatpak-builder.meta.maintainers;
+  };
+
+  machine = { pkgs, ... }: {
+    services.flatpak.enable = true;
+    environment.systemPackages = with pkgs; [ gnome-desktop-testing flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
+    virtualisation.diskSize = 2048;
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak-builder.installedTests}/share' --timeout 3600");
+  '';
+})
diff --git a/nixpkgs/nixos/tests/gitea.nix b/nixpkgs/nixos/tests/gitea.nix
index cccf8c7cd44f..b8ab6dabc8c1 100644
--- a/nixpkgs/nixos/tests/gitea.nix
+++ b/nixpkgs/nixos/tests/gitea.nix
@@ -13,18 +13,8 @@ with pkgs.lib;
 
     machine =
       { config, pkgs, ... }:
-      { services.mysql.enable = true;
-        services.mysql.package = pkgs.mariadb;
-        services.mysql.ensureDatabases = [ "gitea" ];
-        services.mysql.ensureUsers = [
-          { name = "gitea";
-            ensurePermissions = { "gitea.*" = "ALL PRIVILEGES"; };
-          }
-        ];
-
-        services.gitea.enable = true;
+      { services.gitea.enable = true;
         services.gitea.database.type = "mysql";
-        services.gitea.database.socket = "/run/mysqld/mysqld.sock";
       };
 
     testScript = ''
@@ -42,10 +32,8 @@ with pkgs.lib;
 
     machine =
       { config, pkgs, ... }:
-      {
-        services.gitea.enable = true;
+      { services.gitea.enable = true;
         services.gitea.database.type = "postgres";
-        services.gitea.database.passwordFile = pkgs.writeText "db-password" "secret";
       };
 
     testScript = ''
diff --git a/nixpkgs/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix
index 5e363f5d09e9..07659b60b3b8 100644
--- a/nixpkgs/nixos/tests/installer.nix
+++ b/nixpkgs/nixos/tests/installer.nix
@@ -273,7 +273,7 @@ let
       };
     };
 
-    makeLuksRootTest = name: luksFormatOpts: makeInstallerTest "luksroot-format2"
+    makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name
       { createPartitions = ''
           $machine->succeed(
             "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
diff --git a/nixpkgs/nixos/tests/phabricator.nix b/nixpkgs/nixos/tests/phabricator.nix
deleted file mode 100644
index db23331842cb..000000000000
--- a/nixpkgs/nixos/tests/phabricator.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
-  name = "phabricator";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ];
-  };
-
-  nodes = {
-    storage =
-      { ... }:
-      { services.nfs.server.enable = true;
-        services.nfs.server.exports = ''
-          /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
-        '';
-        services.nfs.server.createMountPoints = true;
-      };
-
-    webserver =
-      { pkgs, ... }:
-      { fileSystems = pkgs.lib.mkVMOverride
-          [ { mountPoint = "/repos";
-              device = "storage:/repos";
-              fsType = "nfs";
-            }
-          ];
-        networking.firewall.enable = false;
-        networking.useDHCP = false;
-
-        services = {
-          httpd = {
-            enable = true;
-            adminAddr = "root@localhost";
-            virtualHosts = [{
-              hostName = "phabricator.local";
-              extraSubservices = [{serviceType = "phabricator";}];
-            }];
-          };
-
-          phd = {
-            enable = true;
-          };
-
-          mysql = {
-            enable = true;
-            package = pkgs.mysql;
-            extraOptions = ''
-              sql_mode=STRICT_ALL_TABLES
-            '';
-          };
-        };
-
-        environment.systemPackages = [ pkgs.php ];
-      };
-
-    client =
-      { ... }:
-      { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.plasma5.enable = true;
-      };
-  };
-
-  testScript =
-    ''
-      startAll;
-
-      $client->waitForX;
-
-      $webserver->waitForUnit("mysql");
-      $webserver->waitForUnit("httpd");
-      $webserver->execute("cd /nix/store; less >/repos/log1");
-
-      $client->sleep(30); # loading takes a long time
-      $client->execute("konqueror http://webserver/ &");
-      $client->sleep(90); # loading takes a long time
-
-      $client->screenshot("screen");
-    '';
-})
diff --git a/nixpkgs/nixos/tests/radicale.nix b/nixpkgs/nixos/tests/radicale.nix
index bf22fc9291af..607964255640 100644
--- a/nixpkgs/nixos/tests/radicale.nix
+++ b/nixpkgs/nixos/tests/radicale.nix
@@ -85,7 +85,7 @@ in
       $radicale->succeed('mv /tmp/collections-new/collection-root /tmp/collections');
       $radicale->succeed('${switchToConfig "radicale2_verify"} >&2');
       $radicale->waitUntilFails('systemctl status radicale');
-      my ($retcode, $logs) = $radicale->execute('journalctl -u radicale -n 5');
+      my ($retcode, $logs) = $radicale->execute('journalctl -u radicale -n 10');
       if ($retcode != 0 || index($logs, 'Verifying storage') == -1) {
         die "Radicale 2 didn't verify storage"
       }
diff --git a/nixpkgs/nixos/tests/systemd-timesyncd.nix b/nixpkgs/nixos/tests/systemd-timesyncd.nix
new file mode 100644
index 000000000000..d12b8eb2bf7e
--- /dev/null
+++ b/nixpkgs/nixos/tests/systemd-timesyncd.nix
@@ -0,0 +1,52 @@
+# Regression test for systemd-timesync having moved the state directory without
+# upstream providing a migration path. https://github.com/systemd/systemd/issues/12131
+
+import ./make-test.nix (let
+  common = { lib, ... }: {
+    # override the `false` value from the qemu-vm base profile
+    services.timesyncd.enable = lib.mkForce true;
+  };
+  mkVM = conf: { imports = [ conf common ]; };
+in {
+  name = "systemd-timesyncd";
+  nodes = {
+    current = mkVM {};
+    pre1909 = mkVM ({lib, ... }: with lib; {
+      # create the path that should be migrated by our activation script when
+      # upgrading to a newer nixos version
+      system.stateVersion = "19.03";
+      system.activationScripts.simulate-old-timesync-state-dir = mkBefore ''
+        rm -f /var/lib/systemd/timesync
+        mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync
+        ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync
+        chown systemd-timesync: /var/lib/private/systemd/timesync
+      '';
+    });
+  };
+
+  testScript = ''
+    startAll;
+    $current->succeed('systemctl status systemd-timesyncd.service');
+    # on a new install with a recent systemd there should not be any
+    # leftovers from the dynamic user mess
+    $current->succeed('test -e /var/lib/systemd/timesync');
+    $current->succeed('test ! -L /var/lib/systemd/timesync');
+
+    # timesyncd should be running on the upgrading system since we fixed the
+    # file bits in the activation script
+    $pre1909->succeed('systemctl status systemd-timesyncd.service');
+
+    # the path should be gone after the migration
+    $pre1909->succeed('test ! -e /var/lib/private/systemd/timesync');
+
+    # and the new path should no longer be a symlink
+    $pre1909->succeed('test -e /var/lib/systemd/timesync');
+    $pre1909->succeed('test ! -L /var/lib/systemd/timesync');
+
+    # after a restart things should still work and not fail in the activation
+    # scripts and cause the boot to fail..
+    $pre1909->shutdown;
+    $pre1909->start;
+    $pre1909->succeed('systemctl status systemd-timesyncd.service');
+  '';
+})
diff --git a/nixpkgs/pkgs/applications/audio/adlplug/default.nix b/nixpkgs/pkgs/applications/audio/adlplug/default.nix
index 5872f53d75dc..631e0c9cca52 100644
--- a/nixpkgs/pkgs/applications/audio/adlplug/default.nix
+++ b/nixpkgs/pkgs/applications/audio/adlplug/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "ADLplug";
     rev = "v${version}";
-    sha256 = "1rpd7v1rx74cv7nhs70ah0bly314rjzj70cp30mvhns2hzk66s3c";
+    sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c";
     fetchSubmodules = true;
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "Synthesizer plugin for ADLMIDI and OPNMIDI (VST/LV2)";
+    description = "OPL3 and OPN2 FM Chip Synthesizer";
     homepage = src.meta.homepage;
     license = licenses.boost;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix
index 92f566e36578..d2355681b728 100644
--- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/infobar.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "DeadBeeF Infobar Plugin";
+    broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash)
+    description = "DeaDBeeF Infobar Plugin";
     homepage = https://bitbucket.org/dsimbiriatin/deadbeef-infobar;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.jtojnar ];
diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
new file mode 100644
index 000000000000..97e054bda64c
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
+
+stdenv.mkDerivation rec {
+  pname = "deadbeef-lyricbar-plugin";
+  version = "unstable-2019-01-29";
+
+  src = fetchFromGitHub {
+    owner = "C0rn3j";
+    repo = "deadbeef-lyricbar";
+    rev = "8f99b92ef827c451c43fc7dff38ae4f15c355e8e";
+    sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ deadbeef gtkmm3 libxmlxx3 ];
+
+  buildFlags = [ "gtk3" ];
+
+  meta = with stdenv.lib; {
+    description = "Plugin for DeaDBeeF audio player that fetches and shows the song’s lyrics";
+    homepage = "https://github.com/C0rn3j/deadbeef-lyricbar";
+    license = licenses.mit;
+    maintainers = [ maintainers.jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index c12ea8851679..45fc05623372 100644
--- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -21,7 +21,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.0.10";
+  version = "1.0.12";
 
   format = "other";
   doCheck = false;
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "118z1qhvpv7x5n63lpm4mf81pmv7gd450sa55i68mnjvry93h9h5";
+    sha256 = "0jc40p2yw3zp035c87crav2lq0iraf35ag9w26vzmbjvgpvwzb86";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
index 72af8aff106b..d414cb756114 100644
--- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -4,7 +4,7 @@
 , faacSupport ? false, faac ? null
 , flacSupport ? true, flac ? null
 , soxSupport ? true, sox ? null
-, vorbisSupport ? true, vorbisTools ? null 
+, vorbisSupport ? true, vorbisTools ? null
 }:
 
 assert mp3Support -> lame != null;
@@ -14,7 +14,10 @@ assert flacSupport -> flac != null;
 assert soxSupport -> sox != null;
 assert vorbisSupport -> vorbisTools != null;
 
-pythonPackages.buildPythonApplication rec {
+let
+  zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
+
+in pythonPackages.buildPythonApplication rec {
   pname = "pulseaudio-dlna";
   version = "2017-11-01";
 
@@ -24,13 +27,14 @@ pythonPackages.buildPythonApplication rec {
     rev = "4472928dd23f274193f14289f59daec411023ab0";
     sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
   };
-  
+
   # pulseaudio-dlna has no tests
   doCheck = false;
 
   propagatedBuildInputs = with pythonPackages; [
     dbus-python docopt requests setproctitle protobuf psutil futures
-    chardet notify2 netifaces pyroute2 pygobject2 lxml zeroconf ]
+    chardet notify2 netifaces pyroute2 pygobject2 lxml ]
+    ++ [ zeroconf ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional opusSupport opusTools
     ++ stdenv.lib.optional faacSupport faac
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
new file mode 100644
index 000000000000..9532c467d2bb
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ifaddr
+, typing
+, isPy27
+, pythonOlder
+, netifaces
+, six
+, enum-compat
+}:
+
+buildPythonPackage rec {
+  pname = "zeroconf";
+  version = "0.19.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
+  };
+
+  propagatedBuildInputs = [ netifaces six enum-compat ifaddr ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+
+  meta = with stdenv.lib; {
+    description = "A pure python implementation of multicast DNS service discovery";
+    homepage = https://github.com/jstasiak/python-zeroconf;
+    license = licenses.lgpl21;
+    maintainers = [ ];
+  };
+}
diff --git a/nixpkgs/pkgs/applications/audio/vocal/default.nix b/nixpkgs/pkgs/applications/audio/vocal/default.nix
index c89fe9ef26e9..b6ba5ec349a1 100644
--- a/nixpkgs/pkgs/applications/audio/vocal/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vocal/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vocal";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "needle-and-thread";
     repo = pname;
     rev = version;
-    sha256 = "0jz72nmc6qmadsvcpk339x1fm4wg6yx9r1bagr7mcgnz3x5papnr";
+    sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 2c560ba599f3..7f0a318741fc 100644
--- a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -95,6 +95,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    advice-patch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "advice-patch";
+        ename = "advice-patch";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/advice-patch-0.1.el";
+          sha256 = "0mb7linzsnf72vzkn9h6w2i2b0h92h6qzkapyrv61vh5a67k1m0s";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/advice-patch.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     aggressive-indent = callPackage ({ cl-lib ? null
                                      , elpaBuild
                                      , emacs
@@ -163,10 +178,10 @@
       elpaBuild {
         pname = "arbitools";
         ename = "arbitools";
-        version = "0.97";
+        version = "0.976";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/arbitools-0.97.el";
-          sha256 = "0fx1z4mw3v42xzixsj80xw56pg00bch04galkjbxbqzm25nl4aha";
+          url = "https://elpa.gnu.org/packages/arbitools-0.976.el";
+          sha256 = "08lvm921zhm22aghz17pps0b5g4f1xyyrl0qisdvd98kz1ajq7xr";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -268,10 +283,10 @@
       elpaBuild {
         pname = "avy";
         ename = "avy";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/avy-0.4.0.tar";
-          sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn";
+          url = "https://elpa.gnu.org/packages/avy-0.5.0.tar";
+          sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -309,6 +324,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "bnf-mode";
+        ename = "bnf-mode";
+        version = "0.4.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.2.tar";
+          sha256 = "04wl563hxgjbhz6hhwvysdfvdni9fm7kahy5wxkyqxi1sy64gn7d";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     brief = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "brief";
@@ -332,10 +362,10 @@
       elpaBuild {
         pname = "buffer-expose";
         ename = "buffer-expose";
-        version = "0.4.1";
+        version = "0.4.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/buffer-expose-0.4.1.el";
-          sha256 = "05b1mhcv3860g93a7myqqrhmb9gpp19b4bcxhmdbmf4m0f7p9fw4";
+          url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.el";
+          sha256 = "1blpvan31mvqhzal16sdn564jnfnn7xsfn8zb65ijndh23drljwd";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -512,10 +542,10 @@
       elpaBuild {
         pname = "company";
         ename = "company";
-        version = "0.9.9";
+        version = "0.9.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.9.9.tar";
-          sha256 = "1qinkz8gwgc27p3p3c9kddrrwx0jb4w0vgx7jq8fwpfj1n92m1rv";
+          url = "https://elpa.gnu.org/packages/company-0.9.10.tar";
+          sha256 = "1w6a11rzsx5iyxn76xarzbghm460j0ampqxlh4j12bswvbn7swnd";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -546,10 +576,10 @@
       elpaBuild {
         pname = "company-math";
         ename = "company-math";
-        version = "1.1";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-math-1.1.tar";
-          sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp";
+          url = "https://elpa.gnu.org/packages/company-math-1.3.tar";
+          sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
@@ -705,10 +735,10 @@
       elpaBuild {
         pname = "debbugs";
         ename = "debbugs";
-        version = "0.17";
+        version = "0.18";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.17.tar";
-          sha256 = "0zclh2nxj5p10n214sxyxy3ca07l5s9p5spk0xp1smr6nzn0w7gb";
+          url = "https://elpa.gnu.org/packages/debbugs-0.18.tar";
+          sha256 = "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07";
         };
         packageRequires = [ cl-lib emacs soap-client ];
         meta = {
@@ -810,10 +840,10 @@
       elpaBuild {
         pname = "disk-usage";
         ename = "disk-usage";
-        version = "1.3.1";
+        version = "1.3.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/disk-usage-1.3.1.el";
-          sha256 = "1jkwlg7w4090a7byfjh30mjz1libls8n71pphmn3973hqwaclnr7";
+          url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.el";
+          sha256 = "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -900,10 +930,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.6.6";
+        version = "0.6.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.6.6.tar";
-          sha256 = "1jgx099z9xg47v698qjbk5q70bakfw7zxaj25z4jz1mq64fvk6b5";
+          url = "https://elpa.gnu.org/packages/ebdb-0.6.8.tar";
+          sha256 = "0bcs4f2l6cdg6hx3crk0vchhljhgwd1ik8n0p001gs1mk91178jp";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -956,6 +986,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "eev";
+        ename = "eev";
+        version = "20190425";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/eev-20190425.tar";
+          sha256 = "0wffwdkk68hcnkggrfmx0ag3pmapdzwzq54sx8y0m68aw0by90y1";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/eev.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     eglot = callPackage ({ elpaBuild
                          , emacs
                          , fetchurl
@@ -985,10 +1030,10 @@
       elpaBuild {
         pname = "el-search";
         ename = "el-search";
-        version = "1.11.4";
+        version = "1.12.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.11.4.tar";
-          sha256 = "152kx9s72h94n6nsrn84cmfb264cdw61ny5fn0n3fa581ipy34nm";
+          url = "https://elpa.gnu.org/packages/el-search-1.12.5.tar";
+          sha256 = "0q6fnjp2hh8p1l7wj7645szlz6qxdfy71s0xljjrmc2836i32xzc";
         };
         packageRequires = [ cl-print emacs stream ];
         meta = {
@@ -1162,10 +1207,10 @@
       elpaBuild {
         pname = "flymake";
         ename = "flymake";
-        version = "1.0.5";
+        version = "1.0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flymake-1.0.5.el";
-          sha256 = "1zxzad84gcbdfh3pp606sspy8zkgxvngbzbimc2cam4pjcmwfx1y";
+          url = "https://elpa.gnu.org/packages/flymake-1.0.6.el";
+          sha256 = "10n9vnabiz3m5gs3azc76x7y1p9qhc6aspgygw7awq9ff6hhkhbw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1177,10 +1222,10 @@
       elpaBuild {
         pname = "fountain-mode";
         ename = "fountain-mode";
-        version = "2.6.2";
+        version = "2.7.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/fountain-mode-2.6.2.el";
-          sha256 = "0ysxk9ap919scg2zz0psw8hk1dj35ys9p0havswsjzm46k43xd6z";
+          url = "https://elpa.gnu.org/packages/fountain-mode-2.7.1.el";
+          sha256 = "198ls0rvzgpb942mvjyljgbaxp05wjys1a003bfq528przv0vpaz";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1207,10 +1252,10 @@
       elpaBuild {
         pname = "frog-menu";
         ename = "frog-menu";
-        version = "0.2.2";
+        version = "0.2.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/frog-menu-0.2.2.el";
-          sha256 = "0kv31p42gmi01xalbvwksk10l28ascdr214bmv1z22dipv0zm30i";
+          url = "https://elpa.gnu.org/packages/frog-menu-0.2.8.el";
+          sha256 = "18f937lvhw2dxwldahim13pr3ppndssjp0dis95iaspiwg9mwc4h";
         };
         packageRequires = [ avy emacs posframe ];
         meta = {
@@ -1308,6 +1353,23 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnu-elpa-keyring-update = callPackage ({ elpaBuild
+                                           , fetchurl
+                                           , lib }:
+      elpaBuild {
+        pname = "gnu-elpa-keyring-update";
+        ename = "gnu-elpa-keyring-update";
+        version = "2019.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2019.3.tar";
+          sha256 = "1zw65kag25abimg088m4h8vj2nd4y5nc4qal6fsda0dldckfv1w0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnugo = callPackage ({ ascii-art-to-unicode
                          , cl-lib ? null
                          , elpaBuild
@@ -1332,10 +1394,10 @@
       elpaBuild {
         pname = "gnus-mock";
         ename = "gnus-mock";
-        version = "0.4.0";
+        version = "0.4.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnus-mock-0.4.0.tar";
-          sha256 = "058bd4f8za9bxayrd2j5b05qvk8lxxm8mmfwxb73d7k15z3z3l3s";
+          url = "https://elpa.gnu.org/packages/gnus-mock-0.4.2.tar";
+          sha256 = "04ddmdm2hykgr2y9g2yzmjp3fszhaywwnxhiy608cpvqdjwlwhn7";
         };
         packageRequires = [];
         meta = {
@@ -1373,12 +1435,12 @@
           license = lib.licenses.free;
         };
       }) {};
-    guess-language = callPackage ({ advice
-                                  , cl-lib ? null
+    guess-language = callPackage ({ cl-lib ? null
                                   , elpaBuild
                                   , emacs
                                   , fetchurl
-                                  , lib }:
+                                  , lib
+                                  , nadvice }:
       elpaBuild {
         pname = "guess-language";
         ename = "guess-language";
@@ -1387,7 +1449,7 @@
           url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el";
           sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz";
         };
-        packageRequires = [ advice cl-lib emacs ];
+        packageRequires = [ cl-lib emacs nadvice ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/guess-language.html";
           license = lib.licenses.free;
@@ -1489,10 +1551,10 @@
       elpaBuild {
         pname = "hyperbole";
         ename = "hyperbole";
-        version = "7.0.2";
+        version = "7.0.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar";
-          sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs";
+          url = "https://elpa.gnu.org/packages/hyperbole-7.0.3.tar";
+          sha256 = "1mvplaxfjji00gg8rkhidfsdl8knwi6c0ai149zm4djsfaww3ikh";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1534,10 +1596,10 @@
       elpaBuild {
         pname = "ivy";
         ename = "ivy";
-        version = "0.10.0";
+        version = "0.11.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar";
-          sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm";
+          url = "https://elpa.gnu.org/packages/ivy-0.11.0.tar";
+          sha256 = "1pxapdc7jarqc8lf3a3fsn4nsi4j146dh07f89xkj087psq30v50";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1744,10 +1806,10 @@
       elpaBuild {
         pname = "load-relative";
         ename = "load-relative";
-        version = "1.3";
+        version = "1.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/load-relative-1.3.el";
-          sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps";
+          url = "https://elpa.gnu.org/packages/load-relative-1.3.1.el";
+          sha256 = "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj";
         };
         packageRequires = [];
         meta = {
@@ -1819,10 +1881,10 @@
       elpaBuild {
         pname = "math-symbol-lists";
         ename = "math-symbol-lists";
-        version = "1.1";
+        version = "1.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
-          sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz";
+          url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el";
+          sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86";
         };
         packageRequires = [];
         meta = {
@@ -2038,10 +2100,10 @@
       elpaBuild {
         pname = "nhexl-mode";
         ename = "nhexl-mode";
-        version = "1.2";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-1.2.el";
-          sha256 = "031h22p564qdvr9khs05qcba06pmsk68cr7zyc7c04hfr3y3ziaf";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-1.3.el";
+          sha256 = "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2139,6 +2201,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    olivetti = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "olivetti";
+        ename = "olivetti";
+        version = "1.7.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/olivetti-1.7.1.el";
+          sha256 = "1bk41bqri0ycpab46c7a6i5k3js1pm5k6d76y91mp3l2izy2bxwj";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/olivetti.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "omn-mode";
@@ -2158,10 +2235,10 @@
       elpaBuild {
         pname = "on-screen";
         ename = "on-screen";
-        version = "1.3.2";
+        version = "1.3.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el";
-          sha256 = "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv";
+          url = "https://elpa.gnu.org/packages/on-screen-1.3.3.el";
+          sha256 = "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2469,8 +2546,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud = callPackage ({ cl-lib ? null
-                           , elpaBuild
+    realgud = callPackage ({ elpaBuild
                            , emacs
                            , fetchurl
                            , lib
@@ -2480,23 +2556,141 @@
       elpaBuild {
         pname = "realgud";
         ename = "realgud";
-        version = "1.4.5";
+        version = "1.5.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar";
-          sha256 = "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24";
+          url = "https://elpa.gnu.org/packages/realgud-1.5.0.tar";
+          sha256 = "0bfshrgkfrfb1d8insnb5n25230xd0scdk6bijhgh34q2phjy2fy";
         };
-        packageRequires = [
-          cl-lib
-          emacs
-          load-relative
-          loc-changes
-          test-simple
-        ];
+        packageRequires = [ emacs load-relative loc-changes test-simple ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/realgud.html";
           license = lib.licenses.free;
         };
       }) {};
+    realgud-ipdb = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , realgud }:
+      elpaBuild {
+        pname = "realgud-ipdb";
+        ename = "realgud-ipdb";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar";
+          sha256 = "1ljh2igm6na92jdvnn4f51019v3klc6k03nayxf6qxzaxwq2w254";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-jdb = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib
+                               , load-relative
+                               , realgud }:
+      elpaBuild {
+        pname = "realgud-jdb";
+        ename = "realgud-jdb";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar";
+          sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-lldb = callPackage ({ elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , realgud }:
+      elpaBuild {
+        pname = "realgud-lldb";
+        ename = "realgud-lldb";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar";
+          sha256 = "0nqbvknhvw5lwf4i44q8wvh4y4s9mvs5kn7lskg3xicl464ag1d0";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-debug = callPackage ({ cl-lib ? null
+                                      , elpaBuild
+                                      , emacs
+                                      , fetchurl
+                                      , lib
+                                      , load-relative
+                                      , realgud }:
+      elpaBuild {
+        pname = "realgud-node-debug";
+        ename = "realgud-node-debug";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar";
+          sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-inspect = callPackage ({ cl-lib ? null
+                                        , elpaBuild
+                                        , emacs
+                                        , fetchurl
+                                        , lib
+                                        , load-relative
+                                        , realgud }:
+      elpaBuild {
+        pname = "realgud-node-inspect";
+        ename = "realgud-node-inspect";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar";
+          sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-trepan-ni = callPackage ({ cl-lib ? null
+                                     , elpaBuild
+                                     , emacs
+                                     , fetchurl
+                                     , lib
+                                     , load-relative
+                                     , realgud }:
+      elpaBuild {
+        pname = "realgud-trepan-ni";
+        ename = "realgud-trepan-ni";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar";
+          sha256 = "0vakfzlk4pgqi66mdvwqhzgdsnks6clgnj7cjjbi80v3ipkfdnak";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     register-list = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "register-list";
@@ -2516,10 +2710,10 @@
       elpaBuild {
         pname = "relint";
         ename = "relint";
-        version = "1.6";
+        version = "1.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/relint-1.6.el";
-          sha256 = "17nyy3zqpqgs22lrrpdm0k56xnhj5l3y2y3lnmhcqw63xksgbsyk";
+          url = "https://elpa.gnu.org/packages/relint-1.8.el";
+          sha256 = "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3";
         };
         packageRequires = [ xr ];
         meta = {
@@ -2623,6 +2817,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "shelisp";
+        ename = "shelisp";
+        version = "0.9.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el";
+          sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shelisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "shen-mode";
@@ -2653,6 +2862,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "smalltalk-mode";
+        ename = "smalltalk-mode";
+        version = "3.2.92";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/smalltalk-mode-3.2.92.tar";
+          sha256 = "0zlp1pk88m1gybhnvcmm0bhrj6zvnjzhc26r1i4d56pyh6vwivfj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "smart-yank";
@@ -2762,10 +2986,10 @@
       elpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "3.0";
+        version = "3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ssh-deploy-3.0.tar";
-          sha256 = "0lv9qwm1dhcd2l2mnhjfpqsz6xx0wabjg5j5sm3425fjsaqws6m7";
+          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar";
+          sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3194,10 +3418,10 @@
       elpaBuild {
         pname = "websocket";
         ename = "websocket";
-        version = "1.8";
+        version = "1.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/websocket-1.8.tar";
-          sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9";
+          url = "https://elpa.gnu.org/packages/websocket-1.9.tar";
+          sha256 = "00sd0dawpjcr79w6klya5ywq9r1p86d97z62vqpjij6yg5qv470f";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3314,10 +3538,10 @@
       elpaBuild {
         pname = "xr";
         ename = "xr";
-        version = "1.10";
+        version = "1.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xr-1.10.tar";
-          sha256 = "16p68rj5h609pnbp7y0jiiq1zkbksh4qqi1q8yby3ldj5x9sfpwc";
+          url = "https://elpa.gnu.org/packages/xr-1.12.tar";
+          sha256 = "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g";
         };
         packageRequires = [];
         meta = {
@@ -3362,10 +3586,10 @@
       elpaBuild {
         pname = "zones";
         ename = "zones";
-        version = "2018.12.28";
+        version = "2019.4.30";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/zones-2018.12.28.el";
-          sha256 = "1jd7wy5w96xppdlcl4dzq4wqhr2x6f4hzjps9f4kz256l4ia6hm0";
+          url = "https://elpa.gnu.org/packages/zones-2019.4.30.el";
+          sha256 = "0f0ryd9wnkg7vh2jv30bqhpzzkaf0gc2ysmib6y36s3m8c2sa9b6";
         };
         packageRequires = [];
         meta = {
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 10910539d035..9b2604332454 100644
--- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -245,12 +245,12 @@
       melpaBuild {
         pname = "abs-mode";
         ename = "abs-mode";
-        version = "20190326.1002";
+        version = "20190404.1604";
         src = fetchFromGitHub {
           owner = "abstools";
           repo = "abs-mode";
-          rev = "a9a512992f681669dc59fe9ca86f12b9688b5454";
-          sha256 = "0v6d7cxnj4mil7c7y4m1csiznl6rmzxg9snwhhv6wdqfw112kn8j";
+          rev = "31fb36f9206203062b8c618fef6ad484e44af226";
+          sha256 = "0h0zsjqhjm18ppmaqv2kn4q1mchc1igcz80zwz8523n2w2gk9bri";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aabccc4061e7764069796e12ee9688b67651cf70/recipes/abs-mode";
@@ -437,12 +437,12 @@
       melpaBuild {
         pname = "ac-dcd";
         ename = "ac-dcd";
-        version = "20190326.1245";
+        version = "20190425.207";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "ac-dcd";
-          rev = "143be7d67eeb03929f01fc04ee79db8f18f35604";
-          sha256 = "1xms02m8r5n2glzrw6kp5jdnqkar46g8kpq46sg5m1x61q9ny9iq";
+          rev = "9d444523ffa92a763ea8f532b8001829a51a2557";
+          sha256 = "1fkpvr7mix9wvhd6pgbcj6mrmhrffvlh5sp8wp5m48j0qc3wx7mi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd";
@@ -924,12 +924,12 @@
       melpaBuild {
         pname = "ac-php";
         ename = "ac-php";
-        version = "20190406.716";
+        version = "20190423.1922";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd";
-          sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x";
+          rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b";
+          sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -950,23 +950,24 @@
                                , melpaBuild
                                , php-mode
                                , popup
-                               , s }:
+                               , s
+                               , xcscope }:
       melpaBuild {
         pname = "ac-php-core";
         ename = "ac-php-core";
-        version = "20190406.1615";
+        version = "20190531.2322";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "998313d7ebb775261b64a5347697d4926c75d3f1";
-          sha256 = "1lin8lsgmb31vn2rcry1bpmjgrwz4cjccdn7vyf96klw5a49a4wg";
+          rev = "19b34b56ebc0eaabf9b1f4a8ac6819bde9855d2b";
+          sha256 = "02j0dwzbvi744ybdqwx8dan1ahl2yar7cw20n619vbmxn0r6pml2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
           sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn";
           name = "recipe";
         };
-        packageRequires = [ dash f php-mode popup s ];
+        packageRequires = [ dash f php-mode popup s xcscope ];
         meta = {
           homepage = "https://melpa.org/#/ac-php-core";
           license = lib.licenses.free;
@@ -1415,12 +1416,12 @@
       melpaBuild {
         pname = "ace-window";
         ename = "ace-window";
-        version = "20190326.242";
+        version = "20190527.651";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "301c762f2fe36737ada479d9037776b1ec3741e3";
-          sha256 = "1d8jnpb6kxvv5rfmprgfpfv3vs537pwj0y1g597yx6xdl0ilan3m";
+          rev = "138a80cbc4e9ed17d3a085a3687f5223a142a9a3";
+          sha256 = "1b9b5zjm7lkdnj3zrk9sh271jdx96wd267774781dlf29i8mgm9q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1509,9 +1510,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    activity-watch-mode = callPackage ({ emacs
+    activity-watch-mode = callPackage ({ cl
+                                       , emacs
                                        , fetchFromGitHub
                                        , fetchurl
+                                       , json ? null
                                        , lib
                                        , melpaBuild
                                        , projectile
@@ -1519,19 +1522,19 @@
       melpaBuild {
         pname = "activity-watch-mode";
         ename = "activity-watch-mode";
-        version = "20181228.34";
+        version = "20190423.829";
         src = fetchFromGitHub {
           owner = "pauldub";
           repo = "activity-watch-mode";
-          rev = "27a0841b32dfd2b691a1dcf3a4a50d74660676b1";
-          sha256 = "1hfmll3g33529pshzvh2gxqr0h53p1v68wq0zlq2h2wfml89bzr9";
+          rev = "c2ad321952524d88dd34842a6989b6e2d8acb646";
+          sha256 = "1fan25w5zb33i8mbd06iwz8vjac0alcv1r73h9hyzdkn8ivl6k3s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9780c413da8001651191fb8f9708fe9691d714cf/recipes/activity-watch-mode";
           sha256 = "0k0ai6658gb43c4ylrq66zqzrfh6ksvkf0kxj2qx8a5a1aw9bd4d";
           name = "recipe";
         };
-        packageRequires = [ emacs projectile request ];
+        packageRequires = [ cl emacs json projectile request ];
         meta = {
           homepage = "https://melpa.org/#/activity-watch-mode";
           license = lib.licenses.free;
@@ -1899,6 +1902,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    aio = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "aio";
+        ename = "aio";
+        version = "20190601.53";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-aio";
+          rev = "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc";
+          sha256 = "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95744cc13e7ac8d9acd794004d951f62e5880fa4/recipes/aio";
+          sha256 = "0sd8g2w4n9r2ndmp353v89xvky8043vmd92v2ggbl45chhpjl5zw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/aio";
+          license = lib.licenses.free;
+        };
+      }) {};
     airline-themes = callPackage ({ fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -2073,12 +2102,12 @@
       melpaBuild {
         pname = "alect-themes";
         ename = "alect-themes";
-        version = "20190203.1312";
+        version = "20190506.740";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "588eb9ef66c319705a4d94003eacd90ad9de29c2";
-          sha256 = "16ycqbd8g1gv8y5qk0j1q2ka4lfbgqpcdfa0mshjmfnw0kjvyshc";
+          rev = "da7305075d292cc1909bf26dc5634bc3cc8d2603";
+          sha256 = "06nsfmydlcdqi4fp3nn6yz4xys38f3q196pf3bmmdqgg7pbcm259";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -2289,12 +2318,12 @@
       melpaBuild {
         pname = "all-the-icons-ivy";
         ename = "all-the-icons-ivy";
-        version = "20190114.49";
+        version = "20190508.1103";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "all-the-icons-ivy";
-          rev = "5d9c6bd5e6484398dd596663d0afe4be730f6f9f";
-          sha256 = "1d5jw9afpcs8g274fxd6zapxdg5wy096xv99y7r9ykbkfbfl6wz5";
+          rev = "babea626db20773de4c408acb2788e2b9c8277e3";
+          sha256 = "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
@@ -2307,6 +2336,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    almost-mono-themes = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "almost-mono-themes";
+        ename = "almost-mono-themes";
+        version = "20190526.2354";
+        src = fetchFromGitHub {
+          owner = "cryon";
+          repo = "almost-mono-themes";
+          rev = "c3a85c1a665530a5d830665969725cdba8eceb75";
+          sha256 = "034k32xkr5ma415hlkbl35z0jxc4sa1inf87hg3y6lrlfl83fyjh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71ca87a0dd28f911dd988e1c208896b1ec5bfcc7/recipes/almost-mono-themes";
+          sha256 = "1lv7c63lii8463mmsmxnldkwark2c6n46j9zvf990dhacwl4q1mg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/almost-mono-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     amd-mode = callPackage ({ emacs
                             , f
                             , fetchFromGitHub
@@ -2349,6 +2404,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ameba = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "ameba";
+        ename = "ameba";
+        version = "20190503.513";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "ameba.el";
+          rev = "76258a17e9ac6dee05469740938920dc3b7a0bb9";
+          sha256 = "1crs6qq74krib1mi0z03d0r5xh0k3sf6j57g6s68v1x69zi9vc0a";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/ameba";
+          sha256 = "0500r0yihd208zc8cvdqgfn58a7mrhfnb0lqy509b4k0i8y0v5mq";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ameba";
+          license = lib.licenses.free;
+        };
+      }) {};
     ammonite-term-repl = callPackage ({ emacs
                                       , fetchFromGitHub
                                       , fetchurl
@@ -2359,12 +2440,12 @@
       melpaBuild {
         pname = "ammonite-term-repl";
         ename = "ammonite-term-repl";
-        version = "20190228.2316";
+        version = "20190511.1712";
         src = fetchFromGitHub {
           owner = "zwild";
           repo = "ammonite-term-repl";
-          rev = "c5c1f6e2491282983cf55573b48a3e8de06aaae5";
-          sha256 = "061qvm6jqydsv7bgwcbaxh1d8ck3nab1szlql0ass1hsak6g028i";
+          rev = "e8fcb22099d58c8c2becff0c66a87acf46dab132";
+          sha256 = "05drkc8dz89i8j8y9smwz7yz0vhbg33cxb6bs1lh1mmhyw3kq9jp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a/recipes/ammonite-term-repl";
@@ -2461,12 +2542,12 @@
       melpaBuild {
         pname = "amx";
         ename = "amx";
-        version = "20181011.1551";
+        version = "20190418.2030";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "amx";
-          rev = "4b08edb34c4d9c807ef1a820a629cda15e2347a0";
-          sha256 = "1vs9hrldg3amxv61m2gpph8fdjidsa7x17djxx23r7px5mhkwqgn";
+          rev = "b46e77d8ef9d1edf225e67055001f7e85048f842";
+          sha256 = "0hrgq6kmfqx21y0dpvhwd82rap75lnn2lzlhria893yvqc7phzn5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -2534,6 +2615,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    android-env = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "android-env";
+        ename = "android-env";
+        version = "20190513.622";
+        src = fetchFromGitHub {
+          owner = "fernando-jascovich";
+          repo = "android-env.el";
+          rev = "e89361c53304f0db1120b031876b9a7ff992b8fb";
+          sha256 = "1qrjxg5bb2vg50cnmf8ifn3fs5vg55l2zydnx4j6yk7acicvj94m";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/570ad0e94736d9fd16f3909bcfa928a9153ea703/recipes/android-env";
+          sha256 = "1gfxrfg42rn2rzh5fr4w6h8ngczhl56jghfgrffz9x8wcxxmqgpr";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/android-env";
+          license = lib.licenses.free;
+        };
+      }) {};
     android-mode = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -2701,12 +2808,12 @@
       melpaBuild {
         pname = "annotate";
         ename = "annotate";
-        version = "20171110.2336";
+        version = "20190519.6";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "annotate.el";
-          rev = "dedbd9e5d5286f1ca8ad73e489d408a20f06156c";
-          sha256 = "12s5jc1i78x90s34ijljd75v1z6sisfrpix852gcisb9lpibbpz7";
+          rev = "09d0cd89e458779ca375ac28bc664ee2e20db530";
+          sha256 = "141pqfrrzbqaxxcr6m6ri9r6k1mg5i3cv8v2kili365cypnjdg1y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -3059,12 +3166,12 @@
       melpaBuild {
         pname = "apache-mode";
         ename = "apache-mode";
-        version = "20180723.2051";
+        version = "20190521.2013";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "apache-mode";
-          rev = "d2ac57942f852a727db4fc73004e1e8f046cb657";
-          sha256 = "1srlkqa2bq2p1nyh6r7f3b2754dqlgw28h0wbafmdlfk12jc8xy3";
+          rev = "354f9302a8d805ac80d846adcd1cef10830b3d51";
+          sha256 = "1grs2x51k8pa6sgfa82s5pwwdfv7zw46ccw0zvd2rvzbhpq21p2z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
@@ -3211,12 +3318,12 @@
       melpaBuild {
         pname = "aproject";
         ename = "aproject";
-        version = "20150605.206";
+        version = "20190530.2013";
         src = fetchFromGitHub {
           owner = "vietor";
           repo = "aproject";
-          rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
-          sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
+          rev = "702caf5392288dfd821b1e744fef0bb4fd9f9281";
+          sha256 = "18n3gsghj7sxxd6kpp21b2p7qwv93giwyr1zfvgbs8pzsbc8i9rx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject";
@@ -3628,12 +3735,12 @@
       melpaBuild {
         pname = "async";
         ename = "async";
-        version = "20181223.2054";
+        version = "20190502.2356";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "81dc034572e963550c5403a2b3c28047e46b4029";
-          sha256 = "04lxfpdfvbh67cv9i3j7jya56lv3q97qp5b75zfy1k4dzqhjzfpz";
+          rev = "bd68cc1ab1ac6af890e250bdaa12ffb1cb9649be";
+          sha256 = "02n46dqbpdjlj65s1aka6ky49rgv2rpn06lzpfxwxl7kkzclc5f8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -3731,12 +3838,12 @@
       melpaBuild {
         pname = "atom-one-dark-theme";
         ename = "atom-one-dark-theme";
-        version = "20190107.821";
+        version = "20190605.946";
         src = fetchFromGitHub {
           owner = "jonathanchu";
           repo = "atom-one-dark-theme";
-          rev = "8714ebcb8f35a4a07fa98666eee2727f860da53a";
-          sha256 = "1z2w3szxwvgzqlg8zbdaw3jancyg421zawcgc317dyx7dryrpb5j";
+          rev = "bbad275cd51dcee14c42be647b15c39ffb26aac0";
+          sha256 = "01df7z5mkpvl6lvcz0jn4jyvs2q94mszviqaxvc65wswrvxa05di";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3946,12 +4053,12 @@
       melpaBuild {
         pname = "auth-source-pass";
         ename = "auth-source-pass";
-        version = "20190113.2049";
+        version = "20190528.1259";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "e572c7a5a63710ddd2f979a83a4e16d248dc65c6";
-          sha256 = "1127rdyyl77yvr6gb2daa11hfbz145iw5bm6dwzd1f82qyfa58iv";
+          rev = "4b8e5e2d35ac3de1933e6ea55b3d59f181f4568f";
+          sha256 = "017jlxvzg31wmxsp04y71fnk80qgwbigsdp2z35y94xqcfnpij3k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass";
@@ -4599,16 +4706,16 @@
       melpaBuild {
         pname = "auto-rename-tag";
         ename = "auto-rename-tag";
-        version = "20181215.2324";
+        version = "20190524.2328";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "auto-rename-tag";
-          rev = "00080e323addaaca560842feb87ca688e7a3d9b6";
-          sha256 = "1pksqhfw3np7lkw0xjhpsq3zv3zbxmq3561g77n2c503qyzjpmx8";
+          rev = "4bd41b3107d3971c9533f9d0c8718c299669cb78";
+          sha256 = "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/edf44f990306d9edba7054cb8f530208e53d69bc/recipes/auto-rename-tag";
-          sha256 = "058fn84sw15kdyxgnjzdi4lq6s9xg63cw8vzparh6km3xf2pqw0x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/auto-rename-tag";
+          sha256 = "0ysm559b2p2v2v39cssx5cviy2qb78cjvhmy76hih09qimg2azrz";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -5069,12 +5176,12 @@
       melpaBuild {
         pname = "avy";
         ename = "avy";
-        version = "20190404.155";
+        version = "20190520.247";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "4d52b5cb7e1c565ca8dfe9c47b54330fd1a395bc";
-          sha256 = "13226jg9ndlnlvy73847rinn8wpx94jw42cj3pp84qplys9zfr2y";
+          rev = "f91ae613a86187c8ca75e86f22e3f5ac9958399c";
+          sha256 = "0kkglpk7x2hps176yzymp112fgmxng1r3pfbb48hh9ivsbmzykl7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -5179,12 +5286,12 @@
       melpaBuild {
         pname = "avy-zap";
         ename = "avy-zap";
-        version = "20160921.1444";
+        version = "20190411.2020";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "avy-zap";
-          rev = "6081738668ab726099ce1c711c580d9745dfaede";
-          sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy";
+          rev = "f1089c96b290225032a09c14e87568958ac93438";
+          sha256 = "14ihz0bj1grpy25l5mapcmfjxw2pvcmkxi53vc2db73di8panv3p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap";
@@ -5233,12 +5340,12 @@
       melpaBuild {
         pname = "aws-snippets";
         ename = "aws-snippets";
-        version = "20180410.845";
+        version = "20190207.247";
         src = fetchFromGitHub {
           owner = "baron42bba";
           repo = "aws-snippets";
-          rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8";
-          sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w";
+          rev = "9cb1edaaa86609b51a7fbf39ec643cc5ae80eaa1";
+          sha256 = "1rzfzb19h5d0ikysxi0xcbyvv733kdmcmydpc7wwq9qkb31wck56";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets";
@@ -5629,12 +5736,12 @@
       melpaBuild {
         pname = "bart-mode";
         ename = "bart-mode";
-        version = "20180131.1829";
+        version = "20190601.304";
         src = fetchFromGitHub {
           owner = "mschuldt";
           repo = "bart-mode";
-          rev = "f6b82f0df2e2b863be7b9383a22413a2fc77f9e0";
-          sha256 = "09z1fk5wbdlqps1102l9fcccz4vb0wcxbbrc4w2r2xrphwjxy6wc";
+          rev = "f70b6c42452e47c0c6b3ebd4c90e555a9bedeec7";
+          sha256 = "0s47ijlnspndia6f1116g6nr6hnirmba6fkvdcvw4qm7mhn5xrc9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode";
@@ -5654,12 +5761,12 @@
       melpaBuild {
         pname = "base16-theme";
         ename = "base16-theme";
-        version = "20190329.1706";
+        version = "20190603.1342";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "053c9da5ad0ecbac5652bcfbf3b5d1badb9ab272";
-          sha256 = "1nhirkx4ww9spqxkvdwbsf6lhj6a4ln5r0q6fjr2pdxnx7d02skp";
+          rev = "880646d8c574e3b4eecfa870e135fc564766c93d";
+          sha256 = "1kmnwbm1jgmrs6jdc3mlmx6ga9dzhiqpqa8a9js6ws4rdl2iz7dr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -5679,12 +5786,12 @@
       melpaBuild {
         pname = "bash-completion";
         ename = "bash-completion";
-        version = "20180519.920";
+        version = "20190516.1154";
         src = fetchFromGitHub {
           owner = "szermatt";
           repo = "emacs-bash-completion";
-          rev = "fbdc78b8770833752ac4bda28e2c3ea764bf8e76";
-          sha256 = "1ihmj2nx8sr4cfx03xrpmiqjljri6wv5ib8rgnl8ip42nqhv2g6c";
+          rev = "61592a1ce11efdff1d18bb7675c651a8f914c10d";
+          sha256 = "09chkvcwy12h24wlb92hjyanrsfc1nc735h8bpi0ffy1i8lxmlfm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -5802,6 +5909,50 @@
           license = lib.licenses.free;
         };
       }) {};
+    battle-haxe = callPackage ({ async
+                               , cl-lib ? null
+                               , company
+                               , dash
+                               , dash-functional
+                               , emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
+        pname = "battle-haxe";
+        ename = "battle-haxe";
+        version = "20190421.1924";
+        src = fetchFromGitHub {
+          owner = "AlonTzarafi";
+          repo = "battle-haxe";
+          rev = "c25894ef8a148b568922e5c9a5c90c52c5de5e3c";
+          sha256 = "0zlrrxqj95kn4pw8qh8xhldikzfbja61lvjcy7xxhsv5nvgrzc9j";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/75781ee881a8f3215ab40d47273c8a9d1fed7949/recipes/battle-haxe";
+          sha256 = "02x7hchk3jninas4mybn98m09wn1bfqqdjfq45b6rgw1am6mvvwz";
+          name = "recipe";
+        };
+        packageRequires = [
+          async
+          cl-lib
+          company
+          dash
+          dash-functional
+          emacs
+          f
+          helm
+          s
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/battle-haxe";
+          license = lib.licenses.free;
+        };
+      }) {};
     bazel-mode = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
@@ -5810,12 +5961,12 @@
       melpaBuild {
         pname = "bazel-mode";
         ename = "bazel-mode";
-        version = "20180222.2253";
+        version = "20190606.100";
         src = fetchFromGitHub {
           owner = "codesuki";
           repo = "bazel-mode";
-          rev = "b7aa14516feaed40ee4910eafa81db719de0fe56";
-          sha256 = "16yjxs62h8dm63nzc04i60bnbyhm2vrpvn98ap8rad6wib2ka3vj";
+          rev = "f07e75fc2dd97ba20e40806927409357aaad2496";
+          sha256 = "0grbvzqy4x6wh2951jsh5mmbhwbd6j5figqj7v9q5px5alprjqsl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
@@ -5969,12 +6120,12 @@
       melpaBuild {
         pname = "bbdb-vcard";
         ename = "bbdb-vcard";
-        version = "20181005.319";
+        version = "20190410.1354";
         src = fetchFromGitHub {
           owner = "tohojo";
           repo = "bbdb-vcard";
-          rev = "3e8630a8c45add7b495d7ef290ba9f402b359489";
-          sha256 = "0f4ccbffp5j1jzgpqb26dgsb8k3aikzam21ilqfcq8ac4sl6l4g6";
+          rev = "853cbcd882be137a5488c70328c25f5982aca657";
+          sha256 = "0r8xcxvzalf5g12mqy6w7yv34nxd8n2wcqa5ib06nf40n162nrwg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd5d9027c49beae89f78d2a30dfa4bd070dff1bd/recipes/bbdb-vcard";
@@ -6267,6 +6418,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    better-jumper = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "better-jumper";
+        ename = "better-jumper";
+        version = "20190510.947";
+        src = fetchFromGitHub {
+          owner = "gilbertw1";
+          repo = "better-jumper";
+          rev = "2c04d4bc09da88c5b8b276c87d3f9f56e517144e";
+          sha256 = "1gzmhgr17mvxj1qvcisfq74dbb2rsgzx2wrbjf36jrwfzx7sdjxw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b08970e3bd5d64e640158d98d7e3ab5031d82895/recipes/better-jumper";
+          sha256 = "0javbi799yijc3lb4dzkjwj4f4wxxrga9iixik544z98412ia8an";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/better-jumper";
+          license = lib.licenses.free;
+        };
+      }) {};
     better-shell = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -6724,12 +6901,12 @@
       melpaBuild {
         pname = "bing-dict";
         ename = "bing-dict";
-        version = "20181110.1800";
+        version = "20190122.2102";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "bing-dict.el";
-          rev = "51266b11bca22923c3a86bc101abf9145d1397d3";
-          sha256 = "0c6d1kmgf9gyrqqfxisdlaavb4rx5scnh7dgqswlmj2fqws3yvna";
+          rev = "7ac91fa718a5fb4620ccc13a53b1b82de8005ac8";
+          sha256 = "0swx68wmrlgqx9kp6jfzsfvi6v0r55cyal0p6b2xh1gj6iwa61ml";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
@@ -6934,12 +7111,12 @@
       melpaBuild {
         pname = "blacken";
         ename = "blacken";
-        version = "20190301.605";
+        version = "20190521.141";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "blacken";
-          rev = "17b48ee432d83517094635f8caaf2db1128d1db1";
-          sha256 = "04202qk6jsckvwc0zwg8513wgfjrnf33cbkv03k3vzwg6zhgmn9z";
+          rev = "1874018ae242176d0780cdcd0109e8f9a123a914";
+          sha256 = "1zgx7j4cp51r2cdlyf744jgfpid4lz7fwwjxbm6cvcp9hv57v7wz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken";
@@ -7149,12 +7326,12 @@
       melpaBuild {
         pname = "bm";
         ename = "bm";
-        version = "20181012.931";
+        version = "20190527.1410";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "b85d407b53e1d852c47fcea2a245a4e67e48c38a";
-          sha256 = "1ypa1971yh6g0kximqxiv90h1l3m6fprwza6l88gwgackhg9wiz0";
+          rev = "637dacf4cb9112fdfb949706a704dd53cbe79c7e";
+          sha256 = "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -7206,12 +7383,12 @@
       melpaBuild {
         pname = "bnf-mode";
         ename = "bnf-mode";
-        version = "20190406.1326";
+        version = "20190514.347";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "bnf-mode";
-          rev = "1dda3ef5f837959d007512d1278a02cf5babfe8e";
-          sha256 = "12y4f4r6rrl4gj0ibql1dj0h4j0z5k78lbxf51d06c2y1xk4xr4b";
+          rev = "2f217ecf76fa775da4b28de7dd2b615460d9f8ad";
+          sha256 = "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode";
@@ -7366,12 +7543,12 @@
       melpaBuild {
         pname = "boogie-friends";
         ename = "boogie-friends";
-        version = "20171024.1955";
+        version = "20190523.356";
         src = fetchFromGitHub {
           owner = "boogie-org";
           repo = "boogie-friends";
-          rev = "7fea709f13c6cb93e4ed672955484201ebe6c123";
-          sha256 = "1sfw59vd2ah054va5q52wf22cdrinv5m207prfzdqs9bsq1qfdac";
+          rev = "079df882503b7a9fb4cd270f3eca1cc8131b49a9";
+          sha256 = "0swiy4ixdn2ps0hm13dppnpq0yk30x58a19whn99nlfdy5fkwhi1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -7421,12 +7598,12 @@
       melpaBuild {
         pname = "boon";
         ename = "boon";
-        version = "20181014.227";
+        version = "20190529.149";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "675719ec1f6608a690fc613214920ac3c0d350a3";
-          sha256 = "1h2mfvpsci60g7gwwwbb62n85sl1xvrmc1n2w3k8xvmszrmk05kq";
+          rev = "501adc6580a24a3dc59925ebcf31363ec2531cfa";
+          sha256 = "0wi6dvq25cd6594jwdiivm7as8j6mvr79982jk7jgk1r170yz9b0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -7450,12 +7627,12 @@
       melpaBuild {
         pname = "borg";
         ename = "borg";
-        version = "20181227.946";
+        version = "20190505.348";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "borg";
-          rev = "5aad7edbaa8a37581af280db64f237619d6c8dc0";
-          sha256 = "16zxl0pmr8z3a2akhnh8g4sd1r7dag4g8p75niych272z0g96cll";
+          rev = "940af3d437b299ef81ce73da4e4ec8c2f52d7a79";
+          sha256 = "0lg2inxzfz6pcblynna4fyi5lxnmbrpl095d6574d0pnn22zdx5a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
@@ -8778,12 +8955,12 @@
       melpaBuild {
         pname = "cal-china-x";
         ename = "cal-china-x";
-        version = "20180211.1101";
+        version = "20190518.357";
         src = fetchFromGitHub {
           owner = "xwl";
           repo = "cal-china-x";
-          rev = "e9b309065829af3a9a0c526509bd64d9228fdced";
-          sha256 = "0wipcsr0dry2r9sw7lcz5hw16b5gpax7qr2nbdlcwj3j9axqipyg";
+          rev = "177f60e011606126f23c8ffed69458439f1c12e0";
+          sha256 = "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x";
@@ -8983,12 +9160,12 @@
       melpaBuild {
         pname = "call-graph";
         ename = "call-graph";
-        version = "20190116.2304";
+        version = "20190507.105";
         src = fetchFromGitHub {
           owner = "beacoder";
           repo = "call-graph";
-          rev = "641d600c3cdb002fd99bcf8040e9c4f372cd5de6";
-          sha256 = "0lbh2bhsj4xicyzcjnpp8794amaswc20ksh4qr7xcs6q8rgfpbbc";
+          rev = "495f192859c71e161f89aa14d530faf2df18139d";
+          sha256 = "0a2gn6a7f54j9x3qr3d2syrpwwxjbsdn41rzqp4jb64lmn4nv82m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph";
@@ -9061,12 +9238,12 @@
       melpaBuild {
         pname = "caml";
         ename = "caml";
-        version = "20190121.716";
+        version = "20190413.505";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "caml-mode";
-          rev = "cd1142f1e6a9ad8d763688877ce76b2a7436d750";
-          sha256 = "1zzsjibiyl947fir1j0swzsq7pk4l1jh8dn86by24zgcpm14gj3c";
+          rev = "38ebde12d3d529e6ef8078967997d32226e69e82";
+          sha256 = "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42667ee0d64bce19ad9081a4fae163a9655641d4/recipes/caml";
@@ -9266,8 +9443,8 @@
           sha256 = "14q76wdlnwg08ais2gpmdrjvshly1wp8p8ckyhdmnwq7x39qvh7d";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
-          sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/606e62bacfc6b6fc1d8bff3e716b743e6f32b29a/recipes/cask";
+          sha256 = "17jv9hhwh3azwa8rc5iljr3c2kz6razq67mvsxi9qnywq4rhrgm9";
           name = "recipe";
         };
         packageRequires = [ ansi cl-lib dash epl f package-build s shut-up ];
@@ -9475,12 +9652,12 @@
       melpaBuild {
         pname = "ccls";
         ename = "ccls";
-        version = "20181225.53";
+        version = "20190512.1857";
         src = fetchFromGitHub {
           owner = "MaskRay";
           repo = "emacs-ccls";
-          rev = "8345c08d1d8fb784d3cc8b35bfbaedfa1861cc2e";
-          sha256 = "1bs4jx36vrkrdfr6ah6hcy19fyv73d39dgrl8w6j555ahswk2c9h";
+          rev = "2764ddd57b03646f0327ea680a954b4a67450aef";
+          sha256 = "16427jvzhjy8kpvlgl3qzkzppv98124hkgi8q8pv1h7m46k9lhh3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be27a4022d58860917a659fce2b7d7791fbea4e2/recipes/ccls";
@@ -9550,12 +9727,12 @@
       melpaBuild {
         pname = "cdlatex";
         ename = "cdlatex";
-        version = "20140707.426";
+        version = "20190130.619";
         src = fetchFromGitHub {
           owner = "cdominik";
           repo = "cdlatex";
-          rev = "1d491c2dddb05cdace1ae0e1f56a36009b065d85";
-          sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
+          rev = "90d785a94c0db7aa0043ea62f5807af3df155438";
+          sha256 = "1yhry3wrqh1ijc0n7140pnbwcamrgi89a75pg03zx0cqb5g6c8i6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cdlatex";
@@ -9684,12 +9861,12 @@
       melpaBuild {
         pname = "centered-cursor-mode";
         ename = "centered-cursor-mode";
-        version = "20180112.755";
+        version = "20190306.206";
         src = fetchFromGitHub {
           owner = "andre-r";
           repo = "centered-cursor-mode.el";
-          rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8";
-          sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i";
+          rev = "152877108504c7cc6ebdcf51d08aea26506e2a6d";
+          sha256 = "0kks14ycvvrfm14hg18cv60gkijvgrija03pz6ibnmc34ab3gvjz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode";
@@ -9913,6 +10090,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    cfrs = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , posframe
+                        , s }:
+      melpaBuild {
+        pname = "cfrs";
+        ename = "cfrs";
+        version = "20190603.1031";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "cfrs";
+          rev = "809cdc642a18f7c2de34bdfb6ad78b2d577dbc09";
+          sha256 = "152dwl4xn2xncq5s16vl9w6z40mllfvc9n4a567i36f73s95p7ia";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce16d27a9d73a5eaffebf7b0ff36d90c292248f/recipes/cfrs";
+          sha256 = "03mi5iz0yny2ddvp41l3yc49583zw0wqsv33rkycjfj562903syx";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs posframe s ];
+        meta = {
+          homepage = "https://melpa.org/#/cfrs";
+          license = lib.licenses.free;
+        };
+      }) {};
     cftag-mode = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
@@ -10593,6 +10799,7 @@
                          , fetchurl
                          , lib
                          , melpaBuild
+                         , parseedn
                          , pkg-info
                          , queue
                          , seq
@@ -10601,12 +10808,12 @@
       melpaBuild {
         pname = "cider";
         ename = "cider";
-        version = "20190331.1314";
+        version = "20190606.223";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "957617895e532217ec0082faf1e80743baf5d4f2";
-          sha256 = "08l7q9ms0wby8r4aagcnw3dzqp20ahagpfwc2as787gd9hs45fac";
+          rev = "d5c551b9d44e4239db04887461efb747411336d6";
+          sha256 = "0shn1krnwa32pvnpyqj30w41xrk318c2jzf9bjbnj2887y28lndg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -10616,6 +10823,7 @@
         packageRequires = [
           clojure-mode
           emacs
+          parseedn
           pkg-info
           queue
           seq
@@ -10658,25 +10866,24 @@
                                       , eval-sexp-fu
                                       , fetchFromGitHub
                                       , fetchurl
-                                      , highlight
                                       , lib
                                       , melpaBuild }:
       melpaBuild {
         pname = "cider-eval-sexp-fu";
         ename = "cider-eval-sexp-fu";
-        version = "20160907.100";
+        version = "20190311.1452";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider-eval-sexp-fu";
-          rev = "06fefc17ea8a87997d1f18b25e78d874b10299ad";
-          sha256 = "1lhf5g5gi31pv2c80fsnw62zfikj3prbs6xwaikbywp48dzhx02y";
+          rev = "7fd229f1441356866aedba611fd0cf4e89b50921";
+          sha256 = "01gky548v3758fyr317lkwsc9aacab6m9d9vk1mrr3qyvmciwd51";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "recipe";
         };
-        packageRequires = [ emacs eval-sexp-fu highlight ];
+        packageRequires = [ emacs eval-sexp-fu ];
         meta = {
           homepage = "https://melpa.org/#/cider-eval-sexp-fu";
           license = lib.licenses.free;
@@ -10883,12 +11090,12 @@
       melpaBuild {
         pname = "citeproc";
         ename = "citeproc";
-        version = "20180429.57";
+        version = "20190422.1317";
         src = fetchFromGitHub {
           owner = "andras-simonyi";
           repo = "citeproc-el";
-          rev = "44f147d228d2d652cdd404d31e987e14519c3eef";
-          sha256 = "01cr362zgswplv0582hrw4y0wz5xgknd2a74ylffax38ws4lydd1";
+          rev = "fa45f1a16f1860b1d873daa75886218d70ab0f29";
+          sha256 = "06ldsw1668fgj5lrp8mk7c9bsxp1dsrl2s4f2j2yykl6rx0j3dyi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc";
@@ -11251,12 +11458,12 @@
       melpaBuild {
         pname = "clj-refactor";
         ename = "clj-refactor";
-        version = "20190405.333";
+        version = "20190516.554";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "cd6b6fb30fc5a429ff209d20af2f2f304937fe99";
-          sha256 = "0bn1bianch1f3c9pps7kxmk6lradmkgqa9bfjqr864w1yrv8yxv5";
+          rev = "9f508bbf7bf8dd439a78066a9d6fa47f4bc8f64f";
+          sha256 = "0kb5zcq8hy7s6ikln0fgfya4shhfvnbx1vigz7g733ppm27bxxsb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clj-refactor";
@@ -11446,12 +11653,12 @@
       melpaBuild {
         pname = "clojure-mode";
         ename = "clojure-mode";
-        version = "20190324.2328";
+        version = "20190508.822";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "e898a949d6789acbea53fd036af786268b46c620";
-          sha256 = "1hds3g0vcd12lhjjnjx7rr8xgll7vg8kxpk9hqbc72p563h1sy97";
+          rev = "a9cbe6a37f51da1c37035390d43500b437e8bff2";
+          sha256 = "1lam3927gmzzl78ikc4z1c5yc92w59fi3191qa4vg9y8qqslqxd0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -11739,12 +11946,12 @@
       melpaBuild {
         pname = "cmake-ide";
         ename = "cmake-ide";
-        version = "20190313.131";
+        version = "20190527.207";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "bcd890250f8937bf624671cdfbe7e8a87f465f8c";
-          sha256 = "08hrhcrbdl7wyflg7ijk44r5vhig383axn96vgb60nmj96iq5r8n";
+          rev = "6fc593e47d28bfe531d1029f61e4efeb2eefe982";
+          sha256 = "1yj3ah7mgarbl0zjqzvqnp9wl3aqsiarid6cwlc4fmcnpg6l6n9f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -11945,12 +12152,12 @@
       melpaBuild {
         pname = "code-archive";
         ename = "code-archive";
-        version = "20180705.1913";
+        version = "20190512.1437";
         src = fetchFromGitHub {
           owner = "mschuldt";
           repo = "code-archive";
-          rev = "735ba47be3db59d9af784f2a47f8585caa55a6fd";
-          sha256 = "1q022cw22xzn2ragx113ir04z37ff8y66fgc7hzcs32xs3l03g6z";
+          rev = "b4e7cda87b9cd6548071f784c4883d6019bc3d14";
+          sha256 = "1h0g0ikpz5q1xsj547b83df268znn3ilibj1p42cxpdkfkylnr9q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a8d0832eff966874d90e1d5ac1043c03e96b1c25/recipes/code-archive";
@@ -12412,12 +12619,12 @@
       melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
         ename = "color-theme-sanityinc-tomorrow";
-        version = "20190314.1939";
+        version = "20190502.144";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "9b3ff865632226baaefd92852e27ad5e3dcd0c70";
-          sha256 = "0dn9xsz1iwx9s398ynm8mk9xlf5yxvfbyqp9nsgfs4p8dd5cbiwz";
+          rev = "ecef4c09c5dfa9ebcc62867d3ccc023240bc2e1b";
+          sha256 = "1i7jcrk42wn2a7nsvyhzh3bh4fc12cykiwxj8vi39zii4v7rirqw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -12430,32 +12637,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    color-theme-solarized = callPackage ({ color-theme
-                                         , fetchFromGitHub
-                                         , fetchurl
-                                         , lib
-                                         , melpaBuild }:
-      melpaBuild {
-        pname = "color-theme-solarized";
-        ename = "color-theme-solarized";
-        version = "20171024.825";
-        src = fetchFromGitHub {
-          owner = "sellout";
-          repo = "emacs-color-theme-solarized";
-          rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
-          sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized";
-          sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
-          name = "recipe";
-        };
-        packageRequires = [ color-theme ];
-        meta = {
-          homepage = "https://melpa.org/#/color-theme-solarized";
-          license = lib.licenses.free;
-        };
-      }) {};
     color-theme-x = callPackage ({ cl-lib ? null
                                  , fetchFromGitHub
                                  , fetchurl
@@ -12543,16 +12724,16 @@
       melpaBuild {
         pname = "com-css-sort";
         ename = "com-css-sort";
-        version = "20190319.137";
+        version = "20190517.52";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "com-css-sort";
-          rev = "fd279a9ed89a8b9eb36e1be7764314b3b1be5e39";
-          sha256 = "0nndx0xib03sqhswwvfw1cfzvh70f3qi8d7y5iqk10bpwkmansz0";
+          rev = "d002012500fbe4ccdde525d64b8f69015aded9ee";
+          sha256 = "108500i75c56111q1pbk8fwylr31xpz4w1bn0xc3hm2xwr843kbb";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5189ae21fc97f6b96024a3279a26e43ddc23ae29/recipes/com-css-sort";
-          sha256 = "0hga2m735lvyj1wzybgp6wh1yv98xnandvavvg7g7mscvf2sl89f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/com-css-sort";
+          sha256 = "153yhyqrlmarz8rpcvb0rr7f388fhyb2val4qx2pzpsimklrwrcb";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs s ];
@@ -12883,12 +13064,12 @@
       melpaBuild {
         pname = "company";
         ename = "company";
-        version = "20190402.1623";
+        version = "20190430.1152";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "5bd57455c611ce54c9acedc8c9d83a14ab4f12c5";
-          sha256 = "1ny758skhg7n827583rm2m976sc9mkm2ivdrr2ibhz4ccham2d15";
+          rev = "ad6ff0eecca99dc5ac8b6a8a6174df7d2ad88ae7";
+          sha256 = "0cps5sl9iij1wrpcnhi7xqv58cqsrswhc8r7hj1c00w8288z978w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -13177,12 +13358,12 @@
       melpaBuild {
         pname = "company-coq";
         ename = "company-coq";
-        version = "20190222.1104";
+        version = "20190425.1151";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "93168e134099541a923e70f9d633c78de1aa0c6f";
-          sha256 = "0qa96iq99cwlmylzbrknkg3fkhc1x4ngwlpz9rppgzlghpfb3xs7";
+          rev = "3262fcccc41eac8e1c589f4067dfff939ba72c5f";
+          sha256 = "14d4pkg8h1cwi4235wv3ml7l9a2dw6vxz2z8l6i1zhng5pi0vvk7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -13723,12 +13904,12 @@
       melpaBuild {
         pname = "company-lsp";
         ename = "company-lsp";
-        version = "20190325.2253";
+        version = "20190524.1907";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "company-lsp";
-          rev = "4218f180688eb3ecba454d00b0e68931a0aef5c9";
-          sha256 = "0pq4zxviy1cxp28dfnnrxxsi57g0d91chg1pshdhgcpcd7rb53rh";
+          rev = "cd1a41583f2d71baef44604a14ea71f49b280bf0";
+          sha256 = "0qxwl5w9l3bab35r9d8g2yfrykj6gzn8jz2b8h2rfkzd36k7zv11";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
@@ -13779,12 +13960,12 @@
       melpaBuild {
         pname = "company-math";
         ename = "company-math";
-        version = "20171016.814";
+        version = "20190507.1306";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012";
-          sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5";
+          rev = "600e49449644f6835f9dc3501bc58461999e8ab9";
+          sha256 = "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -13916,12 +14097,12 @@
       melpaBuild {
         pname = "company-php";
         ename = "company-php";
-        version = "20190406.716";
+        version = "20190423.1922";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd";
-          sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x";
+          rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b";
+          sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -14057,12 +14238,12 @@
       melpaBuild {
         pname = "company-prescient";
         ename = "company-prescient";
-        version = "20190212.2235";
+        version = "20190523.1034";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e";
-          sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0";
+          rev = "ae414dde56f3430867faf41c04e4c3df75f9c960";
+          sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
@@ -14199,12 +14380,12 @@
       melpaBuild {
         pname = "company-restclient";
         ename = "company-restclient";
-        version = "20151202.401";
+        version = "20190426.612";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-restclient";
-          rev = "12f05ab964ca811b5b8dcbe4f19e2eeba119cbe1";
-          sha256 = "0bra9rsxng3zbxk0q1sny3rabf2iwzz00snr65xswayjddigp33k";
+          rev = "e5a3ec54edb44776738c13e13e34c85b3085277b";
+          sha256 = "0yp0hlrgcr6yy1xkjvfckys2k24x9xg7y6336ma61bdwn5lpv0x0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -14604,12 +14785,12 @@
       melpaBuild {
         pname = "composable";
         ename = "composable";
-        version = "20170723.2347";
+        version = "20190520.909";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "composable.el";
-          rev = "ac981974f89607393cc61314aaa19672d45b0650";
-          sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac";
+          rev = "f5e6cf4d9fb41ab1d09bfac9aa7f5e8cf5e1d794";
+          sha256 = "094ds242xg0dxrpq18ab3qzs8dcpn2w5w0b0r6hn7ws76aq2bayh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
@@ -14680,31 +14861,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    conda = callPackage ({ dash
-                         , emacs
-                         , f
-                         , fetchFromGitHub
+    conda = callPackage ({ fetchFromGitHub
                          , fetchurl
                          , lib
-                         , melpaBuild
-                         , pythonic
-                         , s }:
+                         , melpaBuild }:
       melpaBuild {
         pname = "conda";
         ename = "conda";
-        version = "20190129.1002";
+        version = "20190531.1107";
         src = fetchFromGitHub {
           owner = "necaris";
           repo = "conda.el";
-          rev = "bc2f133d15e037e9dd24d61af734784b4b0d916d";
-          sha256 = "01iikrgljci3hv0v12dn07aqfq2yqky77h8kv48yv787gmlcx181";
+          rev = "7f2461b268af1d321f41cbf299a07f00f7305426";
+          sha256 = "1ccdl0836mm640qsxsf1ijxa6j4kzkjd7g38vldmji9jp25wyzac";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
           sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f pythonic s ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/conda";
           license = lib.licenses.free;
@@ -14824,12 +15000,12 @@
       melpaBuild {
         pname = "conllu-mode";
         ename = "conllu-mode";
-        version = "20190214.1317";
+        version = "20190215.1243";
         src = fetchFromGitHub {
           owner = "odanoburu";
           repo = "conllu-mode";
-          rev = "162846e03f8ccb9dcec393dbf98e9391cca1c070";
-          sha256 = "122qz6igksbxvnbkyfnbx4i4qn3sr2kspqm7z9kl8mwl5x1bxa2d";
+          rev = "21d337937290c5bac3f578996ed8d672a916adc0";
+          sha256 = "0sh0dqa6jr16pfg587d4hh65pyg9dk0p781ipqli17dmr8x0gi69";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
@@ -15006,12 +15182,12 @@
       melpaBuild {
         pname = "copy-as-format";
         ename = "copy-as-format";
-        version = "20190119.811";
+        version = "20190522.1958";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "d2376c64334fe3de65d89d6d138a2187f9bf802f";
-          sha256 = "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd";
+          rev = "a0962b670e26b723ce304b14e3397da453aef84e";
+          sha256 = "0amgnl9d9sh69dh76vfb7ar6m995nka5zs3swa1pmqqnrmp8nr1w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -15197,12 +15373,12 @@
       melpaBuild {
         pname = "counsel";
         ename = "counsel";
-        version = "20190407.415";
+        version = "20190604.357";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "998890460ebb2860638f2e4d761977080cdcad34";
-          sha256 = "185rp0asa0plnwkafl7rxb2z78b6lmyp8jn943b5j8h3wb3wcaa5";
+          rev = "92d5335caee6c8240fc2e0123858d2b239bffe0d";
+          sha256 = "0ldg6viwrn16wq6rd01jwq1ichad6z5h63zrqk9xwqd1p7b8vmjr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -15299,31 +15475,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    counsel-dash = callPackage ({ counsel
-                                , dash
-                                , dash-functional
+    counsel-dash = callPackage ({ cl-lib ? null
+                                , counsel
+                                , dash-docs
                                 , emacs
                                 , fetchFromGitHub
                                 , fetchurl
-                                , helm-dash
                                 , lib
                                 , melpaBuild }:
       melpaBuild {
         pname = "counsel-dash";
         ename = "counsel-dash";
-        version = "20160729.829";
+        version = "20190510.8";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "counsel-dash";
-          rev = "07fa74a94ff4da5b6c8c4810f5e143e701b480d2";
-          sha256 = "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8";
+          rev = "5856b8766956428c183a2df911a05f845d014041";
+          sha256 = "1x0y6w5ivicckllznvljad42hgmbnilkrx9bz7rs4clr1baxzvyh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash";
           sha256 = "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk";
           name = "recipe";
         };
-        packageRequires = [ counsel dash dash-functional emacs helm-dash ];
+        packageRequires = [ cl-lib counsel dash-docs emacs ];
         meta = {
           homepage = "https://melpa.org/#/counsel-dash";
           license = lib.licenses.free;
@@ -15339,12 +15514,12 @@
       melpaBuild {
         pname = "counsel-etags";
         ename = "counsel-etags";
-        version = "20190323.1754";
+        version = "20190603.1945";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "b8ff1b12ee6b9456969a5bd974a8ed470f1f1eb9";
-          sha256 = "178idbpphsa486sas1242x954zd0vf8c1hlfhmahgsij5jjd1vyv";
+          rev = "fbeedab4ef1a3ea7ec3071580a31a4578d2c79ea";
+          sha256 = "19d6a1q8is1yjq4mc6p2hqwwwfwamnlj4xlpfa3z482zqs812xly";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -15362,23 +15537,24 @@
                                  , fetchFromGitHub
                                  , fetchurl
                                  , lib
-                                 , melpaBuild }:
+                                 , melpaBuild
+                                 , seq }:
       melpaBuild {
         pname = "counsel-gtags";
         ename = "counsel-gtags";
-        version = "20170326.559";
+        version = "20190422.801";
         src = fetchFromGitHub {
-          owner = "syohex";
+          owner = "FelipeLema";
           repo = "emacs-counsel-gtags";
-          rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2";
-          sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s";
+          rev = "3ebfd4159856e9dbd9531b2a43410f72175a90bb";
+          sha256 = "08n11nvf7p6clmha8r50r2fzp9f4nmrcm8j6byvn99vazdvych7p";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
-          sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fe8fe6af7826a4b73ac784fde8859130b9ad7096/recipes/counsel-gtags";
+          sha256 = "1vxxcqijn3nab4146p06vhw6dn8zwb7arbk1610bajsvkyid428y";
           name = "recipe";
         };
-        packageRequires = [ counsel emacs ];
+        packageRequires = [ counsel emacs seq ];
         meta = {
           homepage = "https://melpa.org/#/counsel-gtags";
           license = lib.licenses.free;
@@ -15585,12 +15761,12 @@
       melpaBuild {
         pname = "counsel-tramp";
         ename = "counsel-tramp";
-        version = "20190124.2351";
+        version = "20190524.146";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-counsel-tramp";
-          rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f";
-          sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7";
+          rev = "5ed06027a313b27ab17a8c8fabbc30c0e424c3b2";
+          sha256 = "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
@@ -15630,6 +15806,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    countdown = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , stream }:
+      melpaBuild {
+        pname = "countdown";
+        ename = "countdown";
+        version = "20190527.436";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "countdown.el";
+          rev = "c60b6ff13a2c36e731132ef8775b7d09c5ad963d";
+          sha256 = "1vws72q9yl3s65f3qsn2s4s6sv1fl1y8l8yc7lspxpscskp277p9";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce30233b21be706ab3aaeeb61d5110143fa47c89/recipes/countdown";
+          sha256 = "0rjhc54f5dj55442b44yhvpicg98jg1jj1n0bv6alx699575vmym";
+          name = "recipe";
+        };
+        packageRequires = [ emacs stream ];
+        meta = {
+          homepage = "https://melpa.org/#/countdown";
+          license = lib.licenses.free;
+        };
+      }) {};
     cov = callPackage ({ elquery
                        , emacs
                        , f
@@ -15695,12 +15898,12 @@
       melpaBuild {
         pname = "coverlay";
         ename = "coverlay";
-        version = "20180518.1555";
+        version = "20190414.240";
         src = fetchFromGitHub {
           owner = "twada";
           repo = "coverlay.el";
-          rev = "8205a845d58755dd7640b2e2b5991bf842998935";
-          sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0";
+          rev = "0beae208d0e7d746a94385428bd61aa5cd7ea828";
+          sha256 = "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
@@ -16087,12 +16290,12 @@
       melpaBuild {
         pname = "cryptol-mode";
         ename = "cryptol-mode";
-        version = "20190130.1344";
+        version = "20190531.1351";
         src = fetchFromGitHub {
           owner = "thoughtpolice";
           repo = "cryptol-mode";
-          rev = "1d6bc05380481056b0615670a890a8234d997da9";
-          sha256 = "04cicqwmnwq80jydvgax27nyw8vxfcz5aiqlnslj36mh9qbjr01g";
+          rev = "81ebbde83f7cb75b2dfaefc09de6a1703068c769";
+          sha256 = "1y24hssckqi8bapm24b6zw7lagdsh3gaacvq5pscgnjbqpk2rlvp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode";
@@ -16105,32 +16308,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    cryptsy-public-api = callPackage ({ fetchFromGitHub
-                                      , fetchurl
-                                      , json ? null
-                                      , lib
-                                      , melpaBuild }:
-      melpaBuild {
-        pname = "cryptsy-public-api";
-        ename = "cryptsy-public-api";
-        version = "20141008.528";
-        src = fetchFromGitHub {
-          owner = "Sodaware";
-          repo = "cryptsy-public-api.el";
-          rev = "c65abdbb2fac49913c27b5183e3fad1092f78b3d";
-          sha256 = "1hiip5q2vg729kzidj0jmq4idvqxhbkwvncfj9qnn51rmr23n17z";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/cryptsy-public-api";
-          sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j";
-          name = "recipe";
-        };
-        packageRequires = [ json ];
-        meta = {
-          homepage = "https://melpa.org/#/cryptsy-public-api";
-          license = lib.licenses.free;
-        };
-      }) {};
     crystal-mode = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -16139,12 +16316,12 @@
       melpaBuild {
         pname = "crystal-mode";
         ename = "crystal-mode";
-        version = "20180826.2029";
+        version = "20190604.554";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "8649736fea8960a5e54c3ec934484f231a518ea5";
-          sha256 = "0ggg1zi3x7jphqa83zkcd19x2j30bqkfysn8cl8xahrikwhxmh49";
+          rev = "34124f546ff5c1136aed95bf0059015f9f6a1d60";
+          sha256 = "09cmbw190w6aiwwc2bg349xx6vcv9b9ajw8m70ajb3653qnq3mw4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -16262,6 +16439,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    csproj-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "csproj-mode";
+        ename = "csproj-mode";
+        version = "20190514.1158";
+        src = fetchFromGitHub {
+          owner = "omajid";
+          repo = "csproj-mode";
+          rev = "889334f8cd08dc79d133149b4504e0e001f5a769";
+          sha256 = "0j330rrj6abr7xay1h2kajwa22npij0fdh30fk5z7zgas7jz735h";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/49823bd653c3599bbc6662c99d0406e9886f1bab/recipes/csproj-mode";
+          sha256 = "08w22bfk6fs6cxyqxrcv3314vwmh868200axss5fsdfgbggs4vy1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/csproj-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     css-autoprefixer = callPackage ({ emacs
                                     , fetchFromGitHub
                                     , fetchurl
@@ -16463,6 +16666,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ctune = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "ctune";
+        ename = "ctune";
+        version = "20190527.1725";
+        src = fetchFromGitHub {
+          owner = "maurooaranda";
+          repo = "ctune";
+          rev = "276257231e5c19fa476e01077611b5bbcec9f852";
+          sha256 = "0s9zbgibkfn7yr9dkpbvvprrn2ak62gsfzjmw4qfqgrg4y3s4x7w";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/927ecd888bc00abff13f5fc335a88dffc2bf6779/recipes/ctune";
+          sha256 = "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ctune";
+          license = lib.licenses.free;
+        };
+      }) {};
     ctxmenu = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -17035,12 +17264,12 @@
       melpaBuild {
         pname = "danneskjold-theme";
         ename = "danneskjold-theme";
-        version = "20190222.200";
+        version = "20190508.1506";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "1a341399df66d008965fddb6348ae86d7e96d268";
-          sha256 = "1cbrjqh8p4ia2psw0v0qvvlmx9g567b7xmwqgjm58x8x38003ym0";
+          rev = "b48bc0ef6fff2d41a083006b0db040eb2b2e7a8b";
+          sha256 = "0p3bniim9rb3hsnm1ay12kjyh67mvlqswixjp0v2g8q8srmals33";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -17068,12 +17297,12 @@
       melpaBuild {
         pname = "dante";
         ename = "dante";
-        version = "20190320.154";
+        version = "20190502.2345";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "d6be8fa2d49ac73b34578736ca6340573bbcb68a";
-          sha256 = "1lhzdvgy4jkzfx4p3cnprb68wray2d36x0aqcnw5g2dw7w6vc7fz";
+          rev = "4170ff57f3fd9414915d7a72b805de8727bd81ee";
+          sha256 = "0ii3fi8fwnl5q7j7mw165r6sqvyq4g6ymhdlcwb74agkzbssgs87";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -17101,12 +17330,12 @@
       melpaBuild {
         pname = "dap-mode";
         ename = "dap-mode";
-        version = "20190403.1040";
+        version = "20190524.2158";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "dap-mode";
-          rev = "f8f0f005f536ff22f6ca935dd804fa9ecb134d6a";
-          sha256 = "09ff6835aflmx0s1dj7bgn1m146c9cnd3j7dh54jrx1mcvywqrx4";
+          rev = "3440ea52f9062e2653d190bb1c5db42d5f73ca44";
+          sha256 = "1g7z8q1zc1b46khy11x6xv49nhxsvl90s2xarvfpmjvpic76bhn1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/dap-mode";
@@ -17311,12 +17540,12 @@
       melpaBuild {
         pname = "darkokai-theme";
         ename = "darkokai-theme";
-        version = "20181019.1159";
+        version = "20190603.1219";
         src = fetchFromGitHub {
           owner = "sjrmanning";
           repo = "darkokai";
-          rev = "b887fc6080f8e021058bff7f53fad84c82c81a7a";
-          sha256 = "1rjpzf6n9vclyqfdz1nqaf9ky2jhk9jn1jmx9h2bd4kil9bjbyrm";
+          rev = "a53815fbfb06604d7f51519c62cc11e507204a70";
+          sha256 = "01jd3y3kr4fplvdv32smbaxqa2dafs8vvp967jma7xm7r1frnbdw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme";
@@ -17337,12 +17566,12 @@
       melpaBuild {
         pname = "darktooth-theme";
         ename = "darktooth-theme";
-        version = "20190201.1716";
+        version = "20190411.1842";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "507853d70d14201b108432b697fdcd3785fc006e";
-          sha256 = "0ly3v8a80b31ffmzvr3h0x4igr1bgcpi92wbxj86r3z1c05s31rp";
+          rev = "5cc7fbfb08d2f1a33b85eac92b6450407b915119";
+          sha256 = "164y8hrdz46gg1b6sfi7gdv7pj54hrin0lcmhxp6gc9x5dg3l354";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -17392,12 +17621,12 @@
       melpaBuild {
         pname = "dash";
         ename = "dash";
-        version = "20190320.706";
+        version = "20190424.1104";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "677c1561142db89cb151f50ce21f24096ca1a328";
-          sha256 = "0183iaipz13n5ga80qy49q25h7hj8bs7sz68547hn46zlnnwnbih";
+          rev = "258c324d9840901db83b2cabef3fa75bba57c1ba";
+          sha256 = "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -17435,6 +17664,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    dash-docs = callPackage ({ async
+                             , cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "dash-docs";
+        ename = "dash-docs";
+        version = "20190516.1002";
+        src = fetchFromGitHub {
+          owner = "gilbertw1";
+          repo = "dash-docs";
+          rev = "111fd9b97001f1ad887b45e5308a14ddd68ce70a";
+          sha256 = "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2f597ec52f4bf55a748231751b6e51328e8f6f59/recipes/dash-docs";
+          sha256 = "0vms4yr67l95rybvavd34a9gm57j7524swlf1c0rj8fff1wrmhn0";
+          name = "recipe";
+        };
+        packageRequires = [ async cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dash-docs";
+          license = lib.licenses.free;
+        };
+      }) {};
     dash-functional = callPackage ({ dash
                                    , emacs
                                    , fetchFromGitHub
@@ -17471,12 +17728,12 @@
       melpaBuild {
         pname = "dashboard";
         ename = "dashboard";
-        version = "20190320.25";
+        version = "20190604.939";
         src = fetchFromGitHub {
           owner = "emacs-dashboard";
           repo = "emacs-dashboard";
-          rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0";
-          sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r";
+          rev = "77e0720c3701cc3f868e701e85b358c0b18dec42";
+          sha256 = "141j6xjms8im6bkikh04nq58brdkb7v4fvaz3csjs7c2r087g4x6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard";
@@ -17768,12 +18025,12 @@
       melpaBuild {
         pname = "ddskk";
         ename = "ddskk";
-        version = "20190215.1927";
+        version = "20190423.534";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "9a5397829359e2e0f37e26701a70515c0f9fcba8";
-          sha256 = "15463cf8vykh2865k52qs25awc4yv91bfk4x9swh7ccrczv0d33q";
+          rev = "3248b05c204d05019210e87ac7730fbbcf72df1d";
+          sha256 = "1j2wqks75ds7i22g18bcm9y36l14fiqw35vsks1n6brdvsv3ys91";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -17797,12 +18054,12 @@
       melpaBuild {
         pname = "deadgrep";
         ename = "deadgrep";
-        version = "20190314.1507";
+        version = "20190516.1459";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "deadgrep";
-          rev = "160e7adb7f043fc42ba6d4d891ad50ef1e063be7";
-          sha256 = "1sm92hj4ilq0h82fy5k5nzn7jq56yw2665ikqdcj89k9xldin6xi";
+          rev = "caeb37b8d6ab83f0eba353d6bbb29678190d4419";
+          sha256 = "158fqha8nilwfzmw15lcsq8b099j8wclzq303md0j4mfr2q2gfvs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
@@ -18054,12 +18311,12 @@
       melpaBuild {
         pname = "define-word";
         ename = "define-word";
-        version = "20190128.759";
+        version = "20190506.825";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "define-word";
-          rev = "df1118858fae492cf476a963c1174bfada141c7f";
-          sha256 = "0sspnc95y70dcms4551sg93m8998i78lnnrngr59cldr5hwzbr2l";
+          rev = "11bfee628aee082a9a3a2fd5f083cbdb05d5d00a";
+          sha256 = "1yrhrvqiyp4cv6bpvdrkc5zfwflb1jx8kmivjkpv6765pnr11zp8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
@@ -18184,12 +18441,12 @@
       melpaBuild {
         pname = "demangle-mode";
         ename = "demangle-mode";
-        version = "20190116.1857";
+        version = "20190527.2006";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "b4659ca85c4f02e9043e91d71affb4a8ede87339";
-          sha256 = "1rybal9rvnhp4bsdpx57zjida6c9hm44qjvp1fha7fcynjp462iz";
+          rev = "06903d731dfde110e10b979dcc7624ef6dbb5ac8";
+          sha256 = "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -18261,12 +18518,12 @@
       melpaBuild {
         pname = "desktop-environment";
         ename = "desktop-environment";
-        version = "20190401.835";
+        version = "20190526.128";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "desktop-environment";
-          rev = "564a0f4e8acb747f825c34e0abc6d6690f5d5060";
-          sha256 = "0b8gnyhadnwppvwdlgm5fxiiawrwyf9kqxcas5hrjmlnyskdcall";
+          rev = "284c38fcb5b10746255ee4123eaa549e028df0c8";
+          sha256 = "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment";
@@ -18417,12 +18674,12 @@
       melpaBuild {
         pname = "dhall-mode";
         ename = "dhall-mode";
-        version = "20190113.1601";
+        version = "20190526.1413";
         src = fetchFromGitHub {
           owner = "psibi";
           repo = "dhall-mode";
-          rev = "b59698e9f81ef30cc784729ee4d8c719e6c21bf6";
-          sha256 = "1aw6b2gkpclzahyyzxmj2025l8c82w83lz4ixxv5fk63yc9vj96l";
+          rev = "1b71e8e7123647761d8f35916c06b7280b2929ea";
+          sha256 = "12xpzaby75fczxj885ij9wgrc9pn05mg5s7abgfr1irvkq7s467n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
@@ -18435,6 +18692,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    dianyou = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "dianyou";
+        ename = "dianyou";
+        version = "20190604.515";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "dianyou";
+          rev = "1a1fe6da3196f91db7b76b6c552ca4f2629e36bf";
+          sha256 = "1bgyq4zrhzlqmfgv3az4csgsrqidlshwjbx4r9l2rydk3k3gl78n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/059b003c74acdfdd917ecb6fecb782a0f54d155b/recipes/dianyou";
+          sha256 = "1mz3nvr62gfkhbayw7784c8kn8drbiq9hlqv1g5vd9pdfhxqs8jl";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dianyou";
+          license = lib.licenses.free;
+        };
+      }) {};
     diary-manager = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -18975,12 +19258,12 @@
       melpaBuild {
         pname = "dired-collapse";
         ename = "dired-collapse";
-        version = "20180724.944";
+        version = "20190515.510";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "3fd347a0823312e966872bd0d26d9a75b2898c9c";
-          sha256 = "01q93n4b9js29r2grk53206f7blwp2pjyz8lf98x184f2sdrz9k7";
+          rev = "a9dc5eb34fc96da839f5cbd70eb096758f72b3fe";
+          sha256 = "09zv5k9na72r0gsh67mxg8ynrijl4yy53s9w9lymbdxysc4s53qs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -19156,12 +19439,12 @@
       melpaBuild {
         pname = "dired-hacks-utils";
         ename = "dired-hacks-utils";
-        version = "20160527.1436";
+        version = "20190522.250";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "9bb7100d80b96bdfa2154c2b2f509d5b9f6cd7cd";
-          sha256 = "1pxvfrkxr4x0vbp313lhbwhrqhsv8kj3b8sbx89sym8f8fdn33js";
+          rev = "9523083f57c8278e3f52ca63b965249123139cd1";
+          sha256 = "1hqk6nipxg0pr0ksgc0rv0s99p5fllqsnfv88zv53g7mqyapx3wd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -19391,12 +19674,12 @@
       melpaBuild {
         pname = "dired-rainbow";
         ename = "dired-rainbow";
-        version = "20171202.1448";
+        version = "20190522.250";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "edea7534b36297211fe1c0e493220a5cc1bdec93";
-          sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07";
+          rev = "9523083f57c8278e3f52ca63b965249123139cd1";
+          sha256 = "1hqk6nipxg0pr0ksgc0rv0s99p5fllqsnfv88zv53g7mqyapx3wd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -19494,11 +19777,11 @@
       melpaBuild {
         pname = "dired-rmjunk";
         ename = "dired-rmjunk";
-        version = "20190209.1633";
+        version = "20190526.1329";
         src = fetchgit {
           url = "https://git.sr.ht/~jakob/dired-rmjunk";
-          rev = "5d94726b4e427bb21dcc6f043bc3fcfc98b27b7a";
-          sha256 = "0imxvaafxpndb3m07wd74xjn093hbib2g38kmrwxj26xkgzw60nc";
+          rev = "6a9fa6a35498e53e8c57282e3b08dedc896d880d";
+          sha256 = "0kpkd7qasrb303d0b01d62r82prhrmaasxqa14nf5lh01c213nr4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/75d501ae9b64d9aa083f43358881a467a7cd2a04/recipes/dired-rmjunk";
@@ -19521,12 +19804,12 @@
       melpaBuild {
         pname = "dired-rsync";
         ename = "dired-rsync";
-        version = "20190301.540";
+        version = "20190508.905";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "dired-rsync";
-          rev = "ff229a32008438a2bfce7ef6c23e8e0d7a5f0c74";
-          sha256 = "0wlb27d7isclp5j2cmk31mdix6wx1cavjfnkk5306iwrbpirpv96";
+          rev = "d7eb558c4efa73d9e1f50709dbd2374041c0f1a9";
+          sha256 = "074xy2wipdn2lvm7kxyf7rpsgp7hc62f7h1n77am7p4i7j5alw1f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync";
@@ -19548,12 +19831,12 @@
       melpaBuild {
         pname = "dired-sidebar";
         ename = "dired-sidebar";
-        version = "20190319.1811";
+        version = "20190515.1859";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "dired-sidebar";
-          rev = "c895f43e2ee77042f2f9596c4cde8f5f224b8403";
-          sha256 = "1wrlvlrv7lh71m6jambbpcxdg0416h1w5d5y673igkp0ri87n2q8";
+          rev = "2c742326a6b7a76e36666586809aaf5efa150b3f";
+          sha256 = "0s2d8lirv8s9az8a7g97yzg7na2n1340a8vg6zja315d43qljis9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -19625,12 +19908,12 @@
       melpaBuild {
         pname = "dired-toggle";
         ename = "dired-toggle";
-        version = "20190402.2302";
+        version = "20190515.1804";
         src = fetchFromGitHub {
           owner = "fasheng";
           repo = "dired-toggle";
-          rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed";
-          sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q";
+          rev = "5bcdd9f13c0b0149c5125004e93bc2dfd22f3fce";
+          sha256 = "0dghbrx364fihzp5r8ar6vxkavd7mn74qjkijy1wvy34vl0b4911";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle";
@@ -19724,24 +20007,23 @@
                           , fetchFromGitHub
                           , fetchurl
                           , lib
-                          , melpaBuild
-                          , with-editor }:
+                          , melpaBuild }:
       melpaBuild {
         pname = "direnv";
         ename = "direnv";
-        version = "20190319.718";
+        version = "20190511.1321";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160";
-          sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la";
+          rev = "468f2fb20d825dd7134e4efbaff3666917cd4ec3";
+          sha256 = "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
           sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
           name = "recipe";
         };
-        packageRequires = [ dash emacs with-editor ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/direnv";
           license = lib.licenses.free;
@@ -20705,12 +20987,12 @@
       melpaBuild {
         pname = "docker";
         ename = "docker";
-        version = "20190407.218";
+        version = "20190428.251";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "e127a157f8d0d9ffd465075ecf6558f36d2d3b24";
-          sha256 = "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw";
+          rev = "dbd89c1cd05f9ec6f1921f8bc85d9411a80412c2";
+          sha256 = "1d5x04l4129wjjlzbfmjgw9w6gih28zv8c3q79hihnkpy81xhrnh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -20759,6 +21041,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-cli = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "docker-cli";
+        ename = "docker-cli";
+        version = "20190524.924";
+        src = fetchFromGitHub {
+          owner = "bosko";
+          repo = "docker-cli";
+          rev = "328429219574555c5fb831a421b4b5d9a2338561";
+          sha256 = "15jsp1jsb13qv394js9pd6407ya7dgqk7blzbnyf9i9abyyr0v67";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5664de22600c428b7931085985e6fe779e8876b2/recipes/docker-cli";
+          sha256 = "1pyrnxa9iwzp0a810250xy191xcbaq68c76fc5plh70c37gzribp";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/docker-cli";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-compose-mode = callPackage ({ dash
                                        , emacs
                                        , fetchFromGitHub
@@ -20823,12 +21130,12 @@
       melpaBuild {
         pname = "dockerfile-mode";
         ename = "dockerfile-mode";
-        version = "20181104.1000";
+        version = "20190505.1107";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "7223d92718f78fa3ab15667cdb2ed90cfeb579e7";
-          sha256 = "0hmipgl4rk6aih11i8mnspwdijjiwk2y0wns6lzs8bgkvy3c064r";
+          rev = "ed73e82dcc636dad00d1a8c3b32a49136d25ee60";
+          sha256 = "0lri2rnx4lr23vqfphkpq39cd4xfgzkvz1xsz7ccdvl4qj0k7fdl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -20972,7 +21279,6 @@
       }) {};
     doom-modeline = callPackage ({ all-the-icons
                                  , dash
-                                 , eldoc-eval
                                  , emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -20982,19 +21288,19 @@
       melpaBuild {
         pname = "doom-modeline";
         ename = "doom-modeline";
-        version = "20190406.12";
+        version = "20190606.228";
         src = fetchFromGitHub {
           owner = "seagle0128";
           repo = "doom-modeline";
-          rev = "c5b5a4d2d24b67239993c398e5631e54908fe815";
-          sha256 = "0jfh10vnxaz93569yb11zqirj12487ly1gxxrr807583pn24b6n0";
+          rev = "94ddb2f68bff53cebdb3a001bde2cdc9975eca33";
+          sha256 = "1cv2420qpci4pfiskb7gg5s3gnacwzbpi3dg98wb647yv7jkbgj8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
           sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j";
           name = "recipe";
         };
-        packageRequires = [ all-the-icons dash eldoc-eval emacs shrink-path ];
+        packageRequires = [ all-the-icons dash emacs shrink-path ];
         meta = {
           homepage = "https://melpa.org/#/doom-modeline";
           license = lib.licenses.free;
@@ -21010,12 +21316,12 @@
       melpaBuild {
         pname = "doom-themes";
         ename = "doom-themes";
-        version = "20190313.1520";
+        version = "20190520.2119";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "cbac92578aba8eff8edd18b3e1ea72c295e3631e";
-          sha256 = "0v0002smmwjszl94950wmggs0ss9kfigzrhfvayhwcqw0m5h531c";
+          rev = "55c49c8fd6152ebb748e75197c064b6ae7db1a57";
+          sha256 = "0pw47is23nvh72bvmh6c3wip8xjrjvjlal9rk39klkf50x52x3qh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -21087,12 +21393,12 @@
       melpaBuild {
         pname = "dotnet";
         ename = "dotnet";
-        version = "20181117.731";
+        version = "20190415.537";
         src = fetchFromGitHub {
           owner = "julienXX";
           repo = "dotnet.el";
-          rev = "70ed170caeeecba5fddbd82b0d6aec967b6c6ee4";
-          sha256 = "1hdghrcyic1jng1k08fsq9fscyqx6s3rmsh9k21b91dfaxyaqj6b";
+          rev = "932d776ed739d20d57dbd6ba49f61d1b450571fc";
+          sha256 = "1h7y9vz64bv4slz9mpd7cjyyaxgqk92jn11y5ycfyncq70wyd3j4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
@@ -21552,12 +21858,12 @@
       melpaBuild {
         pname = "dtk";
         ename = "dtk";
-        version = "20181213.946";
+        version = "20190531.2126";
         src = fetchFromGitHub {
           owner = "dtk01";
           repo = "dtk";
-          rev = "7c278b81ffdced72d160e302356ac29fe592dc10";
-          sha256 = "13p53byz2fbzyam2p8v4i8c43ffsawacjdjgsris8nrqhgmi0vp6";
+          rev = "dd1bda6b63a1679b60fee108cf7b7de7290be986";
+          sha256 = "0gfc9sw6fbrwd9yrpg7s5p0wlbnf89klry92g7dq50an035w75gn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39333468fb6e9493deb86511f0032610a412ec8a/recipes/dtk";
@@ -21759,12 +22065,12 @@
       melpaBuild {
         pname = "dune";
         ename = "dune";
-        version = "20190327.120";
+        version = "20190529.2005";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "dune";
-          rev = "23f6db7f970293a992006025fcaea018e6485546";
-          sha256 = "1nzq3rrkz10gmvppdhwvhgf8nh1x912xizwn6nlj7qffin588r16";
+          rev = "060b6acabba7bf0713912afb28e4cdb0461c2199";
+          sha256 = "1mw8jspqf4wxawnshkbbqpnxzzdz576wl6mgnzbh6ddxr9pk2z7w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune";
@@ -21837,11 +22143,11 @@
       melpaBuild {
         pname = "dyalog-mode";
         ename = "dyalog-mode";
-        version = "20190305.137";
+        version = "20190416.701";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "6f2a9d8f86be";
-          sha256 = "1hgn86mgi0xaa3s85f5kn7crdhirghfq62ri3wn0ywkg6jc0bln6";
+          rev = "abe3de955fd6";
+          sha256 = "06csyjlxfjbhwhiin6ampxsxd6zhkkqxmv9nmmf8ryjlr99prs0n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/dyalog-mode";
@@ -21965,12 +22271,12 @@
       melpaBuild {
         pname = "e2ansi";
         ename = "e2ansi";
-        version = "20180403.1215";
+        version = "20190517.1202";
         src = fetchFromGitHub {
           owner = "Lindydancer";
           repo = "e2ansi";
-          rev = "f886e687d50ff58063a92d40623f2400fa913af0";
-          sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m";
+          rev = "6e1bb4e4e27885d1786db08b091cfa13b184fb54";
+          sha256 = "1rbbwz8a6gqyxkkh5fapzlbnny816yzqj4170fzrswhib610mcvz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi";
@@ -22207,12 +22513,12 @@
       melpaBuild {
         pname = "eacl";
         ename = "eacl";
-        version = "20190206.1725";
+        version = "20190518.2320";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "eacl";
-          rev = "fe0091e62927e43e6ae2017e5170bc9c2272164b";
-          sha256 = "00zlb0lp16crqgp87fnmadphqrx1wc3lndcam4f3apcnxp1dybbg";
+          rev = "1a32676165c0e63dc85470272efaccd5f497870a";
+          sha256 = "0wp0sk10icpjmvzpb7dk2bf633lk4lbl7m09394lhxisl3zqq6cs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
@@ -22280,23 +22586,24 @@
                              , fetchurl
                              , lib
                              , melpaBuild
-                             , popup }:
+                             , popup
+                             , request }:
       melpaBuild {
         pname = "easy-hugo";
         ename = "easy-hugo";
-        version = "20181202.31";
+        version = "20190505.1813";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "e7b6c75a7e46290d9d0cdac9ec56fbf35a6b9c98";
-          sha256 = "1xhyky1593qxq7kfbv2ighx957w5pizkki0q77nrvjxlwbqghgz2";
+          rev = "c80b972faa2c3addc472fe6412ca28dc5583b1d6";
+          sha256 = "08lhs0nhd19irssq4w028wyiaf5d2a7pqd1b3hp7rgza411lvwji";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
           sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
           name = "recipe";
         };
-        packageRequires = [ emacs popup ];
+        packageRequires = [ emacs popup request ];
         meta = {
           homepage = "https://melpa.org/#/easy-hugo";
           license = lib.licenses.free;
@@ -22306,23 +22613,24 @@
                                , fetchFromGitHub
                                , fetchurl
                                , lib
-                               , melpaBuild }:
+                               , melpaBuild
+                               , request }:
       melpaBuild {
         pname = "easy-jekyll";
         ename = "easy-jekyll";
-        version = "20181202.145";
+        version = "20190424.1529";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "5ee52c0bb01336a03a8f07e072841caf13f86c0a";
-          sha256 = "1xibnw3jmmwrc1z7hnifjzhq4mn2834lk7f22x7rwh857iamlply";
+          rev = "6ce93c386ab32f08e23590d71489d8a1bd5a29c5";
+          sha256 = "0vf0966apf815j85nlbj74lqk874jwynfwpn1gnc0krkjgprxkjw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
           sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs request ];
         meta = {
           homepage = "https://melpa.org/#/easy-jekyll";
           license = lib.licenses.free;
@@ -22471,12 +22779,12 @@
       melpaBuild {
         pname = "ebib";
         ename = "ebib";
-        version = "20190404.546";
+        version = "20190606.109";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "6c1200a7e53ca192b3765f81006b586c557ab993";
-          sha256 = "1nbgjhd7whcr96szzjddynvyvm70qdrc92q82m8nkz9z2v514kz1";
+          rev = "960862f2a3058f9ca93850a148410d67e3b33ebb";
+          sha256 = "089wjdam5mpqyndry0fpnklrs9hya1rph7imma550irkisykma1w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -23062,12 +23370,12 @@
       melpaBuild {
         pname = "editorconfig";
         ename = "editorconfig";
-        version = "20190405.705";
+        version = "20190603.424";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "df102f4eee98c541fd855cd7acc82aba206e3222";
-          sha256 = "0wlna9d22qn6ly1in0w8pd9np7p65f2hglpimm7n8lr3485q2sdd";
+          rev = "efc1ff4b1c3422d6e231b1c01138becab4b9eded";
+          sha256 = "122h57ccx0dba45a019cmp3797b85s5a60rq6w8ggin3yf623l0m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -23167,12 +23475,12 @@
       melpaBuild {
         pname = "editorconfig-generate";
         ename = "editorconfig-generate";
-        version = "20181115.2235";
+        version = "20190512.2133";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-generate-el";
-          rev = "2921b53700dedf16b57d684439add187663954cd";
-          sha256 = "0dqmq0hq603r2qn4wjdzlmsv4csci8d36i259jmwf71v8m1j4rc7";
+          rev = "47a31f928f46d2a0188db8e2cffa5d6354a81573";
+          sha256 = "01bv064rzxjpqvcs0x62qfqn51js51wmkbg04v28pvmwlmnigkg0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc1cfe5ce6bc3d247c5b7730ac6cb2d6c6198a0c/recipes/editorconfig-generate";
@@ -23366,12 +23674,12 @@
       melpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "20190213.124";
+        version = "20190512.347";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "eglot";
-          rev = "7d6e3cf5d7ae098aa6c8572343c8bc9b8453aace";
-          sha256 = "1q616yp9zi9a76sjb9f901r4cck40p8f5rgxmdwsavagl5w8d8cz";
+          rev = "5f629ebfb680f43849ca894c7166a2b54ff5ba50";
+          sha256 = "0jja8c2f6scy4bb3p79bn3sjkzkz10mmb8aivg9x1ynki96rc2ja";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot";
@@ -23423,11 +23731,11 @@
       melpaBuild {
         pname = "eide";
         ename = "eide";
-        version = "20190108.1316";
+        version = "20190501.1422";
         src = fetchgit {
           url = "https://framagit.org/eide/eide.git";
-          rev = "3b6d48df2cc1731812b5bd72d11c205dee17b930";
-          sha256 = "1jl0fyiqiqqd9wf2cdk8l6fbnnbq72np6d2n6kya0gk4afj5kr6g";
+          rev = "0554252de694d01210e40cf071f212b6ca45e88e";
+          sha256 = "1ac8408m0rqyhda22b1c6jcn62mrmpvcn5d3nr2miiv7akvykvl9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide";
@@ -23466,9 +23774,9 @@
         };
       }) {};
     ein = callPackage ({ auto-complete
-                       , cl-generic
                        , dash
                        , deferred
+                       , emacs
                        , fetchFromGitHub
                        , fetchurl
                        , lib
@@ -23482,12 +23790,12 @@
       melpaBuild {
         pname = "ein";
         ename = "ein";
-        version = "20190404.1625";
+        version = "20190605.1302";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "5accc13b518b0db584b8a1a0b782dbc3171f4ec6";
-          sha256 = "02m062f2nj3giccbfq7cl3i4qm19rbcyzan42q3w5hqm4y0zy8zc";
+          rev = "2207014453a739ecffda1075ea101fa21adc3a95";
+          sha256 = "07ybpylcbqy12k0xm6xl96mi36p9jhdayds2fzcz90nnd19l1zzb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -23496,9 +23804,9 @@
         };
         packageRequires = [
           auto-complete
-          cl-generic
           dash
           deferred
+          emacs
           markdown-mode
           polymode
           request
@@ -23575,12 +23883,12 @@
       melpaBuild {
         pname = "ejc-sql";
         ename = "ejc-sql";
-        version = "20190404.411";
+        version = "20190604.944";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "8afdb7e8a28f916149b53345816e50667d4441b8";
-          sha256 = "1imc324b862d92yl7n9bqr92k1d1d7pnls73xy4q8lfrllik0ja2";
+          rev = "0d3e0da114b623e537fc076dbd08667f6653bca0";
+          sha256 = "1bqirwcjbnc5cq2y4c1s0znc43kpfz7vyqqc7m6s2dgmfv4g52yh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql";
@@ -23761,12 +24069,12 @@
       melpaBuild {
         pname = "el-patch";
         ename = "el-patch";
-        version = "20190127.1455";
+        version = "20190410.931";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "879094151fa1b4d96435b92c53751b0b761ba46c";
-          sha256 = "1jn1mp0zhiyqgx6c4ywkq098c9k1pfzq128f2aq7a5vin4558s7p";
+          rev = "178111f98564551e18948b1f0dc4c539dbda5342";
+          sha256 = "0nsfax7rbg740q1mw0lrrk8i385pyxmi41lznish0b6abks385ca";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -23967,12 +24275,12 @@
       melpaBuild {
         pname = "el2org";
         ename = "el2org";
-        version = "20190313.651";
+        version = "20190504.414";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "el2org";
-          rev = "d9792a9a861d4d43b0d3aefb2ec9268a6fbc83bc";
-          sha256 = "169fgx42n2s4gr6mq3zffxgdvkawvbyd6xja3djmp0yi8k85jazl";
+          rev = "fbb2c5bff78564111ff1826976101555314bfc53";
+          sha256 = "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -24051,12 +24359,12 @@
       melpaBuild {
         pname = "elcord";
         ename = "elcord";
-        version = "20190321.1145";
+        version = "20190531.1511";
         src = fetchFromGitHub {
           owner = "Mstrodl";
           repo = "elcord";
-          rev = "17d3e5b95e68d1b6c396ba0decd94a85226f6504";
-          sha256 = "1rhz34bwmjvi98yl9fq4did2pj62v3zpdyr1ryb9yfaz6b59baga";
+          rev = "0f311c2bcfd65721fe8c0ebec9da344f217d4061";
+          sha256 = "06yk9912xkz8sxzph57mzf45934qjcp29x4f844lrhrpmmbmb8xg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
@@ -24105,12 +24413,12 @@
       melpaBuild {
         pname = "eldoc-box";
         ename = "eldoc-box";
-        version = "20190305.1306";
+        version = "20190529.131";
         src = fetchFromGitHub {
           owner = "casouri";
           repo = "eldoc-box";
-          rev = "0d671026b923cef0b2e9f6e9339fa8b1de59543f";
-          sha256 = "02pqfdx8jxy5sn4iqamiqmkdllfdz56s1x9hh9qc6psxpjrb38m3";
+          rev = "c97fe860fa2a5b957a25219172ab596b2f4fc95b";
+          sha256 = "03asvv66i9jwmj5jkspb16d04q8rgkmrf1x9zbpiq12vb0wfbyf0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aac2e64f9e0d06b95bdf0dece214263f75470ea8/recipes/eldoc-box";
@@ -24131,12 +24439,12 @@
       melpaBuild {
         pname = "eldoc-cmake";
         ename = "eldoc-cmake";
-        version = "20190323.548";
+        version = "20190419.1544";
         src = fetchFromGitHub {
           owner = "ikirill";
           repo = "eldoc-cmake";
-          rev = "1347b4bd643e8011094c4036a397b0acc4d879d7";
-          sha256 = "0m2shpwh55dl1ymmin638ldwkpi5n62iljszlfi5gjwyshd58db5";
+          rev = "4453c03b5c95ff32842f13db2fc317fb0fe2f79e";
+          sha256 = "01jhfglj1v4p3qmhiri4k05p0dg10k59pj5608hjls6zsmxf2wbg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e19f92097e6003a893907aa46a2df755d2bf0b87/recipes/eldoc-cmake";
@@ -24156,12 +24464,12 @@
       melpaBuild {
         pname = "eldoc-eval";
         ename = "eldoc-eval";
-        version = "20190106.1200";
+        version = "20190423.1158";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "eldoc-eval";
-          rev = "4a1cf92dc5c4eca7519eb32f61b95e9e9f5755e4";
-          sha256 = "1x90yjzlilzfdkslxi5ijdqi0pcldlz2p3m6nk17b8b3mayi7zj7";
+          rev = "a67fe3637378dcb6c5f9e140acc8131f0d2346b3";
+          sha256 = "0504yyzxp1rk0br6f25395n4aa4w8ixf59vqxxb55a7agxplfpjc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval";
@@ -24338,12 +24646,12 @@
       melpaBuild {
         pname = "elfeed";
         ename = "elfeed";
-        version = "20190407.1454";
+        version = "20190514.1025";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "2f19e61a41fb732704366ca9d62aa9f0f090408a";
-          sha256 = "13mmgxi71afl7kvx8gs75smacad69ywivcp7gwjid7bpn6rd2myy";
+          rev = "fd539da2da94ab4794fd69247ce06deca7aa66bf";
+          sha256 = "1awm3n9qyyh0dacrix6rwy0a34llf0ac4v1kysydfh6l3ghbs99k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -24488,12 +24796,12 @@
       melpaBuild {
         pname = "elgrep";
         ename = "elgrep";
-        version = "20181126.59";
+        version = "20190518.839";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "elgrep";
-          rev = "73679c28737f8d6d34444df46bed5293d4845f82";
-          sha256 = "091ghc7grd6znsfxnwg30w9i32818j6arxgnz9fkkwizngw5v9hv";
+          rev = "c2c5858f335ac1d0013dc631e5bc2dc16d9b3198";
+          sha256 = "1rlj9cniwk8fzfn1i4apffrikv08r9c2dmwxhqc6nmrhfjr2rf1k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
@@ -24569,12 +24877,12 @@
       melpaBuild {
         pname = "elisp-demos";
         ename = "elisp-demos";
-        version = "20190314.929";
+        version = "20190604.2301";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "elisp-demos";
-          rev = "8c3ee9e83f92876606432251569fd4ce62e7e764";
-          sha256 = "1z5x0rrn8486k1vm9v0g2wvjv8q7yr2n4jrb94ayp31z547yn0q9";
+          rev = "837769d9ab2075a4e1a45506bc2853a845b431c8";
+          sha256 = "0ir0ixwqb7i7apaspilf6kavgyvhkvcraa8m6wz16h1slg0j3w2l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1bd1c7a4576d4874a8c5fc8ab2dbc65f0e5bc8c/recipes/elisp-demos";
@@ -24776,12 +25084,12 @@
       melpaBuild {
         pname = "elixir-mode";
         ename = "elixir-mode";
-        version = "20190319.1144";
+        version = "20190421.1855";
         src = fetchFromGitHub {
           owner = "elixir-editors";
           repo = "emacs-elixir";
-          rev = "b86aab218d67d041682e50b5c939308638bb0200";
-          sha256 = "0226ing29qqvnv9yr3bkyajimqw33ihfzcqj18nq83lfhwggbp19";
+          rev = "694d133e847e9a6db6abd1c19850cec6d867ccce";
+          sha256 = "0fl3i8cxnrn70l68328jyhabgccmqbislkgp4k4ih5yll3plz31n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elixir-mode";
@@ -25129,12 +25437,12 @@
       melpaBuild {
         pname = "elpa-mirror";
         ename = "elpa-mirror";
-        version = "20181012.1956";
+        version = "20190423.1418";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "7b881f881a0c8a8de14161cbd3869c2a7591706c";
-          sha256 = "1hrj6jkmk5b0q40nnpadn08b4cnals48rvlqrmfshjc7gz06kjcj";
+          rev = "50b92aae0b4cafc38de9767edad726c3c3915ffc";
+          sha256 = "0ryblixg3bv51wagjs67k4hwalfm19vccwqs7q14lwbhv96n99qd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -25147,6 +25455,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    elpher = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "elpher";
+        ename = "elpher";
+        version = "20190603.1031";
+        src = fetchFromGitHub {
+          owner = "tgvaughan";
+          repo = "elpher";
+          rev = "343d06a4080ca8fb67eaa3a0508aa7551b93a164";
+          sha256 = "0lbssaaj3fmmppv95gkwf65w5iq6vhqjb28xw854fg8i8maax21d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/df2162816fed4d5da7ee5adafbf547eed8815418/recipes/elpher";
+          sha256 = "1csy26ra6kgm2rnf1s6bj254r18zkaf6y7kb3rrjm1msw3vjvvr2";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elpher";
+          license = lib.licenses.free;
+        };
+      }) {};
     elpy = callPackage ({ company
                         , emacs
                         , fetchFromGitHub
@@ -25161,12 +25495,12 @@
       melpaBuild {
         pname = "elpy";
         ename = "elpy";
-        version = "20190406.755";
+        version = "20190523.1546";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "2d4a968e8fe04e6ad099c526349633105a38f608";
-          sha256 = "13nbpd79vhfp7k9da59999l49hh0k1m8n9q9mdfrk4irrglzmm89";
+          rev = "ef274bbe1d4709d36951a0e5cc5b81bdb6a8be79";
+          sha256 = "1szqxs28941frkgqll6pa2fs70a4w6abxqhbh7lzb1qr4zi09fs6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -25730,12 +26064,12 @@
       melpaBuild {
         pname = "emacsql-sqlite";
         ename = "emacsql-sqlite";
-        version = "20190108.825";
+        version = "20190426.1229";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "60b99760c59afa58dc0241e0468e6fc40b8f199b";
-          sha256 = "0l376j85q7fnlz35db22vrz618g2d94j0qa21kl3cna81n8wpr5z";
+          rev = "d5c37d905d133a3887bc582e4a0126671816beaa";
+          sha256 = "1v0ynzvzgy7l2dhiz940i6a71v93jfsn2b7k3lhzdrx5s4a56wi5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
@@ -25755,12 +26089,12 @@
       melpaBuild {
         pname = "emacsshot";
         ename = "emacsshot";
-        version = "20161018.743";
+        version = "20190527.343";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "emacsshot";
-          rev = "752244330ff829d8dbea7fcf7065f5d4708038a6";
-          sha256 = "15y0vv8vm30yp3mn0x7lqq3vd7wb2qny424jx5f4m74hy2xi3svr";
+          rev = "64b7152e84a72b2ebcfd436a974135cf6978ef47";
+          sha256 = "1m80804d2ynwdjgxrpbi4y3p0r16a3ihnga8pxhlaxxqnxy7m8b8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot";
@@ -26019,11 +26353,11 @@
       melpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "20190221.847";
+        version = "20190529.1011";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "6013464eb7295fcd749b3146f758fc9295fbe11a";
-          sha256 = "0g7a31yn9p0iqr2im0l9d8fch58ffk5m7g3kfnn377pbyfh4hr11";
+          rev = "f7e27094f09432b40ced77c7163cd29f338b7db6";
+          sha256 = "009lba33xk86jpngmx63mgv9im28n1yfbjqzwd60f39hhvbl6mrd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -26365,12 +26699,12 @@
       melpaBuild {
         pname = "emojify";
         ename = "emojify";
-        version = "20190401.2053";
+        version = "20190521.124";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "4954a4f2cffe5c459727bee30cd221c59eacd839";
-          sha256 = "1y7swk97qllnk0lc3x8ya9lrd7d74ximjaa5pnj695knrf1ib0jn";
+          rev = "302d16e9bac72faf94984e0c48ecd0e4b8d66738";
+          sha256 = "1fqnj5x7ivjkm5y927dqqnm85q5hzczlb0hrfpjalrhasa6ijsrm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -26451,12 +26785,12 @@
       melpaBuild {
         pname = "emr";
         ename = "emr";
-        version = "20180921.1415";
+        version = "20190414.1325";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "emacs-refactor";
-          rev = "8856b2ed7e45dd33a5f81e1302a2fba736c64dd6";
-          sha256 = "1swsh3ld5vlp3fx9dynri6rphpsn9i7n3amzlbzh36w0jkkjcz0m";
+          rev = "73a7b2ea2db4ee6327e788f7462da9e107e5082f";
+          sha256 = "0habg2llm7k030bz9syf9b0ilgpk8r1svhbdl6957pdgj8zqj4pn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr";
@@ -26565,12 +26899,12 @@
       melpaBuild {
         pname = "enh-ruby-mode";
         ename = "enh-ruby-mode";
-        version = "20190407.413";
+        version = "20190512.1954";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "249c98e1345f71b03260dc4af747be9a7f1a8a07";
-          sha256 = "18gq393ply76hxd1k5myavzg5aayhyng89392mrhbshq437491kx";
+          rev = "f334c42986e93c60fba144d732becfcbdb13bb7d";
+          sha256 = "0xfdiajm2blkddxillnvn0mnik2i1q5zwgb5zc60i7p5dg1fj176";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -26820,12 +27154,12 @@
       melpaBuild {
         pname = "epkg";
         ename = "epkg";
-        version = "20190314.1713";
+        version = "20190505.345";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "408d46a9d041b516e9fda0414058a287dfef37fb";
-          sha256 = "1csvjirm3w40jzpd1nqlqwv8nx5cscmwpmb2rhijj59fw12jllnc";
+          rev = "1aaa64402bf91575ee81bf240c4c52320f68088d";
+          sha256 = "0ij44yp72y1flcjp2q6yfbrnr4bnzjflgcsksl3djr9nhb73cd5a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -26873,12 +27207,12 @@
       melpaBuild {
         pname = "epm";
         ename = "epm";
-        version = "20161027.34";
+        version = "20190508.2143";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
-          rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a";
-          sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw";
+          rev = "6375ddbf93c5f25647f6ebb25b54045b3c93a5be";
+          sha256 = "1m0l0szrwljzsch4xj9a42nflpqfii68g8clizsjwv323h6xff4n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm";
@@ -26979,12 +27313,12 @@
       melpaBuild {
         pname = "equake";
         ename = "equake";
-        version = "20190403.1840";
+        version = "20190527.2131";
         src = fetchFromGitLab {
           owner = "emacsomancer";
           repo = "equake";
-          rev = "997ad912062cbdf8598d6f029319ee046649a26c";
-          sha256 = "04xzjsifam29y55wfhw29gviadp0f2pn4di6nnhrypxlir2mg3rz";
+          rev = "a03c7d942caa43d202bdf99a6845bee1d2d189a1";
+          sha256 = "1303nlpzyyy0cka3n546dgk29bxn493fx5hp94qi0rfz5lqnk1q7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4a0ec11a9c720d7ed90addcb31d0a9d5594f5b/recipes/equake";
@@ -27499,12 +27833,12 @@
       melpaBuild {
         pname = "ergoemacs-mode";
         ename = "ergoemacs-mode";
-        version = "20181127.1330";
+        version = "20190526.2048";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "cac7b5628d54fbce1b4e564fdfd36dc6b989c228";
-          sha256 = "0aimaq0crkbdpj7y01ydg052i5iqajf295nka099mi1yrbl2ppr3";
+          rev = "7d3656541a00cc04ba4cefa31c0d127adb5a260a";
+          sha256 = "1rw237xiw5nz736l5jdmlsa11l14qvzdac0wqymi80a0rfwqikga";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -27797,12 +28131,12 @@
       melpaBuild {
         pname = "es-mode";
         ename = "es-mode";
-        version = "20181004.1517";
+        version = "20190512.516";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "1b7aca9b4e9fcebf4a67682203035eaf75b692e2";
-          sha256 = "16vdy6kknwi1hxgkfrzc6jk9h41l6agyiw6k21j3dcz237ngrkhv";
+          rev = "8de1452e1b9181a4f6778c0aaefc011aef58b25d";
+          sha256 = "0p9k30a1ar9hpw63cxr46afk7l3b7j79jpgrjcpsicd17rhjbcs8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -28129,6 +28463,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    eshell-toggle = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "eshell-toggle";
+        ename = "eshell-toggle";
+        version = "20190526.752";
+        src = fetchFromGitHub {
+          owner = "4DA";
+          repo = "eshell-toggle";
+          rev = "2eb91974047f5caf8df3bf3af5014be2cc95ddac";
+          sha256 = "1iblhp0jvki2lm1jg1g93r3zvxvpjv3pi0xssivypq3bpy22v6cr";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a3cf4c5ed3bb0995eac9dcce939b518a0ef987/recipes/eshell-toggle";
+          sha256 = "06cxjh0cqcafb4skw317f8wria9gv77wbwpc62a276s3zrv961qf";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/eshell-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
     eshell-up = callPackage ({ emacs
                              , fetchFromGitHub
                              , fetchurl
@@ -28401,12 +28762,12 @@
       melpaBuild {
         pname = "ess";
         ename = "ess";
-        version = "20190407.721";
+        version = "20190530.747";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "1c2a5e9525d4bd66cf54aac087837a2f70d5bfd5";
-          sha256 = "11nkgxzykrw7cfcdb8mbrym92mna0y4lfv02fpy3l8zffcs71mcn";
+          rev = "a715cbbd998d645ec377dc99964cd2b0f14fc192";
+          sha256 = "060s331wmdzzvd183jcyzy4frc1jgsiqjz5bpgm8fx4kk42df2ww";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
@@ -28643,12 +29004,12 @@
       melpaBuild {
         pname = "ethan-wspace";
         ename = "ethan-wspace";
-        version = "20170507.1330";
+        version = "20190522.748";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "14ae43130e019034367cd2b6e2bf9a067955dd33";
-          sha256 = "19i8y8ys58mvzmz0ijcdv9nnrs3b85zbgl087d68734vhp73iy78";
+          rev = "0f110fc26b829093c352e8dc9e50ba51a4e483ac";
+          sha256 = "1w26cczq58xyzgmpsks11dnl58kvzk0av2y4bg46cgma4fdg9pb1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9454f3a58e3416fa60d8411b0db19c408935408f/recipes/ethan-wspace";
@@ -29082,12 +29443,12 @@
       melpaBuild {
         pname = "evil-collection";
         ename = "evil-collection";
-        version = "20190327.1904";
+        version = "20190605.2304";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-collection";
-          rev = "28bf368cf14b87d1a96c71f8b2d422d7edf4c39b";
-          sha256 = "0r6p3pkrhrlbd77dn20n86rxkgpvrj62842s2nnmr9mk5bwd5fap";
+          rev = "218e6e2e222998b2cc84003f6b98f0a82595754b";
+          sha256 = "044q3gabjsxhplhrnwzmkml78vzwc16289zwg0xh713n2b80vdki";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fbc35279115f6fdf1ce7d1ecef3b413c7ca9c4f1/recipes/evil-collection";
@@ -29350,12 +29711,12 @@
       melpaBuild {
         pname = "evil-expat";
         ename = "evil-expat";
-        version = "20190111.2140";
+        version = "20190521.14";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-expat";
-          rev = "4c344ea19b789002d759a202ffbf594730d2c59a";
-          sha256 = "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr";
+          rev = "f4fcd0aa3edc359adb5c986b5dd9188d220d84e2";
+          sha256 = "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
@@ -29703,12 +30064,12 @@
       melpaBuild {
         pname = "evil-lispy";
         ename = "evil-lispy";
-        version = "20170304.259";
+        version = "20190502.39";
         src = fetchFromGitHub {
           owner = "sp3ctum";
           repo = "evil-lispy";
-          rev = "040a7ee130c2403a1d6dac591b94b202bb48e186";
-          sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1";
+          rev = "ed317f7fccbdbeea8aa04a91b1b1f48a0e2ddc4e";
+          sha256 = "0izgd9zwfwykmznv6wjrq9czmjqc1hkw41szrjmrcxy5kbz1p5c0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy";
@@ -30136,12 +30497,12 @@
       melpaBuild {
         pname = "evil-rails";
         ename = "evil-rails";
-        version = "20160621.1558";
+        version = "20190512.817";
         src = fetchFromGitHub {
           owner = "antono";
           repo = "evil-rails";
-          rev = "8cbf97719fdef17e98c593966d4753962e350bac";
-          sha256 = "18m73hr0nqrf60vnrhbd4jjrfz8g6flzkdjixd8rzpxpmfx8vsv9";
+          rev = "b0f1c5de6720714febeb76c4b569b71bb891938c";
+          sha256 = "0mypsbf0mg2b4746r9b9ybj51qkrlxz48lf9g53kzbk3wdf6p5vi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ff526fe800b0535067431f1ae78c4a4b5594b23d/recipes/evil-rails";
@@ -30850,6 +31211,87 @@
           license = lib.licenses.free;
         };
       }) {};
+    ewal = callPackage ({ emacs
+                        , fetchFromGitLab
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "ewal";
+        ename = "ewal";
+        version = "20190517.2233";
+        src = fetchFromGitLab {
+          owner = "jjzmajic";
+          repo = "ewal";
+          rev = "31583d76bbc79bdf856b39510a175b52551b862f";
+          sha256 = "0by4cihbrcvp09gan15xs57pvra411n19b8gilqqh1i5fx9c3zq8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7f9833a1dda00e12bcf45c7194ebc38e26168b/recipes/ewal";
+          sha256 = "19z370w1lk8l26knj6ry3znxcimvkbwd8pm4cg16r9ib5c78zxiq";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ewal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ewal-evil-cursors = callPackage ({ emacs
+                                     , ewal
+                                     , fetchFromGitLab
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "ewal-evil-cursors";
+        ename = "ewal-evil-cursors";
+        version = "20190604.220";
+        src = fetchFromGitLab {
+          owner = "jjzmajic";
+          repo = "ewal";
+          rev = "81f0da12d0b2d2c27bce635590faa7d0492557ca";
+          sha256 = "1d20hvl2zf9r1hjk1sryb8ax0mnl935idqcfwxr75wzm6kgzly30";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7f9833a1dda00e12bcf45c7194ebc38e26168b/recipes/ewal-evil-cursors";
+          sha256 = "177f5m1a3cvgjkgqz61w8gz3q272sk2cafq2z29rk88gcfbm2iqc";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ewal ];
+        meta = {
+          homepage = "https://melpa.org/#/ewal-evil-cursors";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ewal-spacemacs-themes = callPackage ({ emacs
+                                         , ewal
+                                         , fetchFromGitLab
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , spacemacs-theme }:
+      melpaBuild {
+        pname = "ewal-spacemacs-themes";
+        ename = "ewal-spacemacs-themes";
+        version = "20190517.2249";
+        src = fetchFromGitLab {
+          owner = "jjzmajic";
+          repo = "ewal";
+          rev = "0897907340d160212e295665eaf18866b9e2c113";
+          sha256 = "0h8g7mklfz9hgcwa7r72qzyw4il7dk36q87nynyx1nq9wafj14qy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5aebe80668479c02a694fef153cea0e9f9ca7eb0/recipes/ewal-spacemacs-themes";
+          sha256 = "0a0xpjlw3yfqfn2wcyqzpdisyr5pm1x35k8rpcjhwn5lhh7njlfc";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ewal spacemacs-theme ];
+        meta = {
+          homepage = "https://melpa.org/#/ewal-spacemacs-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     ewmctrl = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -30934,12 +31376,12 @@
       melpaBuild {
         pname = "exec-path-from-shell";
         ename = "exec-path-from-shell";
-        version = "20190105.1907";
+        version = "20190426.1527";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "76cd6e3fa8a7dac937af7e40507843dfae4f9184";
-          sha256 = "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p";
+          rev = "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c";
+          sha256 = "1mrwsc12j44q9cv9sjz3hhr7pd4z4vj30ha320zlh7pcacs973js";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
@@ -30960,11 +31402,11 @@
       melpaBuild {
         pname = "exiftool";
         ename = "exiftool";
-        version = "20190203.1206";
+        version = "20190520.406";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "4131fa38160dabd5d7143aad8aca5db575749292";
-          sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh";
+          rev = "e043df1bcef40cd5934a74c210e1e35d5eb0e5a6";
+          sha256 = "0am4g25mlmm1iqcm2kxzskrzhrm1f09cdwcqmvk4lidid5xcb6xc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -31035,12 +31477,12 @@
       melpaBuild {
         pname = "expand-region";
         ename = "expand-region";
-        version = "20190327.528";
+        version = "20190415.2238";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "expand-region.el";
-          rev = "0ba6f41a7921ae24e8d3a2345dd5492052fe93f4";
-          sha256 = "0j92jj0ydqll3c4p14gwn6z0c3l44ali2yr3cnz3a96g00fd36y4";
+          rev = "1c31447730443d98f90f65dfcb752f347d46ad1b";
+          sha256 = "07jm8hm3zsm556l10gw83dw0mpm2d9d8x5blqbdmmp5zsf0y5kqb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -31193,12 +31635,12 @@
       melpaBuild {
         pname = "exunit";
         ename = "exunit";
-        version = "20190215.1940";
+        version = "20190510.2314";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "exunit.el";
-          rev = "1b7763bc4822f3292a6b9b368693b0c271052eb8";
-          sha256 = "1g6w7gchw34acqwigsjhf93hx83w11wr6a2yv6p8ncw9r3vgbnh2";
+          rev = "7aa008cb54e7935183a19d6b81d218de7ec38ca4";
+          sha256 = "0zp0sdnrb5mm6k1z6zqs7s042f6n24sg1y0wx6bw35za6r5f36cr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94e4fd4cf58b280d08d22aff4dd9c47201a29e72/recipes/exunit";
@@ -31447,12 +31889,12 @@
       melpaBuild {
         pname = "eziam-theme";
         ename = "eziam-theme";
-        version = "20180414.329";
+        version = "20190425.351";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "96595833110cd64c391e0ccd5230782a8f0a4e08";
-          sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch";
+          rev = "4402f58f6d619571c0960b2be5ce5b61962c1a67";
+          sha256 = "0a7jk5k8fhj9klsphyw22khrwb5ns3w85rbzyrdrshhcaqcr88j3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -31552,12 +31994,12 @@
       melpaBuild {
         pname = "face-explorer";
         ename = "face-explorer";
-        version = "20170710.1201";
+        version = "20190517.1157";
         src = fetchFromGitHub {
           owner = "Lindydancer";
           repo = "face-explorer";
-          rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c";
-          sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7";
+          rev = "ad1300e13e5643e4c246cabfd91f833d39113052";
+          sha256 = "0nq36h6kwyi2sv1fklm42spfkllm6jlz0alh2qlpgy4ixq5sp2pv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer";
@@ -31628,12 +32070,12 @@
       melpaBuild {
         pname = "faff-theme";
         ename = "faff-theme";
-        version = "20190115.1307";
+        version = "20190506.813";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "cf76f8d700ae4e7c58b2ebb4bbe3b10a21a5658b";
-          sha256 = "1jap3fx29l542p4yjaimy1v0d2rnd5bprnz8clxhm80jn6km8v9d";
+          rev = "de12f6a11711955fbbcdf7c042459aa2206f8deb";
+          sha256 = "193d6s759kmkwfmwc9367grkgf46gm9ppczppcrk2h3alzr1hba6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -32320,12 +32762,12 @@
       melpaBuild {
         pname = "find-file-in-project";
         ename = "find-file-in-project";
-        version = "20190330.1830";
+        version = "20190602.342";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "33fc401eeda51c11dfecd78d961538aaef23761b";
-          sha256 = "1vrw2c88lanb5r8gapf62blccb98s864b5bn3fc5hj27ybd441vd";
+          rev = "df9a69852c183bbcd5195b7802b4e527e97f4895";
+          sha256 = "1hlg5lkn1a81q9gqpv4894lyg45y9mc1ajiy1hlyvwxc9czffkmx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -32627,12 +33069,12 @@
       melpaBuild {
         pname = "fish-completion";
         ename = "fish-completion";
-        version = "20190207.1358";
+        version = "20190429.122";
         src = fetchFromGitLab {
           owner = "Ambrevar";
           repo = "emacs-fish-completion";
-          rev = "23aafb993f8f74dca6e2f299030ca5d3e1aee95b";
-          sha256 = "04dcqhdb544i7c6np4prbq13cwfxw37czmpnm3j36di6c1g9gkzb";
+          rev = "e5b9b65a077319dfdb2faca9ef847db3ef55d0db";
+          sha256 = "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion";
@@ -33050,12 +33492,12 @@
       melpaBuild {
         pname = "flim";
         ename = "flim";
-        version = "20180328.1624";
+        version = "20190526.334";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "flim";
-          rev = "faaa2b1f2bb8fcf835ddfb8981654e4d3b2bdbc6";
-          sha256 = "0hr4qi5vhq3ravgky95k2n7hin97jln7fmkgbx45fcyiz8jbpz2z";
+          rev = "e4bd54fd7d335215b54f7ef27ed974c8cd68d472";
+          sha256 = "0sl3skyqqzanjrp34hd1rh8wvdgsj2cm7k7hx5kc5ipggp77720r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim";
@@ -33147,6 +33589,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    flow-js2-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flow-minor-mode
+                                 , js2-mode
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "flow-js2-mode";
+        ename = "flow-js2-mode";
+        version = "20190214.230";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "flow-js2-mode";
+          rev = "ef0211c9b292915ba3773998ca99e25f627aa5af";
+          sha256 = "0i35mkc9g3v7cgh30izg9azcvskd4fqxhfblj7sh5br2p1yw8w0p";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3487c252f013f6937c6731b57f2a9c1e5227a81d/recipes/flow-js2-mode";
+          sha256 = "05wx7z5f4mkiab8ahhhr3fi6awmsdl253fwapad5ag3kaimnmxv7";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flow-minor-mode js2-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flow-js2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     flow-minor-mode = callPackage ({ emacs
                                    , fetchFromGitHub
                                    , fetchurl
@@ -33372,12 +33842,12 @@
       melpaBuild {
         pname = "flycheck";
         ename = "flycheck";
-        version = "20190320.326";
+        version = "20190503.153";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "c311febff8c9bf07d6c6d486c32a07340ba62727";
-          sha256 = "0kfd1a6na2h19ysdr0yziii79mbaqwgd3sjx4f0nvs4rs907a3iq";
+          rev = "47174a12fd84a685f36019632838c73b4813b66d";
+          sha256 = "15ng2pfkl826gfvsdnhapnnm24r8010sixw95ry3azrmjfd2z29b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -33390,6 +33860,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-ameba = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-ameba";
+        ename = "flycheck-ameba";
+        version = "20190512.1009";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "ameba.el";
+          rev = "b2c115905887ab6f12c08072e370e8ad2194e131";
+          sha256 = "0rrinj1w7z4r1zvq1nlnx3nhq3xd5pn06jd3hxrlyg7j11g8vla4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/flycheck-ameba";
+          sha256 = "17jfqbzzb1xkz9yx5ww6pykjnixm5w8mvwva1kqbjs4f2bsqbc6p";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-ameba";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-apertium = callPackage ({ fetchFromGitHub
                                      , fetchurl
                                      , flycheck
@@ -33633,6 +34130,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-clj-kondo = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-clj-kondo";
+        ename = "flycheck-clj-kondo";
+        version = "20190410.815";
+        src = fetchFromGitHub {
+          owner = "borkdude";
+          repo = "flycheck-clj-kondo";
+          rev = "1402fb008f10198f09c55869cd713a99c3e72dff";
+          sha256 = "0ifkkw7mn83hw4yjx81h519fcabvdk73bavs3pbzck69v6li0mmy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20dca546bbad0fa7b713dc015d1b9a9b7caf5370/recipes/flycheck-clj-kondo";
+          sha256 = "0a61jq6g0arrsa97rl3frns8k9l9qxazb96ir99y9kskim4njl6r";
+          name = "recipe";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-clj-kondo";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clojure = callPackage ({ cider
                                     , emacs
                                     , fetchFromGitHub
@@ -33662,6 +34185,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-clolyze = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-clolyze";
+        ename = "flycheck-clolyze";
+        version = "20190422.1434";
+        src = fetchFromGitHub {
+          owner = "DLaps";
+          repo = "flycheck-clolyze";
+          rev = "9a3300eac22a7ff96accf37fa2d761c13cc38020";
+          sha256 = "1iphw65jn5yfkmxbjhc4igrqypsvfr7bxwxr41fdghsxldswqz9p";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/69fb1a2c590eb1a9a7cae09a7080b24185e49c74/recipes/flycheck-clolyze";
+          sha256 = "1181g7ni0xihq0mbk6g6h7wh31hrg9q2xxsyrg6gb1zf4qqp2zyv";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-clolyze";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-color-mode-line = callPackage ({ dash
                                             , emacs
                                             , fetchFromGitHub
@@ -34344,11 +34894,11 @@
       melpaBuild {
         pname = "flycheck-grammalecte";
         ename = "flycheck-grammalecte";
-        version = "20190212.805";
+        version = "20190517.944";
         src = fetchgit {
           url = "https://git.deparis.io/flycheck-grammalecte/";
-          rev = "2f4812eaa6e809051e23c34a085df2b704a15741";
-          sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q";
+          rev = "8ba9d41dad0c9c96760614ce7594ceb823f560de";
+          sha256 = "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte";
@@ -34722,12 +35272,12 @@
       melpaBuild {
         pname = "flycheck-mix";
         ename = "flycheck-mix";
-        version = "20170118.630";
+        version = "20190511.1457";
         src = fetchFromGitHub {
           owner = "tomekowal";
           repo = "flycheck-mix";
-          rev = "76684d4b5987925b98b254aab656f8bf8198ab88";
-          sha256 = "130ddx83h88krd64kss4z59lfrmdi3433r95939kqsqfmhzvgx0k";
+          rev = "0bc301cfb6627e51a83312052641df1844ebce0a";
+          sha256 = "1wvlnxr01i1kbvbwh8zi1m4vld2nlw1vnzia6kci425s0wj5w8i5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix";
@@ -34856,12 +35406,12 @@
       melpaBuild {
         pname = "flycheck-objc-clang";
         ename = "flycheck-objc-clang";
-        version = "20181116.401";
+        version = "20190421.349";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "a3781e47f14068c811534a3348bf479eeb3f2041";
-          sha256 = "00a2wg6g74plbmva3bwms7brdlv9i28w51yxisiv04la126m69js";
+          rev = "b46ad43637cebf8467cf596d3e7b5f5d371789e9";
+          sha256 = "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -35213,12 +35763,12 @@
       melpaBuild {
         pname = "flycheck-pycheckers";
         ename = "flycheck-pycheckers";
-        version = "20190308.1115";
+        version = "20190523.1111";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "15951d3dfec4c63e4761af53a85f2ade6182bf82";
-          sha256 = "01lbh1g2ndgsk71qyskx9aii95bbw787mrf98zh7ihk2ak5nskaz";
+          rev = "7969168b1367da6c48bf79f59ea0db0240ed66d9";
+          sha256 = "0xy0y0ywxfc422k4cdv5phh70fi77f6rn9imdbdkkd64x4lfahqr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -35462,12 +36012,12 @@
       melpaBuild {
         pname = "flycheck-swift3";
         ename = "flycheck-swift3";
-        version = "20190125.2050";
+        version = "20190420.1810";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "ba4e831ff04b180323435214dd4cca8184968ad1";
-          sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm";
+          rev = "811a765a0106bbdc8d6a721b22a2a97f3527df7c";
+          sha256 = "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -35936,6 +36486,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake-eslint = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "flymake-eslint";
+        ename = "flymake-eslint";
+        version = "20190520.2111";
+        src = fetchFromGitHub {
+          owner = "orzechowskid";
+          repo = "flymake-eslint";
+          rev = "d4be92ea779ea333b599fd125817f943a676a63a";
+          sha256 = "1x0ipsg0gd5lflx7kyyaz7zv6xnjzmhh1k32f01qr69zarf31nw0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b607c3b859f4564e316532a256a299c73e5f6f0/recipes/flymake-eslint";
+          sha256 = "0avirxxgjk3k8hqpnhay83ij7s3xr4ha4wz5lji1zyx6f6im6gyb";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flymake-eslint";
+          license = lib.licenses.free;
+        };
+      }) {};
     flymake-gjshint = callPackage ({ fetchFromGitHub
                                    , fetchurl
                                    , lib
@@ -36720,12 +37296,12 @@
       melpaBuild {
         pname = "flyspell-correct";
         ename = "flyspell-correct";
-        version = "20181223.348";
+        version = "20190408.310";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "cf492832a59d1b1112868fff430a6f74f9baf83a";
-          sha256 = "102nf4abm6kpk3mkf850hq55x61nvv919p66jdg9ry732682987b";
+          rev = "a443ba5f9037df1f1fef8a5fa721deafc2427b58";
+          sha256 = "1mvhlm0zrq0dxsgsapy0yc128yw2xbjb8lgsnyqhvagqm36rh5fd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -37063,12 +37639,12 @@
       melpaBuild {
         pname = "fold-this";
         ename = "fold-this";
-        version = "20180828.636";
+        version = "20190605.1005";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "fold-this.el";
-          rev = "49bdb7fe6a8f207afb1f05382372674a7c876ba8";
-          sha256 = "1h9afb019y1c488c2s6w7nas32b89lngrl7f90rd8i9ynm5lbvr0";
+          rev = "59bbba129a5c3b2f179287af7296a20b30f3abfd";
+          sha256 = "0n33paj20361xdkpvwysp53bpixkwawiy5xy9fvfjslk5lk4pa61";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this";
@@ -37088,12 +37664,12 @@
       melpaBuild {
         pname = "folding";
         ename = "folding";
-        version = "20170925.838";
+        version = "20190524.932";
         src = fetchFromGitHub {
           owner = "jaalto";
           repo = "project-emacs--folding-mode";
-          rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2";
-          sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry";
+          rev = "a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a";
+          sha256 = "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding";
@@ -37351,7 +37927,6 @@
                          , fetchFromGitHub
                          , fetchurl
                          , ghub
-                         , graphql
                          , let-alist
                          , lib
                          , magit
@@ -37361,16 +37936,16 @@
       melpaBuild {
         pname = "forge";
         ename = "forge";
-        version = "20190407.915";
+        version = "20190529.113";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "forge";
-          rev = "d803da1d817453684c644ef2822c7e29cee768e3";
-          sha256 = "1d10wb5j6lnc2r87qhwmfzbs9gav178g8vwsgx9cfhzzk9hyqd02";
+          rev = "0e1ffa3380b4cc0c04a46ab159b377a39eede2c7";
+          sha256 = "0hc460w00hp9ifdqka2399a55igx5nnhcdzsybh8jqwaz7vg4wwh";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/23512cf8152161322960d72a5ec49a7595003477/recipes/forge";
-          sha256 = "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/58c5ca46286712b2aa43e07bb5dcbc8b5eb321e8/recipes/forge";
+          sha256 = "1ykpjgbi2yak9ww54wnm1gxj9zff2ggldg9msg3219r8frzjcnjv";
           name = "recipe";
         };
         packageRequires = [
@@ -37379,7 +37954,6 @@
           emacs
           emacsql-sqlite
           ghub
-          graphql
           let-alist
           magit
           markdown-mode
@@ -37424,12 +37998,12 @@
       melpaBuild {
         pname = "format-all";
         ename = "format-all";
-        version = "20190330.1206";
+        version = "20190606.153";
         src = fetchFromGitHub {
           owner = "lassik";
           repo = "emacs-format-all-the-code";
-          rev = "7dd5c5e9f73ae36bb78567ee429ac88220938b6c";
-          sha256 = "0j20k0d7v5zjdr2hkn3r9vymw343qkp1j8gj6jylr3j51c4gd2x3";
+          rev = "f3ed09c430c80d17fcc34f130f32072177f4ef2b";
+          sha256 = "0sb3nlwrf8gzj1p7ld1ahsl83d614y4fwy808r1md230g9cmafsg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all";
@@ -37634,12 +38208,12 @@
       melpaBuild {
         pname = "frame-mode";
         ename = "frame-mode";
-        version = "20190306.1949";
+        version = "20190506.2200";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "frame-mode";
-          rev = "4551bf43bc087448ce0edcd67c36f68649e95274";
-          sha256 = "0p3j6h8rcxwjmylg9rx86n6y6bysicif1hxan6xdwz3pskkhm3lj";
+          rev = "bec163a7aecae0847817fb0e36413b0ab1e47d1f";
+          sha256 = "06q0nc2wavmm9b1mnr4jl3lqia39l5x1hzzymja33rccnqzdmx8k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode";
@@ -37716,12 +38290,12 @@
       melpaBuild {
         pname = "frames-only-mode";
         ename = "frames-only-mode";
-        version = "20180114.1048";
+        version = "20190524.739";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "frames-only-mode";
-          rev = "9ebd895574bb0b3e4ef111d522b8039e274e8afc";
-          sha256 = "03fis931cb5k7a0jjjgkzmq30g43543kinr8hw6z8xkaivh2yixy";
+          rev = "ce55b3ad3b3cb4c4253a0172bb8e9461814b2d64";
+          sha256 = "1sw1s2k4wch32h5r0z6bfyiw4qcwjz93lq36ix17r968r505djc2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
@@ -37840,6 +38414,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    freeradius-mode = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "freeradius-mode";
+        ename = "freeradius-mode";
+        version = "20190401.1043";
+        src = fetchFromGitHub {
+          owner = "VersBinarii";
+          repo = "freeradius-mode";
+          rev = "cf8bf0359cf6c77848facbd24b764b3e111b4c2d";
+          sha256 = "0ggkflx4lhyxqr7sgf1f3z0i3glmqyvl4bn16clh9ybl14q22rli";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a93de3f3933441b94303cd6dd25dabbade04dcc5/recipes/freeradius-mode";
+          sha256 = "1lk7px2v5rpfg7kakqcsg31pg69pk64x9j0j9bjwpkxc49bnk1w2";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/freeradius-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fringe-current-line = callPackage ({ fetchFromGitHub
                                        , fetchurl
                                        , lib
@@ -37969,12 +38569,12 @@
       melpaBuild {
         pname = "fstar-mode";
         ename = "fstar-mode";
-        version = "20190319.1401";
+        version = "20190513.555";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "d63d1c48573c82317e5b5991486d1595094bcccd";
-          sha256 = "0zz4dv28lpycjryb2lswpjwh4lhf6hh73grisk0ql33hg4rmsqwx";
+          rev = "b2540d287f6ef8036c47cbc80d11a546eee8fc41";
+          sha256 = "0m5n55pmji2szq5jg5zrsn6k507w7jya8s0h2y0qiiwk4cgv7693";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -38004,12 +38604,12 @@
       melpaBuild {
         pname = "fuel";
         ename = "fuel";
-        version = "20180224.1411";
+        version = "20190510.1541";
         src = fetchFromGitHub {
           owner = "factor";
           repo = "factor";
-          rev = "780bbd49cf82c9746ca5a3f42f4a4a27266ccee9";
-          sha256 = "1fs6200rsbnk2lagz8qj17iynaf4c1fvb6sm03i53shsbarak2c3";
+          rev = "82893dceeef53643e96b73d58d4800273b05da97";
+          sha256 = "16yc1p9pvz3x9vs7dyjvx53qq26lpklldfl048x4vzr4gmaj648n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -38185,12 +38785,12 @@
       melpaBuild {
         pname = "futhark-mode";
         ename = "futhark-mode";
-        version = "20190302.124";
+        version = "20190412.237";
         src = fetchFromGitHub {
           owner = "diku-dk";
           repo = "futhark-mode";
-          rev = "7140d0fcd509fac6deeda5b4065ede5ee5922466";
-          sha256 = "06dpspyyqqwb2vhdxmxgw0n8kpb2zw5qczp4bck9vkayqxqb8ahn";
+          rev = "f8e5a13b39517e62607647422914a63fe60547b2";
+          sha256 = "1jahfp38h51synr00iwzs29pxij95hskb3smbi0f0wh0hzrpr81x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode";
@@ -38483,6 +39083,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    gcmh = callPackage ({ emacs
+                        , fetchFromGitLab
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "gcmh";
+        ename = "gcmh";
+        version = "20190421.2326";
+        src = fetchFromGitLab {
+          owner = "koral";
+          repo = "gcmh";
+          rev = "65787bce5e21ee4a376008a67095a395ac9d5fed";
+          sha256 = "0bwbgr3xianq4d4c2isqd0rzhsvpc9djzrnac7v6bim867aighz8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e478bee9aade9cdac22f9935b937978f3a3e1d3c/recipes/gcmh";
+          sha256 = "0h5l02k01dv74n04ybnm1416dfhr5sm3h3maq0pypxqdfz1anhsg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gcmh";
+          license = lib.licenses.free;
+        };
+      }) {};
     gdscript-mode = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -38597,12 +39223,12 @@
       melpaBuild {
         pname = "geiser";
         ename = "geiser";
-        version = "20190224.1248";
+        version = "20190514.1743";
         src = fetchFromGitLab {
           owner = "jaor";
           repo = "geiser";
-          rev = "156970ff1402512b4bbf53a5e1c22156cb0e2f9c";
-          sha256 = "0n295p54zigbdiclfkacz3rqkxr6aib1npz0x8nkhnhv5avcwgyf";
+          rev = "e60e1c2b1baf8891e1af010af491faf422eacd43";
+          sha256 = "1xryyah24jz3fa5sajd0hfpb1sqhkv1ncrjhnkbizmi2lzzljqxz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser";
@@ -38624,12 +39250,12 @@
       melpaBuild {
         pname = "general";
         ename = "general";
-        version = "20190308.1342";
+        version = "20190420.740";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "5f1ae7fcf24c0a9d9aec164944796783c8d77d09";
-          sha256 = "0xr4jbghr32q31hlsffslc43jj9qnn9pkz2v2pbl1ba4rh8dafjz";
+          rev = "356654668ee4f77aa330398c54b62fb33345fdff";
+          sha256 = "171g686ssslkn3yw9c2i4jimkn18qc722660fba4c45l520bv1h5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -39015,7 +39641,6 @@
                         , emacs
                         , fetchFromGitHub
                         , fetchurl
-                        , graphql
                         , let-alist
                         , lib
                         , melpaBuild
@@ -39023,19 +39648,19 @@
       melpaBuild {
         pname = "ghub";
         ename = "ghub";
-        version = "20190319.1643";
+        version = "20190529.338";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "c7ca6780bcd4d00d22e668e74b25f865ba892a45";
-          sha256 = "0icy333p2f9bsg552hjliqi6b9cmygf2ix10xgbam1zzh1b77clz";
+          rev = "7deb60c402dc2d77b44738417fe247cd4d01e040";
+          sha256 = "1ji0nqlvgz7vy488qaqpw3bxpcy0yi1x95jmymcaq7yw35l0dnbk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/ghub";
           sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
           name = "recipe";
         };
-        packageRequires = [ dash emacs graphql let-alist treepy ];
+        packageRequires = [ dash emacs let-alist treepy ];
         meta = {
           homepage = "https://melpa.org/#/ghub";
           license = lib.licenses.free;
@@ -39340,12 +39965,12 @@
       melpaBuild {
         pname = "git-commit";
         ename = "git-commit";
-        version = "20190319.1652";
+        version = "20190501.1123";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "24fd932a2344306be82efec599212b0535abf253";
-          sha256 = "14b1czjwjhi6xlnfg7vdjvp2fc927cpd8r1xp8kvnfjviwmav6gf";
+          rev = "65bae41baad0138fc8859742b1fd1899edc8468a";
+          sha256 = "086g5wxk5rriqyjhyyc385xmm5c2a9x0srxxixfrjh1jk7bxf2dg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -39522,6 +40147,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    git-identity = callPackage ({ dash
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , hydra
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "git-identity";
+        ename = "git-identity";
+        version = "20190424.447";
+        src = fetchFromGitHub {
+          owner = "akirak";
+          repo = "git-identity.el";
+          rev = "d20f6178a8818dcd6c5911d9cbf98934823e619e";
+          sha256 = "0gaxm9l93vg4azj6sb650dq1l3nslnk62qvsgv0iw10k8azxy8d8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebad3a7a81fbf0293ac04ba319929c8b24bb98f5/recipes/git-identity";
+          sha256 = "0kmpm5zp2x60r68in94x2bazq4wxx95n6zfc6mwiq8ln8m0164j0";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs f hydra ];
+        meta = {
+          homepage = "https://melpa.org/#/git-identity";
+          license = lib.licenses.free;
+        };
+      }) {};
     git-io = callPackage ({ emacs
                           , fetchFromGitHub
                           , fetchurl
@@ -39915,6 +40569,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    github-explorer = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild
+                                   , request }:
+      melpaBuild {
+        pname = "github-explorer";
+        ename = "github-explorer";
+        version = "20190420.2210";
+        src = fetchFromGitHub {
+          owner = "TxGVNN";
+          repo = "github-explorer";
+          rev = "3a67835b24366c64deb2aa33626330742895bb0c";
+          sha256 = "1yvdm7kiyiv79kysafjz8w2i66kqf1a98cwwyfykni4zj09hysi2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e224d2272892fb6751a093b0306f399057e6098a/recipes/github-explorer";
+          sha256 = "0s7k9wspdmvgmyd5sws3asp3kjp5a4nnzvbyn6jp8bcwd7girmr0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/github-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
     github-issues = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -40086,12 +40767,12 @@
       melpaBuild {
         pname = "github-stars";
         ename = "github-stars";
-        version = "20181117.2048";
+        version = "20190517.619";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "github-stars.el";
-          rev = "807de6da3ab32d278d68a1b709c012f6bfa4d280";
-          sha256 = "152gqg2kvfnfflndx15zkyzapzfkv741rwd0g3m7dn37mblnhgvl";
+          rev = "bb79c80574cfff865342b6e262f2c9762edb4c15";
+          sha256 = "03lx8ndhikl2frdblbi3fsaz6xzfay6w2ngl1z0ib85wca55lzqp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars";
@@ -40218,12 +40899,12 @@
       melpaBuild {
         pname = "gitlab-ci-mode";
         ename = "gitlab-ci-mode";
-        version = "20190323.952";
+        version = "20190425.1358";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode";
-          rev = "cfd39298a87e989473278d819dc0498a43fce45d";
-          sha256 = "1naa7fngfzdj884kfriv777d99ksn36kxqv5rl5zv6h1sl25c6pr";
+          rev = "dac4e5125c78aa3ae12d2e35a66196d709676236";
+          sha256 = "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
@@ -40379,12 +41060,12 @@
       melpaBuild {
         pname = "glsl-mode";
         ename = "glsl-mode";
-        version = "20190326.1251";
+        version = "20190513.1845";
         src = fetchFromGitHub {
           owner = "jimhourihan";
           repo = "glsl-mode";
-          rev = "ee5d6aa5631e26792fa27c7e418224d514454591";
-          sha256 = "1acgx4k4cb6pgvwzdgck9v9gk3ffnmvl7ylsljbi7pjxsiqkzp45";
+          rev = "eaea63a45d0dcb04ddbf069b4bcfd99f10919e44";
+          sha256 = "0fb6as099y1k8inc39n8hkmb63j1l4sd5q9cbyqz4shfczma3546";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode";
@@ -40474,6 +41155,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    gn-mode = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "gn-mode";
+        ename = "gn-mode";
+        version = "20190428.1112";
+        src = fetchFromGitHub {
+          owner = "lashtear";
+          repo = "gn-mode";
+          rev = "fcf8e1e500d953364e97e7ebc5708a2c00fa3cd2";
+          sha256 = "0dz5kgzbgsssr38z2kg6m915cvfys42ag1k42bsra3la2pixywfx";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c6c27bce3d0aaf7e3791299a527d5f1fd69653/recipes/gn-mode";
+          sha256 = "1rn4xa1am1yd9k2hpi5b0zhs3pgq4hnhgxdgs258cmhszm8c6ii2";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnome-calendar = callPackage ({ fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -40687,12 +41395,12 @@
       melpaBuild {
         pname = "gnus-recent";
         ename = "gnus-recent";
-        version = "20190115.951";
+        version = "20190423.446";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "gnus-recent";
-          rev = "c6b287532fe82e95dce5a488f752c122567f9348";
-          sha256 = "1lpjs5qgvplbbm2waixiyj3mk4698h09150chm1mwxjc0np2acj1";
+          rev = "d9375cfad0054a05c910c1210f0f37aa601aebba";
+          sha256 = "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b80d94cf1a8b8e2d4da5d45f65231aa4884a3a0/recipes/gnus-recent";
@@ -40755,6 +41463,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnus-summary-repo = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "gnus-summary-repo";
+        ename = "gnus-summary-repo";
+        version = "20190510.1052";
+        src = fetchFromGitHub {
+          owner = "TxGVNN";
+          repo = "gnus-summary-repo";
+          rev = "4787825eec56c4e90a746e98ab38ba44b6e1b2e1";
+          sha256 = "1nx742xg0c6vwc7zgaqbhf2xajby0i3b2xq46ldw96bkvwizry4g";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0decb1e7d7fd32dc4ed7e07c751621eea0af0ab5/recipes/gnus-summary-repo";
+          sha256 = "0lwdhymayqs1cx76lnral2cs5dhrxwzlpc1ivchbyr1pj9x2nj6w";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gnus-summary-repo";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnus-x-gm-raw = callPackage ({ fetchFromGitHub
                                  , fetchurl
                                  , lib
@@ -40870,12 +41604,12 @@
       melpaBuild {
         pname = "go-complete";
         ename = "go-complete";
-        version = "20151015.228";
+        version = "20190408.2216";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "go-complete";
-          rev = "e39efc356f6e19f17db3f3d2c81f28d38b31a55e";
-          sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
+          rev = "056294014f37a1004958ec17ebd6748deed63502";
+          sha256 = "021mc1lq4xvmj8dvnpr6hhfs08cd0r07d520h498b345y6a6ihdg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4df81abbf3b16f06fa327c1626bef1245ea77758/recipes/go-complete";
@@ -40923,12 +41657,12 @@
       melpaBuild {
         pname = "go-dlv";
         ename = "go-dlv";
-        version = "20160517.1346";
+        version = "20190413.923";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "go-dlv.el";
-          rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
-          sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
+          rev = "df03ade331d8fb46acc57ef358e696bc36129e04";
+          sha256 = "0sfx84cbxn8d3gsjg0zjam4yc7pjlyp3g94xa3xv91k71ncnijs1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
@@ -41833,6 +42567,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    gopher = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , w3m }:
+      melpaBuild {
+        pname = "gopher";
+        ename = "gopher";
+        version = "20190512.651";
+        src = fetchFromGitHub {
+          owner = "msnyder-info";
+          repo = "gopher.el";
+          rev = "6f4accac226698b22e8388e41ad5723b12553dde";
+          sha256 = "02093q9dwbqjyq47j05cmxmw12690f4qqpwsj7qnqz15m9n4b6xc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c01e1c5009e8a4fefe5169c8e97ead53f8f6621/recipes/gopher";
+          sha256 = "01b1mr8nn5yrq65y067slc7mvxigansbim0nha41ckyrkh8mw4fs";
+          name = "recipe";
+        };
+        packageRequires = [ emacs w3m ];
+        meta = {
+          homepage = "https://melpa.org/#/gopher";
+          license = lib.licenses.free;
+        };
+      }) {};
     gore-mode = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , go-mode
@@ -41942,6 +42703,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    goto-char-preview = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "goto-char-preview";
+        ename = "goto-char-preview";
+        version = "20190418.129";
+        src = fetchFromGitHub {
+          owner = "elpa-host";
+          repo = "goto-char-preview";
+          rev = "5ff31c670fa050ad44dbf3f2edacc877ec9ba6f4";
+          sha256 = "12pixfgjyf7shl8mmcfyfq8ma292r3ajhicy2f54hdjjn017h8hj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b856d9304ba8814050634db54c8abb88e5dce772/recipes/goto-char-preview";
+          sha256 = "1h9lq9ka469day511nnv566kggja23pa8zhqxa805p6lp7132b4d";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goto-char-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
     goto-chg = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -42019,6 +42806,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    goto-last-point = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "goto-last-point";
+        ename = "goto-last-point";
+        version = "20190525.1155";
+        src = fetchFromGitHub {
+          owner = "manuel-uberti";
+          repo = "goto-last-point";
+          rev = "031570d2e778db46e5a2b7d440bcd15c8307eb69";
+          sha256 = "0v80fk7k1jl6388fidsnbi4c6yjapskv03pgd87j8dkxmdn19spa";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20148869e301d236bbf335e8545131488ad57f27/recipes/goto-last-point";
+          sha256 = "0lns0w7zvi8afsr64kcyn68arrjf7bqmpadw12zj100nnnvs40lh";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goto-last-point";
+          license = lib.licenses.free;
+        };
+      }) {};
     goto-line-preview = callPackage ({ emacs
                                      , fetchFromGitHub
                                      , fetchurl
@@ -42029,14 +42842,14 @@
         ename = "goto-line-preview";
         version = "20190307.2336";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "goto-line-preview";
           rev = "1e361d8c0b9596154db579e6ae5edbd51e12eedc";
           sha256 = "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/231e0b056114a63aa472ccfc0cd24f2f12a31600/recipes/goto-line-preview";
-          sha256 = "1mbc9p96rrxpafdfx7wq50aj4fd3c47p7pqjwqqfdgk9dskmsjc2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/goto-line-preview";
+          sha256 = "1id3msndzav59ljwdp7xnh0glbzc8d12phpywlb89h5nclj0rzsl";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -42134,12 +42947,12 @@
       melpaBuild {
         pname = "grab-mac-link";
         ename = "grab-mac-link";
-        version = "20190302.646";
+        version = "20190419.607";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "94e6130d7542bafdf594e45606d1148b0a5687f7";
-          sha256 = "0p55gs2xkfw2lgzkaxjy869hqi1gqnxbxgndvkczzj3f0nzfsa0y";
+          rev = "b52d29cd78a60cfe874667a8987ed10e8eb0f172";
+          sha256 = "15qznll0358cgqb9m9hpr2if2rsskr29mpsg7h32xb6njqnn741m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -42415,12 +43228,12 @@
       melpaBuild {
         pname = "graphql-mode";
         ename = "graphql-mode";
-        version = "20190320.57";
+        version = "20190503.422";
         src = fetchFromGitHub {
           owner = "davazp";
           repo = "graphql-mode";
-          rev = "ebd6502c0901dd2864a6ac893659a0cd74b6ba73";
-          sha256 = "169bp2ps0i931qlcn0nsngs8dycqzlr3dcb5smnlmbjylmqi9yjq";
+          rev = "74ee772a62103fe3ec4f291854a0604dd3f5bb9e";
+          sha256 = "050p8ig92sl82hrlwdiz91igzpd4bp793l942pr71vrr23fahra1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
@@ -42907,12 +43720,12 @@
       melpaBuild {
         pname = "gruvbox-theme";
         ename = "gruvbox-theme";
-        version = "20190406.1946";
+        version = "20190424.2322";
         src = fetchFromGitHub {
           owner = "greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0";
-          sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5";
+          rev = "69a6ddf6c7e8c84174b94900ba71ddd08ec0237f";
+          sha256 = "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme";
@@ -42975,6 +43788,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    gsettings = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , gvariant
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
+        pname = "gsettings";
+        ename = "gsettings";
+        version = "20190513.303";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-gsettings";
+          rev = "4d42b0d98ad9c62cec27cfdc662a93a0e84f4afb";
+          sha256 = "0kb68zij131696z53rmdlqmxic4cyipsb377l05sc8zx80z9pgqy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebdd0285684c712748d6353bd2a4774bd97dd521/recipes/gsettings";
+          sha256 = "168zq3gp874k66jv8k78i6b1cb9042763aj9wpmcs9bz437hhw32";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs gvariant s ];
+        meta = {
+          homepage = "https://melpa.org/#/gsettings";
+          license = lib.licenses.free;
+        };
+      }) {};
     gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub
                                           , fetchurl
                                           , lib
@@ -43095,12 +43937,12 @@
       melpaBuild {
         pname = "guix";
         ename = "guix";
-        version = "20190107.1126";
+        version = "20190507.1011";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "c4c96663fefe7e007c372e7d24d6e7016b70e4ee";
-          sha256 = "1730q2dm84f15ycjdf3dgl2j8770mhr6qnyzxgac3zzkjr8pyvq7";
+          rev = "11e0dbf6491300d250efb3dc09d634b01e86b35b";
+          sha256 = "0j60v0h850cwxik1mhlnmqms47dkkqcnfx53qs66hi1zyp7pax5z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -43163,6 +44005,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    gvariant = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , parsec }:
+      melpaBuild {
+        pname = "gvariant";
+        ename = "gvariant";
+        version = "20190513.305";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-gvariant";
+          rev = "824e162b9b4e5aefc38850fad6dfaf1b4527599b";
+          sha256 = "07mxqr5wsbkhprg38lvgzba7r96b315dvsnvv9hb8cnxy5b94d7y";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a616ac75f77b1e61e1386bd905b6bcf3d8aaa3f/recipes/gvariant";
+          sha256 = "1ycrnfq60z9fycgqmp1y8jna0l0c2b6mlg6ggimb0rml1ili6npm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs parsec ];
+        meta = {
+          homepage = "https://melpa.org/#/gvariant";
+          license = lib.licenses.free;
+        };
+      }) {};
     gvpr-mode = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
@@ -43276,12 +44145,12 @@
       melpaBuild {
         pname = "hack-mode";
         ename = "hack-mode";
-        version = "20190407.1646";
+        version = "20190514.835";
         src = fetchFromGitHub {
           owner = "hhvm";
           repo = "hack-mode";
-          rev = "831bab05b283a719a4762fec0082cc599def93c7";
-          sha256 = "1nzlzldmnz9hc9i09lzs4wqqvwv0x5n69kv0lq9rs5cqjm7yyphq";
+          rev = "17be6b0e986f591eba1e2afee327b48ca9e62f95";
+          sha256 = "0ddfjd47irdn6j8aalh9avv7vvi0mi5c80gaxdhrzxb5v5zfjbaa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode";
@@ -43302,12 +44171,12 @@
       melpaBuild {
         pname = "hack-time-mode";
         ename = "hack-time-mode";
-        version = "20170527.910";
+        version = "20190529.155";
         src = fetchFromGitLab {
           owner = "marcowahl";
           repo = "hack-time-mode";
-          rev = "73d6fcf8b39283526e5d4e3919193611e25a0898";
-          sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl";
+          rev = "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb";
+          sha256 = "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -43353,12 +44222,12 @@
       melpaBuild {
         pname = "hackernews";
         ename = "hackernews";
-        version = "20190211.1535";
+        version = "20190529.420";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "30798c7bc8cb7cd732d49a274d74057b4ce6cf74";
-          sha256 = "1iifzz2n8ca6275rwmd3xp9lv0jp3c8nzhmrw3aarsnwdmxr1hmh";
+          rev = "2362d7b00e59da7caddc8c0adc24dccb42fddef9";
+          sha256 = "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -43769,12 +44638,12 @@
       melpaBuild {
         pname = "haskell-mode";
         ename = "haskell-mode";
-        version = "20181122.23";
+        version = "20190525.1919";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b";
-          sha256 = "0697l2rpfacjapazvxhrnp0524zjgvw13c3168czljijknx3b54r";
+          rev = "aa382235ee3349e28fdb5096e462d394ef0cb00b";
+          sha256 = "0jra8gy7i5m9fnrl8jvmyswipmk3kkhzhf3nkqwkg04n6ykd64gj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -44163,12 +45032,12 @@
       melpaBuild {
         pname = "helm";
         ename = "helm";
-        version = "20190407.1013";
+        version = "20190605.2306";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a52049cc51a7db2f2a98c93e0eef7a419271c7a7";
-          sha256 = "0yb1hjs79g5417cw3kihdk8hvjx3lllf63qn0mn59zk62s9cdw68";
+          rev = "03f56db7c60c312920ac02f2dfafc40f27b44d0e";
+          sha256 = "1ych6d54zafxffba61msyra3ffqwyzpfz31p57gqcqaxnq9d80hz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -44441,12 +45310,12 @@
       melpaBuild {
         pname = "helm-bibtex";
         ename = "helm-bibtex";
-        version = "20190214.809";
+        version = "20190430.1118";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f";
-          sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh";
+          rev = "e1391a4be629b506f06d678bcdfd17d290904482";
+          sha256 = "11922djfvz32h6bv8gdzhpm7ddxw5gsdphjvjxa7cr2zj7x9nhx7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -44512,6 +45381,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-bitbucket = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm-core
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "helm-bitbucket";
+        ename = "helm-bitbucket";
+        version = "20190422.402";
+        src = fetchFromGitHub {
+          owner = "dragonwasrobot";
+          repo = "helm-bitbucket";
+          rev = "632495036c4a6ac30e408fc74ee9f209fd5ac429";
+          sha256 = "0rbgk982jlbqh1rhns3zmndfr3lpw7m2j9z7qylghkll4k8fcjpl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8df73e21dee5144147f9432efe95ee576ac5f435/recipes/helm-bitbucket";
+          sha256 = "19bflbnavkwipf7mcrkg3i64iz50jmzm64nl7y1ka349mpy5sm04";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm-core ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-bitbucket";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-bm = callPackage ({ bm
                            , cl-lib ? null
                            , fetchFromGitHub
@@ -44567,7 +45463,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bundle-show = callPackage ({ fetchFromGitHub
+    helm-bundle-show = callPackage ({ emacs
+                                    , fetchFromGitHub
                                     , fetchurl
                                     , helm
                                     , lib
@@ -44575,19 +45472,19 @@
       melpaBuild {
         pname = "helm-bundle-show";
         ename = "helm-bundle-show";
-        version = "20151221.430";
+        version = "20190526.701";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-bundle-show";
-          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
-          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+          rev = "70f1ca7d1847c7d5cd5a3e488562cd4a295b809f";
+          sha256 = "12wz98fcs8v8w74ck4jqbh47pp5956xxh9ld5kpym9zrm39adpq2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-bundle-show";
           license = lib.licenses.free;
@@ -44648,6 +45545,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-catkin = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , helm
+                               , lib
+                               , melpaBuild
+                               , xterm-color }:
+      melpaBuild {
+        pname = "helm-catkin";
+        ename = "helm-catkin";
+        version = "20190425.820";
+        src = fetchFromGitHub {
+          owner = "gollth";
+          repo = "helm-catkin";
+          rev = "a3422346eb46e66a947a75f9e1b9975a672036be";
+          sha256 = "0d6g1nkaly9ss1h3i7qq3igzsfllw0zwkz5374pvmq53p3nk20r8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c6e88d2a2fc07c8d25f4e1d973147805522a3261/recipes/helm-catkin";
+          sha256 = "1yr62riiva55c341s9x0fn9wdrv1j05s9a82xm2925jsyh5xzaxy";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm xterm-color ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-catkin";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-charinfo = callPackage ({ cl-lib ? null
                                  , emacs
                                  , fetchFromGitHub
@@ -44879,12 +45804,12 @@
       melpaBuild {
         pname = "helm-codesearch";
         ename = "helm-codesearch";
-        version = "20190405.411";
+        version = "20190412.453";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "helm-codesearch.el";
-          rev = "1dd925cdc7527f4e1cfb433d823d1be805455df3";
-          sha256 = "1dpym7bwaavw9ggdhvma32f3kd0psrb4s2pcgni0j53hmawl7szr";
+          rev = "72f1d1de746115ab7e861178b49fa3c0b6b58d90";
+          sha256 = "1qxpx8jmkvg59k4rx99bn9asnh4nl5rwkjvbhprdlqaicglm153q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
@@ -44935,12 +45860,12 @@
       melpaBuild {
         pname = "helm-company";
         ename = "helm-company";
-        version = "20180828.912";
+        version = "20190522.2018";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
           repo = "helm-company";
-          rev = "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f";
-          sha256 = "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k";
+          rev = "6995b79bdfce73e398d0185eba135f1e74cf37c2";
+          sha256 = "09jg4b7bbz5y7nrqlka3vb58s4rszl0ih4x61j724ksl637xrw66";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -44962,12 +45887,12 @@
       melpaBuild {
         pname = "helm-core";
         ename = "helm-core";
-        version = "20190407.1014";
+        version = "20190601.2326";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a1791980f9ddca1989c65a67e6997bdde481dc27";
-          sha256 = "1g6gj6wq3yiazyf73zk8hqc3nv52fg42g5gv5n8v766a3fb7bisq";
+          rev = "a70de280eb6ea870697f6686f79a27872a8b5483";
+          sha256 = "04v9sv8c79vr4fqg9r66wy8ifdri33j0bs6z5s7kmgq02ygfiwm4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -44991,12 +45916,12 @@
       melpaBuild {
         pname = "helm-cscope";
         ename = "helm-cscope";
-        version = "20190406.151";
+        version = "20190510.1751";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "helm-cscope.el";
-          rev = "e4698933e26524c025533cbb8fd1e1ab61e1d940";
-          sha256 = "0lq0qhgacafz56kblkghs6pgh4linw3s2646zcamy0psksmxjcli";
+          rev = "e91171032d7f0744dd210f69008b08024a7e5b1a";
+          sha256 = "0k6xb6vs90nirphfjw5gfhr718cgg4nnzz3h1iqzd40606qcdpf4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope";
@@ -45065,6 +45990,8 @@
         };
       }) {};
     helm-dash = callPackage ({ cl-lib ? null
+                             , dash-docs
+                             , emacs
                              , fetchFromGitHub
                              , fetchurl
                              , helm
@@ -45073,19 +46000,19 @@
       melpaBuild {
         pname = "helm-dash";
         ename = "helm-dash";
-        version = "20190316.1309";
+        version = "20190527.418";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "192b862185df661439a06de644791171e899348a";
-          sha256 = "06am5vnr4hsxkvh2b8q8kb80y5x1h3qyv7gwggswwhfa7w2vba3w";
+          rev = "6c76c794fec95586028633f24773451812af5df4";
+          sha256 = "0ajkflf6fzpxxgv2nzpxnc1d2rp32ba1lz9x4s2bini71krai88s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
           sha256 = "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb";
           name = "recipe";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ cl-lib dash-docs emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-dash";
           license = lib.licenses.free;
@@ -45099,12 +46026,12 @@
       melpaBuild {
         pname = "helm-descbinds";
         ename = "helm-descbinds";
-        version = "20180429.756";
+        version = "20190501.235";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-descbinds";
-          rev = "033be73f21778633813264ce1634a6e1ad873d8e";
-          sha256 = "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk";
+          rev = "b72515982396b6e336ad7beb6767e95a80fca192";
+          sha256 = "1bp2n32lvb1fhnwzk8s782i928m8mklv77jz5rq0ag1q7y740r31";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds";
@@ -45347,12 +46274,12 @@
       melpaBuild {
         pname = "helm-emms";
         ename = "helm-emms";
-        version = "20190304.232";
+        version = "20190422.822";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-emms";
-          rev = "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd";
-          sha256 = "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh";
+          rev = "89ec04e6548f16c5848cc49ad506e0561cea87ab";
+          sha256 = "0cn1amwgf5nm73yjxnhjsl6dvfcvh8qb2j2rhsyd6i8kzzkyplf2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -45746,7 +46673,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghq = callPackage ({ fetchFromGitHub
+    helm-ghq = callPackage ({ emacs
+                            , fetchFromGitHub
                             , fetchurl
                             , helm
                             , lib
@@ -45754,19 +46682,19 @@
       melpaBuild {
         pname = "helm-ghq";
         ename = "helm-ghq";
-        version = "20161015.117";
+        version = "20190526.709";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
-          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
+          rev = "d0d6aa0f407388e7012f0443df8ae657ece01779";
+          sha256 = "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-ghq";
           license = lib.licenses.free;
@@ -45885,12 +46813,12 @@
       melpaBuild {
         pname = "helm-github-stars";
         ename = "helm-github-stars";
-        version = "20190326.924";
+        version = "20190428.347";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "8cea100f788832ad28c2a61b8fc805298383e263";
-          sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma";
+          rev = "c891690218b0d8b957ea6cb45b1b6cffd15a6950";
+          sha256 = "0050i3apv72klqi3s0zw5sv4r4sizx4vlw07l52i39ij7bzjhkzz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
@@ -46095,7 +47023,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hatena-bookmark = callPackage ({ fetchFromGitHub
+    helm-hatena-bookmark = callPackage ({ emacs
+                                        , fetchFromGitHub
                                         , fetchurl
                                         , helm
                                         , lib
@@ -46103,19 +47032,19 @@
       melpaBuild {
         pname = "helm-hatena-bookmark";
         ename = "helm-hatena-bookmark";
-        version = "20180803.2246";
+        version = "20190526.712";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e";
-          sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk";
+          rev = "70b08add4f42ad430441399d266f47773f18835a";
+          sha256 = "007ghf8ac104ifm4idc60zy2rn310kncbcv0qg4wr9djl65n2m95";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-hatena-bookmark";
           license = lib.licenses.free;
@@ -46729,12 +47658,12 @@
       melpaBuild {
         pname = "helm-lsp";
         ename = "helm-lsp";
-        version = "20190104.1334";
+        version = "20190422.2248";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "helm-lsp";
-          rev = "78e2d936589f60f61ebed21c896416a59375aa46";
-          sha256 = "1cmcvzffqrmnbyrzi7brh118236ycb5bmr6np6c3h6janmhmml8n";
+          rev = "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b";
+          sha256 = "0wh5zai3s17ss2q8wcdd6d87hv1h3nbyrxxs4js9cas8m6y2ssjv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/helm-lsp";
@@ -46783,12 +47712,12 @@
       melpaBuild {
         pname = "helm-make";
         ename = "helm-make";
-        version = "20190403.624";
+        version = "20190518.1246";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "12c94f765401157d9ae0ba701636b50c9e313486";
-          sha256 = "1qanvb2wggmznxvyx8cpfs0ah6ysk0sqp2ccki8c20835l0awnyv";
+          rev = "8eabcaf29102f5ab07543f627af5d75178c86d10";
+          sha256 = "0akyr99fkp3j2yipxik9fdsycd35jd6xb7q716k6ngwaa5gf2qka";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -46893,12 +47822,12 @@
       melpaBuild {
         pname = "helm-mu";
         ename = "helm-mu";
-        version = "20180513.221";
+        version = "20190410.1018";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "77e6fea24e01481418738421dbcfe28ef1bd63cf";
-          sha256 = "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz";
+          rev = "7793d96694505380c470cb7b31b4bd8a2781e529";
+          sha256 = "01410wi46ljpy1040wk9dp2k21nyhc3k6kwxpy35874bqhqn5r3i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -47308,12 +48237,12 @@
       melpaBuild {
         pname = "helm-projectile";
         ename = "helm-projectile";
-        version = "20180815.814";
+        version = "20190408.808";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "8a2dbc973548fac89356c11d70f7f474ea1367a5";
-          sha256 = "1lyka93dw4ndpw1qr1ixrng5lfdbz84yha5zl37imvkg68v6zi1x";
+          rev = "38d72b6b661234088bae9f3c2b3c18228a3c0564";
+          sha256 = "1n6x0is8nlf9ikgabz7889q5g7rikqs5292lvb1kvkb2rvbaa65g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -47434,7 +48363,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-qiita = callPackage ({ fetchFromGitHub
+    helm-qiita = callPackage ({ emacs
+                              , fetchFromGitHub
                               , fetchurl
                               , helm
                               , lib
@@ -47442,19 +48372,19 @@
       melpaBuild {
         pname = "helm-qiita";
         ename = "helm-qiita";
-        version = "20180301.635";
+        version = "20190526.659";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-qiita";
-          rev = "3ccb85640bf54491ed3c3c8110d454ae181650dc";
-          sha256 = "03km0hm3jy6qcs8szqsmzpdmhfmyh121i5f68cf60am8y616f0kp";
+          rev = "5f82010c595f8e122aa3f68148ba8d8ccb1333d8";
+          sha256 = "1vkm2h0ia0gqqjw6cnbyik0fv37zzjwwdzk1cnh7a3s5hsg60i68";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-qiita";
           license = lib.licenses.free;
@@ -48234,12 +49164,12 @@
       melpaBuild {
         pname = "helm-tramp";
         ename = "helm-tramp";
-        version = "20190124.2047";
+        version = "20190524.149";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "a7456cee86a83d68c966475fab90ab94006fd23c";
-          sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w";
+          rev = "af5bd50b955e385bc447080e720ffc85ed0b286b";
+          sha256 = "0s6zasnk9kwpiw3446n0jn7xi5v6w7asdpzx5aqh85karrb7bbq6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -48400,12 +49330,12 @@
       melpaBuild {
         pname = "helm-xref";
         ename = "helm-xref";
-        version = "20190212.2259";
+        version = "20190524.243";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "helm-xref";
-          rev = "c258209ee6c21774ba3df89d3c6bd7afbb86af9f";
-          sha256 = "1mznr67ivddms0vhaj4aglfkhfzssifrrv65pfm8ny76gwlvx73z";
+          rev = "d2744e6626fa40c9ef3c8537f858995e00f74e45";
+          sha256 = "1nfir7b7zqf0bprlap03iy68dzcfzs8b5p1f6sywf6az3l1h3swc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
@@ -48535,24 +49465,23 @@
                            , fetchurl
                            , lib
                            , melpaBuild
-                           , s
-                           , shut-up }:
+                           , s }:
       melpaBuild {
         pname = "helpful";
         ename = "helpful";
-        version = "20190407.1536";
+        version = "20190528.1416";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "53ae44bd2384de5e2513496ccf6ca2fce6767299";
-          sha256 = "1fpqnimqbrwhpv714iw46i0dyb4gxdvh08640xbwbqpm9p546lm7";
+          rev = "897feba75ded5c93dcfc3d950319cf19c03252db";
+          sha256 = "1l5hgl7b3c23kwxd1b99wn8b545l3szjc0c72643wnd86i91m557";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
           sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
           name = "recipe";
         };
-        packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ];
+        packageRequires = [ dash dash-functional elisp-refs emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/helpful";
           license = lib.licenses.free;
@@ -48869,12 +49798,12 @@
       melpaBuild {
         pname = "hierarchy";
         ename = "hierarchy";
-        version = "20171221.351";
+        version = "20190425.142";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "06f21d3fc16c44c1fa45dc9c91d10100b4db9355";
-          sha256 = "1sp59nc82qb40n8p08hr0j4ig7ypc2icvgz74057vs1q042asqqw";
+          rev = "a5bc6bf2e1bbd48cc17c508043134f24abb41944";
+          sha256 = "18y5xj8j07hca7qk5ygxqpiybv58qf4c85hqw52a59fkn0vvdbhg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -49650,6 +50579,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    hl-block-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "hl-block-mode";
+        ename = "hl-block-mode";
+        version = "20190519.1730";
+        src = fetchFromGitHub {
+          owner = "ideasman42";
+          repo = "emacs-hl-block-mode";
+          rev = "3bd2b55a629cb687def06f950639382b2d960ce0";
+          sha256 = "0pjhf4kzhf639pbm0fpf4sa1jsgd8sk1d4kwylnbvc82n1v03y3f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fbba8cc73a5d567b525ce2c0a15f35379f29e8/recipes/hl-block-mode";
+          sha256 = "16z49k1rn8n1f64fidff0jyhn3h4pmklys9plr96nbd4lvm80msj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hl-block-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     hl-fill-column = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
@@ -49659,12 +50614,12 @@
       melpaBuild {
         pname = "hl-fill-column";
         ename = "hl-fill-column";
-        version = "20181210.404";
+        version = "20190605.721";
         src = fetchFromGitHub {
           owner = "laishulu";
           repo = "hl-fill-column";
-          rev = "d6d121a71458052df5371ca2e2d867632d0b2eba";
-          sha256 = "122i9f6sl8jhpdy6fwfr287lg66rcynknaq3qhf760wmdx1lpij9";
+          rev = "c96eb14298afa85e9eca84b9c148c3d0c2b270f0";
+          sha256 = "1cs3ibsn77xwyj53rwpg3vyc7c5h76jfy4j1cbjq6iczzh8kndmi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68c40d7b6af664e01083b78c60b6a8e66b278a4e/recipes/hl-fill-column";
@@ -49729,26 +50684,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-todo = callPackage ({ fetchFromGitHub
+    hl-todo = callPackage ({ emacs
+                           , fetchFromGitHub
                            , fetchurl
                            , lib
                            , melpaBuild }:
       melpaBuild {
         pname = "hl-todo";
         ename = "hl-todo";
-        version = "20190404.1434";
+        version = "20190415.1600";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "f7d97056d17ef7fc04f4fa0b65a703d1d1a5a6b8";
-          sha256 = "07aj9zkr1142xdwmlrccpxpgyrzj9n2rdk74zcmn0jiryg8k8lnc";
+          rev = "487d349b7b8d6738223d5dd10957dd10b45eb9f3";
+          sha256 = "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hl-todo";
           license = lib.licenses.free;
@@ -50365,16 +51321,16 @@
       melpaBuild {
         pname = "htmltagwrap";
         ename = "htmltagwrap";
-        version = "20181211.606";
+        version = "20190516.2211";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "htmltagwrap";
-          rev = "c9722bcaf449ca3e52628827d063233f4c8a7d1f";
-          sha256 = "0xd9841b9jfxsnmv5083yhh8d9fskyy7d0h0fhk922qcvhx0swhq";
+          rev = "3260d9267b51019328c30a6317f28e4a2dd7d522";
+          sha256 = "15rfg4z8lhwadgnr58r3skmzmkxs5phnqr1ap4bjd9pq618amdbn";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab8c9de8a9a1d0f8a7dd70d2cb191fec8714592/recipes/htmltagwrap";
-          sha256 = "1084vq3qpyjakph5yb95r0f7a4bjqfnhj5pnpv7qk39xnr640mxb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/htmltagwrap";
+          sha256 = "19vav9mpqfg6x017b2f4fkhixfw9fslhs03n780qq2n79abp77n9";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -50603,12 +51559,12 @@
       melpaBuild {
         pname = "hy-mode";
         ename = "hy-mode";
-        version = "20190310.1021";
+        version = "20190605.1426";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "d7b4609a0c2ecc2a64f4328e63cf0899d72d930e";
-          sha256 = "0gh81qk4yhgq46fm9a1cjs26d5vj3ip03i474b7v4aa7bc327jp7";
+          rev = "b8e67643b209661f82e1f8aa0dc24d8d486f3d5c";
+          sha256 = "0qn51lqv91rld0gzfrhimfqvb751gf7mnbd026c14cfjg7gmal5i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -50707,12 +51663,12 @@
       melpaBuild {
         pname = "hydra";
         ename = "hydra";
-        version = "20190405.315";
+        version = "20190525.117";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "480ae6313763a6af6dab85ed629aff2e2037bef0";
-          sha256 = "0zs9nc0mix3cqgcn5p5my5nk3826ly4ydrpx1qjgc7m2aj2smxgv";
+          rev = "a2bb124a3f2e57c032fc264bcd08219fa3d513d9";
+          sha256 = "0wshlb3cz2l8idjwz881mvq96yik64gsxn87msayxb32xblvlcpf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra";
@@ -50734,12 +51690,12 @@
       melpaBuild {
         pname = "hyperspace";
         ename = "hyperspace";
-        version = "20190216.2236";
+        version = "20190601.1258";
         src = fetchFromGitHub {
           owner = "ieure";
           repo = "hyperspace-el";
-          rev = "b059349eb9af5756e590cf2e5baf9432b6a9b96d";
-          sha256 = "0c49n8y7y5wg6zpzzr1hqzv6w8nbiywmalmnd3z22qzwb0qc0cbh";
+          rev = "685c799abe28583769f59d3fd730da883107c5f8";
+          sha256 = "0iyy6lxf94w0w63yl2wzwxfvk9jqlh5gygadi9lf7nj3paqdp0x4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0696a12acba676015640de63fc6e011128bca71c/recipes/hyperspace";
@@ -51298,12 +52254,12 @@
       melpaBuild {
         pname = "ido-completing-read-plus";
         ename = "ido-completing-read+";
-        version = "20190308.836";
+        version = "20190502.1420";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-completing-read-plus";
-          rev = "d56125deac540a2ab396d6d71f7c1eeae7f37588";
-          sha256 = "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw";
+          rev = "0e58f9271e7785d88ed90ca3ea0d7634abf4fb14";
+          sha256 = "0qpidk9l2bf34vxai2iwsafx8y1crcg1675mhn159z3dpgaz53wf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -51378,12 +52334,12 @@
       melpaBuild {
         pname = "ido-flex-with-migemo";
         ename = "ido-flex-with-migemo";
-        version = "20190124.1937";
+        version = "20190407.2050";
         src = fetchFromGitHub {
           owner = "ROCKTAKEY";
           repo = "ido-flex-with-migemo";
-          rev = "676742cda0b7bb8a0bf6aa06f345cdc43c30cefa";
-          sha256 = "0y54mf45540p4w021wgmym9gzm8i4hfx1a3bc94mafs6zw68vxqm";
+          rev = "aa93aa05947eb6c106bb9523ff3163b8574c4eac";
+          sha256 = "0k6zidi0ch4z9fg74k968pz7r0hzj56kccbf48k0is0fnzl4isxq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo";
@@ -51767,12 +52723,12 @@
       melpaBuild {
         pname = "idris-mode";
         ename = "idris-mode";
-        version = "20190228.1943";
+        version = "20190427.839";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "cb6aa30e76b6fdb7138db6d9673d5e8dc074177f";
-          sha256 = "1b1aspkl442li8a6ahl8267wv4y8kdl42fi3w67ra0gpzj4788s8";
+          rev = "acc8835449475d7cd205aba213fdd3d41c38ba40";
+          sha256 = "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -51818,12 +52774,12 @@
       melpaBuild {
         pname = "iedit";
         ename = "iedit";
-        version = "20181114.150";
+        version = "20190419.103";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "35505ad860be27feaee71e8caf646706bf8ee31d";
-          sha256 = "154d0zxn4vn4y2xglccpxkzlmg9k1g58hldgimv67x9cphsc0mpi";
+          rev = "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f";
+          sha256 = "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -51843,12 +52799,12 @@
       melpaBuild {
         pname = "ietf-docs";
         ename = "ietf-docs";
-        version = "20150928.257";
+        version = "20190420.151";
         src = fetchFromGitHub {
           owner = "choppsv1";
           repo = "ietf-docs";
-          rev = "ede30d6d26044069e1731fd20c0ab2324552c0b4";
-          sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
+          rev = "ae157549eae5ec78dcbf215c2f48cb662b73abd0";
+          sha256 = "050c6fpf41xzx5kdpqcpa2rb0fk1a3h3009fdz77v0dp3bxv3a5d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cedfdfe2c282d0484ea8239726f46a4861ef07ea/recipes/ietf-docs";
@@ -51868,12 +52824,12 @@
       melpaBuild {
         pname = "iflipb";
         ename = "iflipb";
-        version = "20190312.1242";
+        version = "20190427.1109";
         src = fetchFromGitHub {
           owner = "jrosdahl";
           repo = "iflipb";
-          rev = "50b39e0bca46da43f60d69e6066ddff910bdb144";
-          sha256 = "0xxs7b0k51kjy4za7cz7bnl5s3crn1h5kxd03zhir3gy2d5cpwrw";
+          rev = "47d310a4576ae2195777d755cf86d5ea7525ef74";
+          sha256 = "0s35iiki06302q7bn2p5gdfv03y7w3d8rkk84hxr5azwhw1v2hcg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -52091,6 +53047,7 @@
         };
       }) {};
     imenu-anywhere = callPackage ({ cl-lib ? null
+                                  , emacs
                                   , fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -52098,19 +53055,19 @@
       melpaBuild {
         pname = "imenu-anywhere";
         ename = "imenu-anywhere";
-        version = "20170805.1155";
+        version = "20190512.1239";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "imenu-anywhere";
-          rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
-          sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
+          rev = "88b0e120284058b32252e4b0ed1a07c9fe44092f";
+          sha256 = "1w0n4hx29zc6n06qfq3ryc4dcfmk7wx3lw083yv7fi12hjj255vm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
           sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/imenu-anywhere";
           license = lib.licenses.free;
@@ -52203,12 +53160,12 @@
       melpaBuild {
         pname = "immaterial-theme";
         ename = "immaterial-theme";
-        version = "20190301.2259";
+        version = "20190412.415";
         src = fetchFromGitHub {
           owner = "petergardfjall";
           repo = "emacs-immaterial-theme";
-          rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815";
-          sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c";
+          rev = "176178a57c5b342b04bebd3107c29c6d12086cf5";
+          sha256 = "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme";
@@ -52458,6 +53415,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    indian-ext = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "indian-ext";
+        ename = "indian-ext";
+        version = "20190424.847";
+        src = fetchFromGitHub {
+          owner = "paddymcall";
+          repo = "indian-ext";
+          rev = "a5450fe467393194bc2458c0d5e0a06c91bf117a";
+          sha256 = "0phbs9cx73vg9k9gp60vhlrn065skpva6gx0abp0g6rbzys2qx0b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/04e29d1a745d46ff32ccd9ee787ce1fe92786ec6/recipes/indian-ext";
+          sha256 = "07mny5rd2bmj1v260zfs4imp795lw4gnwr06pcx0s1ml2km1a2k2";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/indian-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
     indicators = callPackage ({ cl-lib ? null
                               , dash
                               , fetchFromGitHub
@@ -52497,12 +53480,12 @@
       melpaBuild {
         pname = "indium";
         ename = "indium";
-        version = "20190305.1308";
+        version = "20190517.26";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "09a97c0aabb9d972e86cd7453e3f9663ba896447";
-          sha256 = "1zzc02k6745y32mbvca4nbl55gbshvrd6ya0i04v2q1vvlx30mi3";
+          rev = "3ab9cd7d841ab3722bb041109064d2f85b2bb7bd";
+          sha256 = "1w9h20rnfysc2caz9cy3s7q38x6b8lgag5r9wc03h0rn0qz7fq7q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -52549,12 +53532,12 @@
       melpaBuild {
         pname = "inf-clojure";
         ename = "inf-clojure";
-        version = "20190327.908";
+        version = "20190531.811";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "16455abd28933af7c7d6f22dd41414a3c3c66d63";
-          sha256 = "0qdrp48i6kn0fa1qjy8gf1c3asgl5dj012dhl1xd4vp3qmgshgrw";
+          rev = "0fc23509a1e66bcc3e694066f5067fdbd7b7961d";
+          sha256 = "0w42ms5p5f1f7ir745srj73pj9jy1rfkbh3nf85ms05jgrs10fw9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -53189,12 +54172,12 @@
       melpaBuild {
         pname = "intero";
         ename = "intero";
-        version = "20190308.834";
+        version = "20190530.608";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "8da81244783fbf03afb49660423c875f2e874fba";
-          sha256 = "17vibxapzp4wf0dfc56x98wsf3wy98ghj5h10nyf7xcfwy6k0rja";
+          rev = "188211d1238a108ea47ab93216d0ae9c4a426dee";
+          sha256 = "0y00iwd7vv14jzlfq733gld22rbz8xqzcgrzj21np6nhkrfxyjlx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -53575,12 +54558,12 @@
       melpaBuild {
         pname = "irony";
         ename = "irony";
-        version = "20190125.434";
+        version = "20190516.1648";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "93b91d746a5ae3ec99f9c7614522de08edc1426c";
-          sha256 = "0pgdg13prr4j4dv7s7wfgrnn6h2z61aggqvlsqvid1vfr3xbg5wb";
+          rev = "c3ae899b61124a747ebafc705086345e460ac08e";
+          sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -53647,6 +54630,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    isearch-project = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "isearch-project";
+        ename = "isearch-project";
+        version = "20190505.119";
+        src = fetchFromGitHub {
+          owner = "elpa-host";
+          repo = "isearch-project";
+          rev = "462b8100451b947367aed2970c2669ea6d15edbd";
+          sha256 = "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4f0a2f3080e9f4db82fb2bb9279418e4b9a7e2/recipes/isearch-project";
+          sha256 = "0f6f3lm5p4h8z9bnhbl27pzgwdjj58pp8lsvc5dic0yzykx7j2y8";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/isearch-project";
+          license = lib.licenses.free;
+        };
+      }) {};
     isearch-symbol-at-point = callPackage ({ fetchFromGitHub
                                            , fetchurl
                                            , lib
@@ -53967,12 +54977,12 @@
       melpaBuild {
         pname = "ivy";
         ename = "ivy";
-        version = "20190407.1029";
+        version = "20190605.537";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "11b00073cb348aedf1d648a991bab71e20178268";
-          sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n";
+          rev = "ef6d3dbe0fbc797e622fb7b5dd5f290ed3cc5ca7";
+          sha256 = "1r4j9xvm1gdqbnylpgjl7bx1ssnhjpxkljia4av24qm9rf7ki0vf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -53999,12 +55009,12 @@
       melpaBuild {
         pname = "ivy-bibtex";
         ename = "ivy-bibtex";
-        version = "20190214.809";
+        version = "20190430.1118";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f";
-          sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh";
+          rev = "e1391a4be629b506f06d678bcdfd17d290904482";
+          sha256 = "11922djfvz32h6bv8gdzhpm7ddxw5gsdphjvjxa7cr2zj7x9nhx7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -54251,12 +55261,12 @@
       melpaBuild {
         pname = "ivy-mpdel";
         ename = "ivy-mpdel";
-        version = "20180502.1148";
+        version = "20190428.220";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "ivy-mpdel";
-          rev = "16c0e67e4411c4da158a708edf427505ebbf8845";
-          sha256 = "0ddvp8d5vxab40rmk7zj5r8hwgszrl18p0mj8fal7yp1f8la550d";
+          rev = "a42dcc943914c71975c115195d38c739f25e475c";
+          sha256 = "0zf007j3i9prlsqjaf0xw7ylaim463f867nfc63fpsr508xsn5rd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
@@ -54279,12 +55289,12 @@
       melpaBuild {
         pname = "ivy-omni-org";
         ename = "ivy-omni-org";
-        version = "20190308.1936";
+        version = "20190420.538";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "ivy-omni-org";
-          rev = "ab18ca56759aa3428ca017da223dd2eb17feb078";
-          sha256 = "1c5mk3dbbjan3fh5sy03dhhdmjawbrnqdf6m1sdkpv379hf9py2f";
+          rev = "7e51f8a1643d44eb930e1a04f11eb381ac6b8d92";
+          sha256 = "06jfg12afcn3kpd7l0ymp72pbpc5059rvqbpmzpjbr0yswxwzmq4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4eaad7323462d6c7fd343ede0d2df8c67885e542/recipes/ivy-omni-org";
@@ -54390,12 +55400,12 @@
       melpaBuild {
         pname = "ivy-posframe";
         ename = "ivy-posframe";
-        version = "20190407.544";
+        version = "20190605.1738";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ivy-posframe";
-          rev = "3aabf14e24c407c39ee5af85e18cb26f1f157af5";
-          sha256 = "04pv0mcl69cys7lcsyr1ms45wjq5xcq9q23d5r351h8qn3q4bcwf";
+          rev = "f5da408348f577c4828f61ccc7e02c123fd4a1df";
+          sha256 = "13yn9xdv638xlfv2wxnmslc7x6k6082ibaa3vrwdf0c0jx9qv7yd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
@@ -54418,12 +55428,12 @@
       melpaBuild {
         pname = "ivy-prescient";
         ename = "ivy-prescient";
-        version = "20190313.2133";
+        version = "20190523.1034";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "6a729df6e97af2bbbdce4a4536a237e47e51555d";
-          sha256 = "0j55qbwmqn89q8ngzaq6pryp9xxdag99ggvs24n0yw6qwpw7v2h5";
+          rev = "ae414dde56f3430867faf41c04e4c3df75f9c960";
+          sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
@@ -54473,12 +55483,12 @@
       melpaBuild {
         pname = "ivy-rich";
         ename = "ivy-rich";
-        version = "20190316.2315";
+        version = "20190603.1719";
         src = fetchFromGitHub {
           owner = "Yevgnen";
           repo = "ivy-rich";
-          rev = "16af79860493f924319ccb6c3588a61aded94948";
-          sha256 = "0c9jqppmywijyjh0b5fv5p1jricj6vrvkrnfm7na02zh26rjx1qj";
+          rev = "f6bfa293c6df0b43cc411876b665816ec3f03d08";
+          sha256 = "1s8nwwb1z6lkc58g02pi8w99qms948k8d02lw8k8cq47dw87i219";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/ivy-rich";
@@ -54889,6 +55899,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    janet-mode = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "janet-mode";
+        ename = "janet-mode";
+        version = "20190604.2143";
+        src = fetchFromGitHub {
+          owner = "ALSchwalm";
+          repo = "janet-mode";
+          rev = "d5555cc83c1893a1c0ea04d48857d5e71b138c06";
+          sha256 = "1lzs5zh4ipvyxi5vzbcpxrdjrrb0vddbcajzcbsi0784cs3ndzkk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c94abb076bf1f3fd6654cc1857b7b3cfe5bf5e58/recipes/janet-mode";
+          sha256 = "1kr5ldrgqrl0hfpkf6x5a0kr0l4psykw771n5dx6ably6mnlpphh";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/janet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     japanese-holidays = callPackage ({ cl-lib ? null
                                      , fetchFromGitHub
                                      , fetchurl
@@ -55262,12 +56298,12 @@
       melpaBuild {
         pname = "jdee";
         ename = "jdee";
-        version = "20190217.229";
+        version = "20190418.926";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "1b1bdf01864d38173c9972234b02f81b47781757";
-          sha256 = "08nspkv8gxhiqyqyjlv0gf59ccfrkddxd0664dzygnz9dzannhrs";
+          rev = "b9ce633d68ece00dac03d3eeddc4477de53e5e38";
+          sha256 = "0gwcl9c0y2s9xyrajwrwiaklfd8as9hmmq0lbrd7fy4q0l0vpr98";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -55426,12 +56462,12 @@
       melpaBuild {
         pname = "jenkins";
         ename = "jenkins";
-        version = "20170721.236";
+        version = "20190520.2100";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "jenkins.el";
-          rev = "1ec967973db685c9d84133ec6a5e06489ce06b62";
-          sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b";
+          rev = "9c7b9d4cb39eff7d6ac4d0cbd5ebc103dc86cac2";
+          sha256 = "1s49xmpc975q1ffb5c7cjrcwpa4a7kcakri26f5vqy3hn1h0c2v7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
@@ -55728,6 +56764,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    jq-format = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , reformatter }:
+      melpaBuild {
+        pname = "jq-format";
+        ename = "jq-format";
+        version = "20190428.734";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-jq-format";
+          rev = "47e1c5adb89b37b4d53fe01302d8c675913c20e7";
+          sha256 = "1g9chp1b3lkrg46b39swrkvp5willi0ay3i177jdp6knbzhj4mq3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce800af0c5dd7f1e4ab7ade92a863ce500c12fce/recipes/jq-format";
+          sha256 = "1ljbpgcs1s1if9s5c10k12f23rad7172k7y3s38ipn7vl7wmarw0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs reformatter ];
+        meta = {
+          homepage = "https://melpa.org/#/jq-format";
+          license = lib.licenses.free;
+        };
+      }) {};
     jq-mode = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
@@ -55866,12 +56929,12 @@
       melpaBuild {
         pname = "js-comint";
         ename = "js-comint";
-        version = "20181106.1438";
+        version = "20190605.1706";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "01be9d821269c513665d00416f6dac5c77808801";
-          sha256 = "17933bxyq6jff2ibaxj2w4d9i9a5hbcfv5kh84m2vqgxcilvlx2a";
+          rev = "ab8953bdf0176b1fadd7a3bb621f848ec5dc1f0c";
+          sha256 = "0li5za8zamwpr6cdz4b171wa0njana0ddmclrkbw1imkarb4yhp5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -56027,12 +57090,12 @@
       melpaBuild {
         pname = "js2-mode";
         ename = "js2-mode";
-        version = "20190307.849";
+        version = "20190420.1544";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "7db4871cf50fab1a1086680ead2c70d1e454be6a";
-          sha256 = "1rg263ry06wny5lcmmlzaafq5bqy9llik8ymhbak7gmjypb699fq";
+          rev = "ae9fea81cf9ed80f403c161fde4d8aff1ceb3769";
+          sha256 = "0fwkn7dki487c2qbj022p4pqa2xlqjkj8jz1hf7wjzii0x33qrs1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -56450,12 +57513,12 @@
       melpaBuild {
         pname = "julia-repl";
         ename = "julia-repl";
-        version = "20190124.259";
+        version = "20190420.755";
         src = fetchFromGitHub {
           owner = "tpapp";
           repo = "julia-repl";
-          rev = "54b4aa31d96e6945d07304dcb189289e2f8be1b4";
-          sha256 = "1jjygzz3v9iw7ixvfqvy0faa4nkg2dl5qp8jd3yxbawyx6g304n9";
+          rev = "6eb58ef8b2e922e042fb0aee399547291fce06a4";
+          sha256 = "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -56662,12 +57725,12 @@
       melpaBuild {
         pname = "jupyter";
         ename = "jupyter";
-        version = "20190406.1040";
+        version = "20190601.2319";
         src = fetchFromGitHub {
           owner = "dzop";
           repo = "emacs-jupyter";
-          rev = "53c2ffdd513206cbe45f44b848dc053de2c17db1";
-          sha256 = "1fwq8zvsjc8y4jvqnq5aa03an2pffayaiq92h39bbmf8hv59b6xd";
+          rev = "932baad3792b5ba5d701974ae008d5d8d6e22726";
+          sha256 = "0a4lxwiaybq89zg7np5x364wbvxwhyvmwjbbang4sgs403in8734";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter";
@@ -56839,6 +57902,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    kakoune = callPackage ({ emacs
+                           , expand-region
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , multiple-cursors
+                           , ryo-modal }:
+      melpaBuild {
+        pname = "kakoune";
+        ename = "kakoune";
+        version = "20190601.1638";
+        src = fetchFromGitHub {
+          owner = "jmorag";
+          repo = "kakoune.el";
+          rev = "50488df2eeb6e8bfe72cfad4de24060819b148eb";
+          sha256 = "0ym3hbiwjraqsk3clcrkllr7jlj5zqsbxqq94ds2vj0x3f9i81fq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f7e554f20c378aabd9736fdd606e513d2cbf951f/recipes/kakoune";
+          sha256 = "0ps904m3vb2v5jykc6mk9cb974imiac0pw6b7q1p9x5swk8h4jh5";
+          name = "recipe";
+        };
+        packageRequires = [ emacs expand-region multiple-cursors ryo-modal ];
+        meta = {
+          homepage = "https://melpa.org/#/kakoune";
+          license = lib.licenses.free;
+        };
+      }) {};
     kaleidoscope = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -56952,12 +58044,12 @@
       melpaBuild {
         pname = "kaolin-themes";
         ename = "kaolin-themes";
-        version = "20190405.39";
+        version = "20190605.851";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "dcaf5b5d7f2bbfe0ac8d224b4dbb24a68775314b";
-          sha256 = "06qnpnm67d89jkl504kyqd724pab6jlha9zkd1b95rj17b54ng8l";
+          rev = "2008e48bd5c31bae55fc03556768d19dd6dc159f";
+          sha256 = "1h92s4dd64plg0i2qg5pvdilwxik5anhn6lmy2jvjf2vx8p35zr5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -57007,12 +58099,12 @@
       melpaBuild {
         pname = "kapacitor";
         ename = "kapacitor";
-        version = "20180909.2142";
+        version = "20190414.1208";
         src = fetchFromGitHub {
           owner = "Manoj321";
           repo = "kapacitor-el";
-          rev = "b0e95f98b965f215be6ead14779949d5cf358ea5";
-          sha256 = "0ahi9ar32kwf7cinxp29c3yhjfibg509pvxv5s0gn31szdqq216p";
+          rev = "e3300d8b4017a2f66b0d929cb85bcc7ee2612072";
+          sha256 = "05vrfii2n2g2q60dzgw23ck6gxxm3d7fsabi4z0g3k9gc6wrsl5l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb/recipes/kapacitor";
@@ -57203,6 +58295,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    key-quiz = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "key-quiz";
+        ename = "key-quiz";
+        version = "20190604.2138";
+        src = fetchFromGitHub {
+          owner = "federicotdn";
+          repo = "key-quiz";
+          rev = "8cab861e28dd2c956acdba2632f78a58a85b7c70";
+          sha256 = "01f0jyz2v1aiy79jhdnaw3n1a0dmj8p9z6zgz28xbap44zyh3v1b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e87df606bf768e3a731234c444077a11601ecc4a/recipes/key-quiz";
+          sha256 = "0zcs4nm9jis60ghm0xi84yc945xm45n0q1xp8ic1ix48wf7jq7a0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/key-quiz";
+          license = lib.licenses.free;
+        };
+      }) {};
     key-seq = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , key-chord
@@ -57421,12 +58539,12 @@
       melpaBuild {
         pname = "keystore-mode";
         ename = "keystore-mode";
-        version = "20190316.700";
+        version = "20190409.1246";
         src = fetchFromGitHub {
           owner = "peterpaul";
           repo = "keystore-mode";
-          rev = "65ffee8834cb171c53e917ae8c183db6f646f471";
-          sha256 = "1lzjqzbaq0wd9gims4mj8rga8wmj4kvig63cvnygd93f0sbbirkk";
+          rev = "43bd5926348298d077c7221f37902c990df3f951";
+          sha256 = "06cznkqkm04zz5lqfb514aqvsr2p13arzysixv0ss0bqpvdq7cv7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7870d808fc19096ed6ecde5e9297b28254466210/recipes/keystore-mode";
@@ -58011,6 +59129,7 @@
         };
       }) {};
     ksp-cfg-mode = callPackage ({ cl-lib ? null
+                                , emacs
                                 , fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -58018,19 +59137,19 @@
       melpaBuild {
         pname = "ksp-cfg-mode";
         ename = "ksp-cfg-mode";
-        version = "20180608.2247";
+        version = "20190414.1648";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "fda64705f605fb8fccee53a5040fe4865ca17d44";
-          sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x";
+          rev = "faec8bd8456c67276d065eb68c88a30efcef59ef";
+          sha256 = "192s6hz71i0d8bwxn2pdl9yggs2l5fd6jxlxmry8fpk04qg3lqrg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/ksp-cfg-mode";
           license = lib.licenses.free;
@@ -58074,12 +59193,12 @@
       melpaBuild {
         pname = "kubernetes";
         ename = "kubernetes";
-        version = "20190327.1744";
+        version = "20190604.1834";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "kubernetes-el";
-          rev = "5839c89b7187573346813bc3dd6b43b5acdda7cb";
-          sha256 = "0wmadjlrcnjv10cmxkmb02n3fvns7hghlk0zcpxjis2gfmng9px7";
+          rev = "95d5c934f2955388bdd2f568b8e5c706ce15c21b";
+          sha256 = "1kahnk2cy96zpxb35vj7f9zanb1nm79p3wxgq4cwgmi6h6gj0arq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -58866,12 +59985,12 @@
       melpaBuild {
         pname = "ledger-import";
         ename = "ledger-import";
-        version = "20190131.1205";
+        version = "20190501.2156";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "ledger-import";
-          rev = "2c199fcc8671c2ec82e62cea7716289426b7407c";
-          sha256 = "0szi5k05qja28nx0rnl3amh3qf2f470sycdjgmpazgqh4zpkngsp";
+          rev = "6911708e373e2cbdb3868df7711ef07925ed36bf";
+          sha256 = "15vz5fy5yr4m3b77nikqln3y5bihjdmrzgxbp56hz83dqkkcnc4l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a1e2a9546b8b40f5f880197cb8166a6a715451f/recipes/ledger-import";
@@ -58892,12 +60011,12 @@
       melpaBuild {
         pname = "ledger-mode";
         ename = "ledger-mode";
-        version = "20190317.912";
+        version = "20190605.1535";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "c59bbfcc3274d113dec68121786546979f33dad0";
-          sha256 = "0p7dp31jlia1qdz15lqqzaf8laa847qcsgn5p79nl82kbzkxvq13";
+          rev = "3fe6662d562c70e8440ba108b18b95b0e84928be";
+          sha256 = "0ah89dbssgp53y9sm9iwkwbdwh5kma3pazq2hz6f35hqmxfw3v3r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -58935,6 +60054,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    leetcode = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , graphql
+                            , lib
+                            , melpaBuild
+                            , request-deferred
+                            , spinner }:
+      melpaBuild {
+        pname = "leetcode";
+        ename = "leetcode";
+        version = "20190505.914";
+        src = fetchFromGitHub {
+          owner = "kaiwk";
+          repo = "leetcode.el";
+          rev = "7bfa00954a5fcaf05b753c656c0b4c35ed73daf2";
+          sha256 = "1z7k2sbx8lpwj61wqlj0037h457fgfbg697zfyakvbkvlw4aqlr6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f1f35b9b63f3f04dfca7c5fe62d3530b47006d8f/recipes/leetcode";
+          sha256 = "094klmrh2adj9fcpykswdbbxm714cfws1lqgz64b7gdf82m5nm8x";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs graphql request-deferred spinner ];
+        meta = {
+          homepage = "https://melpa.org/#/leetcode";
+          license = lib.licenses.free;
+        };
+      }) {};
     legalese = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -59279,12 +60428,12 @@
       melpaBuild {
         pname = "libgit";
         ename = "libgit";
-        version = "20190323.1055";
+        version = "20190419.523";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "libegit2";
-          rev = "f80d380156a1ba2a9caf7e964cb96acccde8b514";
-          sha256 = "0azq7ni5z2fpl43s63zalnf2n3y55dsq4dp1v2yhq9j6sm5ds1di";
+          rev = "d506a754e26ca42c028bf33315a4e227bbcba148";
+          sha256 = "0ajw02213a88gkcqafy8v8872q9b6g920dbjgfm4knndw4ywsrp6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/993a5abe3a9e8b160f0d68283eeca6af033abc79/recipes/libgit";
@@ -59330,12 +60479,12 @@
       melpaBuild {
         pname = "libmpdel";
         ename = "libmpdel";
-        version = "20190124.614";
+        version = "20190426.2228";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "libmpdel";
-          rev = "a0100e020347ccc319ec18c687353dc521c64328";
-          sha256 = "0vm4j5n2h74c0kyn61lx9fbxj39gvd22yh7a3grbcp1i94wkjm8x";
+          rev = "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe";
+          sha256 = "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
@@ -59408,16 +60557,16 @@
       melpaBuild {
         pname = "line-reminder";
         ename = "line-reminder";
-        version = "20190407.809";
+        version = "20190516.2225";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "line-reminder";
-          rev = "9de2c301f433453dc0ff06e7c78f580dd6f5314f";
-          sha256 = "1cza4bi1plw3r4j2bxkm4w57db9nxvcf3p8xfvicipsv556k934r";
+          rev = "9ba13659dd831e7c62230baadb079ecc370a8aa9";
+          sha256 = "0vibay4ia6jxjas7a2if20w72dpmb3k3pr4n6msxy3fzl8dz2qxx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/456f760f7f7d4151e18f08b2f1154c5880423b21/recipes/line-reminder";
-          sha256 = "0kvqilg5fnr3qb7nwjf4j5ydm1lp4m06ss81i0bq2c6bv74zfcf1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/line-reminder";
+          sha256 = "0cm9cv7ak1ibm68d2xrz26smh80g79dxjlwxj5qd9zc3yjyksdvi";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
@@ -59783,12 +60932,12 @@
       melpaBuild {
         pname = "lispy";
         ename = "lispy";
-        version = "20190404.822";
+        version = "20190528.206";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "18557185e2ed71502fd96ee7a176ddec7df2e626";
-          sha256 = "13vnaqv4r50bjlyppxapg8pp6mc4ql0c5g2xkmmfklqagy2lja65";
+          rev = "73fd06518e6a023c9d58562f3d8016f8862bb161";
+          sha256 = "0maxwmp3kxx9wlc9h4c1gl862q1a5vi284xddb7kdl74mjk2kdmr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -60170,6 +61319,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    live-preview = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "live-preview";
+        ename = "live-preview";
+        version = "20190415.1514";
+        src = fetchFromGitHub {
+          owner = "lassik";
+          repo = "emacs-live-preview";
+          rev = "0229cc4b352204d9e24a0f5a062f0212b5344c58";
+          sha256 = "13rhi83ahqklsr2jnmfdvs3rzrizgbw8hs2i6rf2wfq90srd1m39";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4f928dd7c043fba36a48f0bb31693f0ec67d3ec/recipes/live-preview";
+          sha256 = "17sayv5l3ihhs370c1qg6377rkph0ailkh1ara1xpj40ljjf158j";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/live-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
     live-py-mode = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -60178,12 +61353,12 @@
       melpaBuild {
         pname = "live-py-mode";
         ename = "live-py-mode";
-        version = "20190330.1041";
+        version = "20190601.1757";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "63140187ba2b68c2c55d91aa7a07b5c5d15422d9";
-          sha256 = "0arhhl684p0nhxhc53sbhcc1rmv3v107s5j0ymwnfa4rnyahz2ii";
+          rev = "cc7ca67d2d87dc14edcb624a4872188b333ed84c";
+          sha256 = "11mmq49l7a0538f5wxvx3phhq3glig4wz4ag3zicjc56sghsx8l8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -60385,12 +61560,12 @@
       melpaBuild {
         pname = "load-relative";
         ename = "load-relative";
-        version = "20170526.310";
+        version = "20190601.521";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-load-relative";
-          rev = "738896e3da491b35399178ed2c6bc92cc728d119";
-          sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73";
+          rev = "dbcd7cbcca6503ef93f4b8d19bf7a9efd7f6bf9b";
+          sha256 = "010f2mhvlzkxarw298850khqc6srzb01l2vay0jsp46dh3jfmdhf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
@@ -60734,6 +61909,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    lolcat = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "lolcat";
+        ename = "lolcat";
+        version = "20190527.445";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "lolcat.el";
+          rev = "4855e587a3b9681c077dac4b9f166dd860f439a4";
+          sha256 = "0nbrc3wjmmy70ggwmzagkh5j1my7x6y67fyqgddkdrbnw543gly0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/38e720f524b23b5742764186a695d143f983e179/recipes/lolcat";
+          sha256 = "044y0s1wiwjwfw58nhx5zvrli527nim3d81dix2h60d8qwx0566a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lolcat";
+          license = lib.licenses.free;
+        };
+      }) {};
     lolcode-mode = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -60922,12 +62123,12 @@
       melpaBuild {
         pname = "lsp-haskell";
         ename = "lsp-haskell";
-        version = "20190328.2248";
+        version = "20190602.125";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "33e3ac438338b0a78971cd26aa919482d290c51b";
-          sha256 = "1ihc6djxsdrd0q9f79bs0qwxxhw3bnw1kxw2rq92drfnypqbiqcq";
+          rev = "8f2dbb6e827b1adce6360c56f795f29ecff1d7f6";
+          sha256 = "00j6d5rpsi7h5jz54zpjmbpg38fda4xy67xc4x67r834493ldzlq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -60982,12 +62183,12 @@
       melpaBuild {
         pname = "lsp-java";
         ename = "lsp-java";
-        version = "20190405.1133";
+        version = "20190604.902";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "311a0747e6d54acf1b9b14d5c1f967e6fcbb97c5";
-          sha256 = "0p0j2rb44f4v3mnhs3633xwprxa3ya6i7bzdvrz8r89ccrv3zmig";
+          rev = "15024929dd2ea6aa6d302eaf5e5b31cb4b7b0458";
+          sha256 = "0ps8hvjy7kv1bbnpbmymn4aid27965jjl5s324vi5qav08qidpq5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java";
@@ -61045,29 +62246,65 @@
                             , fetchurl
                             , ht
                             , lib
+                            , markdown-mode
                             , melpaBuild
                             , spinner }:
       melpaBuild {
         pname = "lsp-mode";
         ename = "lsp-mode";
-        version = "20190407.1213";
+        version = "20190606.48";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "ab418329df23590212ecfee313791c6c551223e1";
-          sha256 = "0pwfpcdn2ijvpsm3i2kgk6r8m9f297xsvlz5x1fa57b4002j8vzl";
+          rev = "25ef48875326c073e2d46d0a4b38617331fc3898";
+          sha256 = "1rx10z3id8ln8jmq2akp0jwjbzijf94qkwwwz1ga7mp5p2cz5xar";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
           sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9";
           name = "recipe";
         };
-        packageRequires = [ dash dash-functional emacs f ht spinner ];
+        packageRequires = [
+          dash
+          dash-functional
+          emacs
+          f
+          ht
+          markdown-mode
+          spinner
+        ];
         meta = {
           homepage = "https://melpa.org/#/lsp-mode";
           license = lib.licenses.free;
         };
       }) {};
+    lsp-origami = callPackage ({ fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , lsp-mode
+                               , melpaBuild
+                               , origami }:
+      melpaBuild {
+        pname = "lsp-origami";
+        ename = "lsp-origami";
+        version = "20190331.1023";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-origami";
+          rev = "a7fb34006bb857577d0ded48a961a86a0d71b3b5";
+          sha256 = "1pgzvqwfygh6rb0i2q743bd1hjsc0g2fmm3i6w0nswhxxav59ak3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/68b7cf8ce2eb256db9affb2126e895aa5ad1db15/recipes/lsp-origami";
+          sha256 = "0pzccbglwwv73x3iyfidiwhwfs1dd9krvyjyqkbl5w734z3aaqqk";
+          name = "recipe";
+        };
+        packageRequires = [ lsp-mode origami ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-origami";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-p4 = callPackage ({ fetchFromGitHub
                           , fetchurl
                           , lib
@@ -61094,6 +62331,62 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-pyre = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-pyre";
+        ename = "lsp-pyre";
+        version = "20190405.2035";
+        src = fetchFromGitHub {
+          owner = "jra3";
+          repo = "lsp-pyre";
+          rev = "e177b8f5efd1a955b5753aeb5d1894e6d21be35a";
+          sha256 = "0g9vijpq7n38b7rvgbshh4s46m1387d7k2lcvy4md17sak5ivxrg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b243c6ab0a441531e02dc8fdd88c023ba505d25/recipes/lsp-pyre";
+          sha256 = "1v8yx062cv5wmpg3lalah5cy8hvhslvyrd4f3185gmc0ynz71fpi";
+          name = "recipe";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-pyre";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-python-ms = callPackage ({ cl-lib ? null
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , json ? null
+                                 , lib
+                                 , lsp-mode
+                                 , melpaBuild
+                                 , python ? null }:
+      melpaBuild {
+        pname = "lsp-python-ms";
+        ename = "lsp-python-ms";
+        version = "20190421.1632";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-python-ms";
+          rev = "427891baef868c22ae1c5702c657c41d23655e91";
+          sha256 = "1mx913q5mgrfifd6bskjg5a66mn9474fwbf73d95db1s3ydfpimy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dd67aefa5a6df2d1388a7516e529e388615c8fe0/recipes/lsp-python-ms";
+          sha256 = "1aifydzz7jv3bf9qfxj37isq40wirfgvd9h40cb5c9wq4v44j8ps";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs json lsp-mode python ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-python-ms";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-scala = callPackage ({ emacs
                              , fetchFromGitHub
                              , fetchurl
@@ -61104,12 +62397,12 @@
       melpaBuild {
         pname = "lsp-scala";
         ename = "lsp-scala";
-        version = "20190116.1332";
+        version = "20190604.537";
         src = fetchFromGitHub {
           owner = "rossabaker";
           repo = "lsp-scala";
-          rev = "b68820cc7aaa9c4f818c4f7999188c20655c3be3";
-          sha256 = "1zq2kjsdf88wi4i2my14hw8am9q5dpyfryak1mvp2hpy661hmy7k";
+          rev = "6d15f76f8f5267cbed6d64d583a9fc551d889f64";
+          sha256 = "115amdnvq0righ0ifqr64hxac05jhgpy31cx0bdmd2za9s5qpgg0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd494da0c0c2e2e58afc26d8e79aeeea41c6ee09/recipes/lsp-scala";
@@ -61163,12 +62456,12 @@
       melpaBuild {
         pname = "lsp-treemacs";
         ename = "lsp-treemacs";
-        version = "20190328.2351";
+        version = "20190529.1226";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-treemacs";
-          rev = "5b3f0d3242b272cc31b7620766ff7a7a3d997f20";
-          sha256 = "1q7qn1m4qy70qghiq3ac3ri69hq3g0kfxp4sf3bzssh9v2yvxwcl";
+          rev = "1eb072aef80de74063e8da513e4a09abc304476c";
+          sha256 = "0c6xik4ywybg6vkhbhhwkh332wml400w581cg432ba3vlrk9rlhs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9996b16461fe7c16b315ef30aa6b75c724f8fef/recipes/lsp-treemacs";
@@ -61193,12 +62486,12 @@
       melpaBuild {
         pname = "lsp-ui";
         ename = "lsp-ui";
-        version = "20190328.2057";
+        version = "20190523.821";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ui";
-          rev = "d4088c7471bdb3ba95f2fb0b60277ad95b34a25f";
-          sha256 = "0xmfxv68s0m0pwlbs05vx3y94pdwfyswqpzzji714nqzx1ixfqyb";
+          rev = "3ccc3e3386732c3ee22c151e6b5215a0e4c99173";
+          sha256 = "1k51lwrd3qy1d0afszg1i041cm8a3pz4qqdj7561sncy8m0szrwk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7c78c9b07ede9949d14df74b188d4c1a3365196/recipes/lsp-ui";
@@ -61689,12 +62982,12 @@
       melpaBuild {
         pname = "magik-mode";
         ename = "magik-mode";
-        version = "20190305.1229";
+        version = "20190527.656";
         src = fetchFromGitHub {
           owner = "roadrunner1776";
           repo = "magik";
-          rev = "743c5160ff2993534014862538961515047ed357";
-          sha256 = "0sggdkp01ryknmfv828lqc5lkpks2vlqrqc0hblynyxs8w0azmf8";
+          rev = "cbe399fb9df03f93e9c426dcbd5de4f10c0694b4";
+          sha256 = "1lv7v3ahqb9flb8kwn09z6gl6fjn4gikcn5bjkd94p15kbdl5lc0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/291cce8e8e3475348b446ba38833eb1e37d4db65/recipes/magik-mode";
@@ -61720,16 +63013,16 @@
       melpaBuild {
         pname = "magit";
         ename = "magit";
-        version = "20190405.1004";
+        version = "20190605.717";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "e19833d9d639221ed78f310b800b464db5600a3f";
-          sha256 = "05fmzpqzsfa22ghmbgkirii64i5473463nniik5ck51j5w3z1vd7";
+          rev = "0fb3f3e74d331e29ce272586a61042744fabfe1f";
+          sha256 = "1xgndzw46ya5kan08fasqf0zanc7dax5mm03946hc7pypibp5a8z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
-          sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9f963950d69a944443d9b6a1658799f7860d0f93/recipes/magit";
+          sha256 = "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1";
           name = "recipe";
         };
         packageRequires = [ async dash emacs git-commit transient with-editor ];
@@ -61747,12 +63040,12 @@
       melpaBuild {
         pname = "magit-annex";
         ename = "magit-annex";
-        version = "20190217.2127";
+        version = "20190420.1941";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "2b6b51c2f295ffc724bac8e8fde9b161972f9cfe";
-          sha256 = "0v5saypcc5s6z1sa6hc3hmigzh7bnmp3247n2a9g259w21f7bcwa";
+          rev = "c8648ebe70898cd3d62599643ad191c3a9b9831a";
+          sha256 = "1kjxsmkhvwjcqbbmw9128qhnrnvvl8q0nfys5n358ckzyxf6a5ph";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -61765,6 +63058,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-diff-flycheck = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , flycheck
+                                       , lib
+                                       , magit
+                                       , melpaBuild
+                                       , seq }:
+      melpaBuild {
+        pname = "magit-diff-flycheck";
+        ename = "magit-diff-flycheck";
+        version = "20190523.2251";
+        src = fetchFromGitHub {
+          owner = "ragone";
+          repo = "magit-diff-flycheck";
+          rev = "ad58efa312d708f25661dfcc2a7f83a833cca328";
+          sha256 = "0h0bg8vm8rf4rppx2gpxjcklnjfnbxv0c5n8fia2a3f9qaz4m0as";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d28982425519157a6116c077fbc4be7cfa53be/recipes/magit-diff-flycheck";
+          sha256 = "1gnjvhxy48ah84cglq6653wgb07g0gry0672334ad3cwc5b45kdk";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck magit seq ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-diff-flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-filenotify = callPackage ({ emacs
                                     , fetchFromGitHub
                                     , fetchurl
@@ -61939,12 +63261,12 @@
       melpaBuild {
         pname = "magit-lfs";
         ename = "magit-lfs";
-        version = "20170312.1524";
+        version = "20190504.1209";
         src = fetchFromGitHub {
           owner = "Ailrun";
           repo = "magit-lfs";
-          rev = "9897c59109ce34755cbd35eff689680351c45fba";
-          sha256 = "05cy0pw5lcyzcqxycvwbw39l88405lc92x0w1lvhlbwwylpbhw2s";
+          rev = "eb5042d1c484acaae5d0787b29da5e010473bc5a";
+          sha256 = "1hpbnd0w05s0ihzpn37swhb1465h3lz3vnzzqy4w1gya5v94mcn7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/magit-lfs";
@@ -61957,6 +63279,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-libgit = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , libgit
+                                , magit
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "magit-libgit";
+        ename = "magit-libgit";
+        version = "20190419.845";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "68840e6da97fd35ac41c6f007c1c22dde62a7a6a";
+          sha256 = "17wx7bd6hvdi4pwpv9pzixffcyidyw3s0b9wpg3ipl3lkwyzngya";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0580362be495894c61b99b7efb4cfa435cc0dd72/recipes/magit-libgit";
+          sha256 = "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs libgit magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-libgit";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-org-todos = callPackage ({ emacs
                                    , fetchFromGitHub
                                    , fetchurl
@@ -62158,12 +63508,12 @@
       melpaBuild {
         pname = "magit-tbdiff";
         ename = "magit-tbdiff";
-        version = "20190219.2015";
+        version = "20190506.1936";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "48075990d10f7947191c24050e7012d99759f191";
-          sha256 = "10nbkc49d15z9xzlskbc8fv4zckscini4favj8m2ikgfxdyd35h1";
+          rev = "fcde2e718974acb2b8905b623e0eca74c58b6b0f";
+          sha256 = "0ks2fyiwxg4zqhplbysb9wv82nrd72ihqi911hf7m48a72w7assx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -62191,12 +63541,12 @@
       melpaBuild {
         pname = "magit-todos";
         ename = "magit-todos";
-        version = "20190114.650";
+        version = "20190508.57";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "14e5347c98f42166ad7061b8663d368bb0d4fba4";
-          sha256 = "1czaf38w0z1pkjwmlhxrln9nmd3zp1j7gmhaf82bw15d8xcl4kbh";
+          rev = "6d590872dab914908b539c54da2c68dc75491e93";
+          sha256 = "01z90l079j6pxnxsr4kwf0wr7hw4ssnrngxndv7lg2ra8i5a1qpv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
@@ -62249,12 +63599,12 @@
       melpaBuild {
         pname = "magithub";
         ename = "magithub";
-        version = "20190118.1347";
+        version = "20190512.1616";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "18e66c284af911f3e3178550384d050536db42ac";
-          sha256 = "00r2fp6zbs7321ixdbrh8fj3s6b1bg85hcc2jim6k8pdvssavz1x";
+          rev = "9fb9c653d0dad3da7ccff3ae321fa6e54c08f41b";
+          sha256 = "047dyiysdhf81qfcmmaxzixgxy35fjm9wyhwwv9630s5b83fh094";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e555b46f5de7591aa8e10a7cf67421e26a676db8/recipes/magithub";
@@ -63277,12 +64627,12 @@
       melpaBuild {
         pname = "math-symbol-lists";
         ename = "math-symbol-lists";
-        version = "20190102.1031";
+        version = "20190605.1358";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "math-symbol-lists";
-          rev = "e15ec26a010b4f38111bc150c51ecb1a319f6bdb";
-          sha256 = "11jk0xdlc8zk2way1d85n2khmydzzvpjhh8bbjbdsv8d1z3j9yfh";
+          rev = "dc7531cff0c845d5470a50c24d5d7309b2ced7eb";
+          sha256 = "094m21i9rns6m59cmhxcivxxafbg52w8f8na4y3v47aq67zmhhqm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
@@ -63645,12 +64995,12 @@
       melpaBuild {
         pname = "meghanada";
         ename = "meghanada";
-        version = "20190225.625";
+        version = "20190525.2248";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "7ea4885b79224c024f5cde4bb7d6b98c77b84eda";
-          sha256 = "0zigc6f02qdv8fj5wfpw56dw1glk3q204qxyipazsv6pm62v0y01";
+          rev = "24813cf364f1c857c2ee412d0a088f0ceff53842";
+          sha256 = "1ripap7is2amk3i2mavwiiv5mfsx9k3gxpy9nyaz58pzgvyjqplc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -63670,12 +65020,12 @@
       melpaBuild {
         pname = "melancholy-theme";
         ename = "melancholy-theme";
-        version = "20190406.1618";
+        version = "20190503.1920";
         src = fetchFromGitHub {
           owner = "techquila";
           repo = "melancholy-theme";
-          rev = "a5fb97b52c56c612474fec4ec45472fe13bd4c20";
-          sha256 = "0syx0h8930j58bky14wnrba8iafzi3hdsb11kvsb48vdqv2minrq";
+          rev = "37e7f9a83995d9a53cd4343843139660fa0ca59d";
+          sha256 = "0yjfmb1wcg2dvr76r58fg2a1s2g2zw3ijkjjaa6mpf0h4ymyx2s3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme";
@@ -63803,12 +65153,12 @@
       melpaBuild {
         pname = "mentor";
         ename = "mentor";
-        version = "20190407.1142";
+        version = "20190511.938";
         src = fetchFromGitHub {
           owner = "skangas";
           repo = "mentor";
-          rev = "467c531f0c40ca924b3bb971e264727f7332e681";
-          sha256 = "1hjfw59wlkkqff2r7m81hcin6px6sdw8bfh2mnz0cbfs1gw2y15i";
+          rev = "b5e441b7dc077d5532a3818b5441e52baefad839";
+          sha256 = "1xrhg1jwmzlcqdk2w92s7ghbma1pfzjc48akl3d2cixxz3ha2ca2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
@@ -63828,12 +65178,12 @@
       melpaBuild {
         pname = "merlin";
         ename = "merlin";
-        version = "20190323.230";
+        version = "20190531.249";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "merlin";
-          rev = "1ab2b90f4508855ac0caab51a6a5dad3e48cdb00";
-          sha256 = "0cn46b2im7k2j3p8r34pmqmdrxxwls14l21mjjfll2fc329s3shr";
+          rev = "800c793870c7ff3b00a6817ab16b03628c6495eb";
+          sha256 = "0yx92lybw685ay5qd8jpdxwfdjmhhbrpkpi94gysq9bmh0kqhixr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9338298a79b7f2d654df90b0f553aeed1428de13/recipes/merlin";
@@ -63873,6 +65223,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    mermaid-mode = callPackage ({ emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "mermaid-mode";
+        ename = "mermaid-mode";
+        version = "20190503.1026";
+        src = fetchFromGitHub {
+          owner = "abrochard";
+          repo = "mermaid-mode";
+          rev = "70545a46f114c4d2295ef86c5f5983bb8b2ae177";
+          sha256 = "1hc7ryz9jzpny6lr40fdpxj88ai5833ifsca3xzqh0agifv394xp";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8729575400003db47638b4c45c425608e15c333d/recipes/mermaid-mode";
+          sha256 = "1r9dv10p2bahygz1f151bp481289b184d80jbh575pdmlxkqd79f";
+          name = "recipe";
+        };
+        packageRequires = [ emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/mermaid-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     meson-mode = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
@@ -63931,12 +65308,12 @@
       melpaBuild {
         pname = "meta-presenter";
         ename = "meta-presenter";
-        version = "20190318.859";
+        version = "20190414.1020";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "meta-presenter";
-          rev = "3d8c762a7dd7ac39032a3601bd6a717f206e670d";
-          sha256 = "0r9zzmglmkkmxcqh0pdlg279mpd524k2rwn56kyvj5i3i8zw9rpl";
+          rev = "704a2e0f2a3e6bb72578e00eccb772dfcf0670fc";
+          sha256 = "1hka4c87zdgqjawlmsfd7wi6rbc03qfp996ydrj84kz8saq7gf89";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter";
@@ -64060,12 +65437,12 @@
       melpaBuild {
         pname = "mew";
         ename = "mew";
-        version = "20190307.1729";
+        version = "20190414.2038";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "0dacffb71bd0c8aa7e104658833c1d50776eb3a4";
-          sha256 = "00qq5aysjxv3a1b0x6k5idxvam9g5jzbrmiy25x32wih6a6abg33";
+          rev = "70d6da044a4f6ac8e40e489d4963b8a3d530b8a9";
+          sha256 = "0j569nski5f3z26qa1scpzbsx3xdvmw9sxhm1m9wj3ac5kvgk9hn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -64085,12 +65462,12 @@
       melpaBuild {
         pname = "mexican-holidays";
         ename = "mexican-holidays";
-        version = "20160109.1342";
+        version = "20190505.1945";
         src = fetchFromGitHub {
           owner = "sggutier";
           repo = "mexican-holidays";
-          rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5";
-          sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
+          rev = "663633be1d693f6081d7d000e05d15ddbf71aa10";
+          sha256 = "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/mexican-holidays";
@@ -64137,12 +65514,12 @@
       melpaBuild {
         pname = "mhc";
         ename = "mhc";
-        version = "20190116.2146";
+        version = "20190505.2333";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570";
-          sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2";
+          rev = "88b5f938e57c28e9e2db202770f952fc0ecba945";
+          sha256 = "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -64907,12 +66284,12 @@
       melpaBuild {
         pname = "mocha-snippets";
         ename = "mocha-snippets";
-        version = "20170103.2127";
+        version = "20190417.1231";
         src = fetchFromGitHub {
           owner = "cowboyd";
           repo = "mocha-snippets.el";
-          rev = "e054137bd78f0d236e983874da1f345d30a71816";
-          sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
+          rev = "361a3809f755577406e109b9e44d473dfa7c08e0";
+          sha256 = "0xcybq0cwd0c33bi1jf7h098a4anc4gkj3m1c97gc8mz9x4fjksy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
@@ -64987,12 +66364,12 @@
       melpaBuild {
         pname = "mode-icons";
         ename = "mode-icons";
-        version = "20180910.804";
+        version = "20190520.2247";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "26138d825cba7e6bd882707a909505d5536acb9b";
-          sha256 = "1z62g5dhv36x5an89za8h5vdab0ss7af13p42kjnjrs54f50pv9f";
+          rev = "33aad72386952308c69bb98956b6735b23628501";
+          sha256 = "17xbqwdk5kl3z9yr684xmq3d7gapwpzlia4yxcx1d3dz80wprmhm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -65238,12 +66615,12 @@
       melpaBuild {
         pname = "monky";
         ename = "monky";
-        version = "20190402.825";
+        version = "20190502.717";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "bb2fbb43c9b1894160ca47560338a0be30cc0233";
-          sha256 = "0ai8gcrd66jrhxmmwysfaqxpl0347qd9xdqys82284528hd89ms9";
+          rev = "df63632ad58704f6ee85dfcb275bbcc5e1edfbae";
+          sha256 = "09fi8fxyl50fr8wdd61wacfn3xishcrsff3dag99qdbvbxakp46m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -65307,6 +66684,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    monokai-pro-theme = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "monokai-pro-theme";
+        ename = "monokai-pro-theme";
+        version = "20190425.1603";
+        src = fetchFromGitHub {
+          owner = "belak";
+          repo = "emacs-monokai-pro-theme";
+          rev = "747556c0cb38993c83ea8b6665869f42249d885a";
+          sha256 = "1xfc3v1bwxpn3j42h6b1vy6knjrlmskq95c9vgdlia9ffz5pg7r3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5fbd76a40d84dd2d91a1022f59c15e6db6b90a/recipes/monokai-pro-theme";
+          sha256 = "05ya47cmry2fprssjx3adwij9zd218rcnikpw9hximwlklmzjvb3";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/monokai-pro-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     monokai-theme = callPackage ({ fetchFromGitHub
                                  , fetchurl
                                  , lib
@@ -65383,6 +66785,58 @@
           license = lib.licenses.free;
         };
       }) {};
+    mood-line = callPackage ({ emacs
+                             , fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "mood-line";
+        ename = "mood-line";
+        version = "20190606.247";
+        src = fetchFromGitLab {
+          owner = "jessieh";
+          repo = "mood-line";
+          rev = "670f2c0c39e72fed57be2bd65325a65bca166396";
+          sha256 = "18jwca84c72jahmx7lwilnihrlw6s6ni5d7qkj8n6q7ibka3cffv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b10524f105943648ecf52f007f363b7b5534865e/recipes/mood-line";
+          sha256 = "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mood-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mood-one-theme = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "mood-one-theme";
+        ename = "mood-one-theme";
+        version = "20190422.1424";
+        src = fetchFromGitLab {
+          owner = "jessieh";
+          repo = "mood-one-theme";
+          rev = "bd41e991e2280102d538eccc508d6a4bb6a651ca";
+          sha256 = "0h90z0l9968mpi7qbwjjp5jq41kxjfjcr2ydfadsry5zj1pzk95i";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/44fbe8c54e4052e6c38849a12425db8f7c04fcc1/recipes/mood-one-theme";
+          sha256 = "1ar3vsc0d838m2k54f4v8a4mc0g21qa9rmgr2wb763vb7vpcznmi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mood-one-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     moody = callPackage ({ emacs
                          , fetchFromGitHub
                          , fetchurl
@@ -65626,12 +67080,12 @@
       melpaBuild {
         pname = "move-dup";
         ename = "move-dup";
-        version = "20180531.537";
+        version = "20190408.546";
         src = fetchFromGitHub {
           owner = "wyuenho";
           repo = "move-dup";
-          rev = "24e5b6d7222cbe2437c602f1af37d5807569961a";
-          sha256 = "0i78cv3xdchzak8xxm7xm1fw4z6ww3v402cl2rwyg4363fx00f7y";
+          rev = "19f1c075d939084279b190c38412b4cfda96840d";
+          sha256 = "0rb9x00dygf0v5xk6gljdn0lvkgzyl129b5i4jpxz0ylccckd0xn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
@@ -65885,12 +67339,12 @@
       melpaBuild {
         pname = "mpdel";
         ename = "mpdel";
-        version = "20190124.621";
+        version = "20190428.218";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "mpdel";
-          rev = "ad63914b95b5655b873341a778b98896d8de5ad8";
-          sha256 = "1znv7mbdjhz6vggzyj7ys0014gsvqd16b0hgvngbhjdrk8cm5a5q";
+          rev = "a2da2f2fe2357641909514da788f7c6cbe5801f4";
+          sha256 = "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
@@ -66021,12 +67475,12 @@
       melpaBuild {
         pname = "ms-python";
         ename = "ms-python";
-        version = "20190318.1929";
+        version = "20190412.2216";
         src = fetchFromGitHub {
           owner = "xhcoding";
           repo = "ms-python";
-          rev = "5412bb664b5c8d7fca1a98ccb50ffc5a2592a75c";
-          sha256 = "1wp1vhll9wsr5wpq6d2gjzc9nwvn6n61x80kmprr7m1mr6zav9bk";
+          rev = "d95ac8f1633764cdb4bb43bf44c2eb6b225f9f93";
+          sha256 = "0z1i556y51fhy2c6n6zdmwzbl7czp99v1szaxhb53z96s0d4nqmc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6373142d80e84db8dec47abd0cdc562352b16681/recipes/ms-python";
@@ -66050,12 +67504,12 @@
       melpaBuild {
         pname = "msvc";
         ename = "msvc";
-        version = "20171225.738";
+        version = "20190426.345";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
-          sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
+          rev = "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06";
+          sha256 = "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -66120,6 +67574,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    mu2tex = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "mu2tex";
+        ename = "mu2tex";
+        version = "20190519.2203";
+        src = fetchFromGitHub {
+          owner = "cdominik";
+          repo = "mu2tex";
+          rev = "bfd1d72d52139e58d8a74a72a680773f3403bfd1";
+          sha256 = "1f1yqlg9iynkq4mmwgr87fv02d5bcza3nhdbid4w6jlgqyxzwvi6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e55964077f23a9d3ec4b53cb5add6d7166f385e0/recipes/mu2tex";
+          sha256 = "1h146xscvlkjgp4wqw11cb1z6gjr1s0ysamcz4ii5gfv82rrjgyc";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mu2tex";
+          license = lib.licenses.free;
+        };
+      }) {};
     mu4e-alert = callPackage ({ alert
                               , emacs
                               , fetchFromGitHub
@@ -66131,12 +67610,12 @@
       melpaBuild {
         pname = "mu4e-alert";
         ename = "mu4e-alert";
-        version = "20180304.2246";
+        version = "20190417.2258";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "96a293b28646f4620e257f24748becc4a06843cd";
-          sha256 = "01rgsd958shph01ialk0lp3snxqydvjkiik170jshfls1jric1di";
+          rev = "91f0657c5b245a9de57aa38391221fb5d141d9bd";
+          sha256 = "0qr5ww2xj8dibglh175qcq4bdgzs8lylv28hkbijykjshr3pkzn9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -66184,12 +67663,12 @@
       melpaBuild {
         pname = "mu4e-jump-to-list";
         ename = "mu4e-jump-to-list";
-        version = "20190129.1548";
+        version = "20190419.742";
         src = fetchFromGitLab {
           owner = "wavexx";
           repo = "mu4e-jump-to-list.el";
-          rev = "b63360eab8975acce04e803a5919abbe2daf863c";
-          sha256 = "1f7vxkv60smi2zjcg3bl8l7wjhrc35980wprmiy8568lvin6afbh";
+          rev = "358bba003543b49ffa266e503e54aebd0ebe614b";
+          sha256 = "00y9nap61q1z2cdql4k9g7fgi2gdgd9iy5s5lzrd9a4agbx6r7sv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-jump-to-list";
@@ -66228,6 +67707,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    mu4e-overview = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "mu4e-overview";
+        ename = "mu4e-overview";
+        version = "20190420.2312";
+        src = fetchFromGitHub {
+          owner = "mkcms";
+          repo = "mu4e-overview";
+          rev = "eb2d1e39c77c4725a8ee36dc68917aaf7b717b46";
+          sha256 = "08mchv8q8q3mnpm69vc888jlv4iik4vlkxqpmkrsgimq1gyb80pj";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec240f0f9bc43c5abca557607b0b89a24696744e/recipes/mu4e-overview";
+          sha256 = "076lpfj6zrg2ivgbslg9whm4mci278kg45a3km7iadilwipiaxsk";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mu4e-overview";
+          license = lib.licenses.free;
+        };
+      }) {};
     mu4e-query-fragments = callPackage ({ emacs
                                         , fetchFromGitLab
                                         , fetchurl
@@ -66397,12 +67902,12 @@
       melpaBuild {
         pname = "multi-run";
         ename = "multi-run";
-        version = "20190401.1458";
+        version = "20190507.1649";
         src = fetchFromGitHub {
           owner = "sagarjha";
           repo = "multi-run";
-          rev = "74905979f35e06fff4046cd26542bcb1e4f08cb1";
-          sha256 = "16ifp19qh5jy6vvqw2cyyym9sd810n2gdhpjl8vws2svnxrh1mba";
+          rev = "c6256b0cc2876c29faf381d8324b31b911045a27";
+          sha256 = "07nd7lwrnz9j54hq33c8ii1pipd472qfsdifg6fid7kca0rychif";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run";
@@ -66957,8 +68462,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    myterminal-controls = callPackage ({ cl-lib ? null
-                                       , emacs
+    myterminal-controls = callPackage ({ emacs
                                        , fetchFromGitHub
                                        , fetchurl
                                        , lib
@@ -66966,19 +68470,19 @@
       melpaBuild {
         pname = "myterminal-controls";
         ename = "myterminal-controls";
-        version = "20190331.2104";
+        version = "20190425.2121";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "myterminal-controls";
-          rev = "df144b269bc274162602e50c692be20ac9b90547";
-          sha256 = "02bd47rx2ykz5hhrf1szcqz7s9r5fxz7n3hnwlqap2r6xcv6cpvk";
+          rev = "733cdd7ab4f172b6dca09720fc5ae7dbc248c822";
+          sha256 = "1z89d3dx77c4v1zz4ngn689ay6m2x04jznnbc6bdqsaanz9znwlz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/myterminal-controls";
           license = lib.licenses.free;
@@ -67152,12 +68656,12 @@
       melpaBuild {
         pname = "nameless";
         ename = "nameless";
-        version = "20180215.1421";
+        version = "20190429.502";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "Nameless";
-          rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0";
-          sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0";
+          rev = "a3a1ce3ec0c5724bcbfe553d831bd4f6b3fe863a";
+          sha256 = "0pxfn81bc8smik0qksfjbrdjkzy0cbjzbc3ik47zl2i9blmx5krv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -67409,12 +68913,12 @@
       melpaBuild {
         pname = "nasm-mode";
         ename = "nasm-mode";
-        version = "20180711.1209";
+        version = "20190409.2042";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "nasm-mode";
-          rev = "1d4871ef184fc5da792bccbae1ea189f876706fc";
-          sha256 = "1pyawg7axx6rzcal3v0cya2jpdnsndd4af8vy60kjpwxa1sq7h2m";
+          rev = "65ca6546fc395711fac5b3b4299e76c2303d43a8";
+          sha256 = "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode";
@@ -67925,12 +69429,12 @@
       melpaBuild {
         pname = "ng2-mode";
         ename = "ng2-mode";
-        version = "20181211.1610";
+        version = "20190524.1212";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "aea614669669b40b67484d1c7dc50bd0a3efc011";
-          sha256 = "19cmv9lxkmjfi6qiblwmy4r144hfk668l4pgbcvgs72lmrg26ik4";
+          rev = "52fdfe27247548b46f6171eebaf887a90dd67463";
+          sha256 = "1g8za385clky1waba4ggi5bl2q4h26gz00lkzghn3zvxg5nbh47d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -68085,12 +69589,12 @@
       melpaBuild {
         pname = "nim-mode";
         ename = "nim-mode";
-        version = "20181219.923";
+        version = "20190503.327";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "a508b4b22497194bc36ffff3744c49977ecd96dc";
-          sha256 = "1p7q3vw8xhqgy6d5nnn23kjc66r53z7hxlbz35nr0jcz5ysnrk65";
+          rev = "f5143f7861c686b8ae13371084eef2d3be3d687e";
+          sha256 = "0ndb9i6h425bniy8fynisdzvp4bjw61kxv9hlffck1hkb1sc94rm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -68111,12 +69615,12 @@
       melpaBuild {
         pname = "nimbus-theme";
         ename = "nimbus-theme";
-        version = "20190405.1111";
+        version = "20190513.356";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "5d957b3e8939cebd008b113c8c4d581a66aba36c";
-          sha256 = "0msdb2pyr51430crcnjvsfajd9j4cbk1l09f5r8z3nqadp5df6cj";
+          rev = "ebf4b464912093f6554ab47d9e99b5f1bd537e2f";
+          sha256 = "1al9l85mn0jz1l1sp4ws1xgmmzml8yfr60na3azss6fhhgrvc9dg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -68182,6 +69686,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    nix-haskell-mode = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , haskell-mode
+                                    , lib
+                                    , melpaBuild
+                                    , nix-mode }:
+      melpaBuild {
+        pname = "nix-haskell-mode";
+        ename = "nix-haskell-mode";
+        version = "20190525.1350";
+        src = fetchFromGitHub {
+          owner = "matthewbauer";
+          repo = "nix-haskell-mode";
+          rev = "bb132b3c83552370e52bae57a126427cbc53cd09";
+          sha256 = "0fiqs2hix38g2cr3rrzqj37x1qp4pw85lyqqrl9775iliyr1np2d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aeb879e2e8b017d3e1ccdc8d19f17d09b2ad5f1b/recipes/nix-haskell-mode";
+          sha256 = "1rygqmq01p27gbda6hgnzisng7xqf63x462a3x31ym67ivxsyqz3";
+          name = "recipe";
+        };
+        packageRequires = [ emacs haskell-mode nix-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/nix-haskell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     nix-mode = callPackage ({ emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -68430,12 +69962,12 @@
       melpaBuild {
         pname = "no-littering";
         ename = "no-littering";
-        version = "20190224.1309";
+        version = "20190409.454";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "974f105ea17729aa77a5bf1b4d70cb6e09b4cd6a";
-          sha256 = "08bgcj8n72zcyzx1qlg4pksnp6ppnzw51a57fw677bri4awny6pi";
+          rev = "99ae007ead688689b5b25a9482f98ec67663bb61";
+          sha256 = "0sg4qh9a6k1m24qamsf7ldpghjcawbdgh114gy08jnw478nf05kv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -68715,12 +70247,12 @@
       melpaBuild {
         pname = "nord-theme";
         ename = "nord-theme";
-        version = "20180913.1049";
+        version = "20190508.2352";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "c4e0b5548e2f3a149658617b33813cb115bdecfe";
-          sha256 = "0am2gpk63b4cjlpdy1z2mrhq09q1hi54jqpmh2rvdvijsvp6335q";
+          rev = "9ed7b9c2d1bb68ae86d06f97d215d2883e4ff0d2";
+          sha256 = "1i5z50xdn1qbfvy394j35d5bahsay56ngj2nxl4vlf88pdh0w0a8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -68815,11 +70347,11 @@
       melpaBuild {
         pname = "notmuch";
         ename = "notmuch";
-        version = "20190331.920";
+        version = "20190525.902";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "8e584392dce53d322b9403306991944c5578b1f0";
-          sha256 = "1yi7f2fz3bl9x2n05iv6vsdvahyyxn6520wp7hs73cq75wqc174r";
+          rev = "9300defd64acf68b8e6fa6fbd89b8050168bb63d";
+          sha256 = "09myljmmrcr4f6a93zwi8k39nndw2fmpj3g2jk2bl3ddql8x0gvl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
@@ -68894,12 +70426,12 @@
       melpaBuild {
         pname = "nova-theme";
         ename = "nova-theme";
-        version = "20190220.1638";
+        version = "20190520.932";
         src = fetchFromGitHub {
           owner = "muirmanders";
           repo = "emacs-nova-theme";
-          rev = "b37c4cf078a811f40e30dbb790fe26845d601cd9";
-          sha256 = "1wxl6b14429kqvrm6mb2zmcxixcz7l4k8p5y408jr0yjdw3rlpki";
+          rev = "7f7d6568f9d0d49600b03b74ad0f8ae3121fab8c";
+          sha256 = "1jvrcdknirr4f85r75waajkp00bm51573a3vbydsvlkjm27698hk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme";
@@ -69295,12 +70827,12 @@
       melpaBuild {
         pname = "nvm";
         ename = "nvm";
-        version = "20171217.836";
+        version = "20190601.113";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "nvm.el";
-          rev = "bc0a33257ec16e9f575bb6914b5949199897ada9";
-          sha256 = "07fb6xxnij3nyhvf1yfv58zglawijfr0apmgx22qgaray53rp3nw";
+          rev = "4aeb672d543ce2372dcca289719092aa4c38a6cd";
+          sha256 = "0phillz5dxpvhsi9rlah4988ksx2rcgagfw5iqf5lmfn7kp4604p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
@@ -69371,12 +70903,12 @@
       melpaBuild {
         pname = "nz-holidays";
         ename = "nz-holidays";
-        version = "20190307.1437";
+        version = "20190415.3";
         src = fetchFromGitHub {
           owner = "techquila";
           repo = "nz-holidays";
-          rev = "b609dbb02e6824600b43d3976c8a428347c7df93";
-          sha256 = "10z563jmgwz22jv720rssc3irbl9624icfp059pp0qirnlg2ibx0";
+          rev = "afc875cf40789fa45a4a811685b0a7c4f239392f";
+          sha256 = "1bk00pv7ylbrmf42papp6z2bhnp5fbnd4wy3gdzd18j7f2g0196v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfbe628247fc73d9a0963b7e9b92b07854817c9/recipes/nz-holidays";
@@ -69449,12 +70981,12 @@
       melpaBuild {
         pname = "ob-ammonite";
         ename = "ob-ammonite";
-        version = "20190218.2351";
+        version = "20190604.651";
         src = fetchFromGitHub {
           owner = "zwild";
           repo = "ob-ammonite";
-          rev = "c9832401f0f782aa5ca73c289c5aaa93076d77a6";
-          sha256 = "1igy3c239gaxcby6ap2hhfk0kdh3g1mkfx8hh5f2c46ncv4zrhf0";
+          rev = "e9d431acc014fb064d77fab0201c626126e7922c";
+          sha256 = "1cmpczl9p8ig1ql85kqhshzd64rc8xjpq0qgx0jq9yk4syaayk4h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/508358506a6994baf120be2acba86762f5727c6c/recipes/ob-ammonite";
@@ -69605,12 +71137,12 @@
       melpaBuild {
         pname = "ob-cfengine3";
         ename = "ob-cfengine3";
-        version = "20190329.1503";
+        version = "20190520.1229";
         src = fetchFromGitHub {
           owner = "nickanderson";
           repo = "ob-cfengine3";
-          rev = "96e74940351894512dca89cff473c46e74458587";
-          sha256 = "04kdg0dwbzdr4pr7y55iiax9ba0y0is8prgn98y9gj9d383r2mif";
+          rev = "e95f01b34011ff0ab94dedae2fb68efef236985b";
+          sha256 = "0c7ylvisizafza118dswvwyzmr85r0q9lsf1skvhsgvc53gvjf1b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
@@ -70131,12 +71663,12 @@
       melpaBuild {
         pname = "ob-ml-marklogic";
         ename = "ob-ml-marklogic";
-        version = "20190311.2023";
+        version = "20190312.614";
         src = fetchFromGitHub {
           owner = "ndw";
           repo = "ob-ml-marklogic";
-          rev = "adc16f6e4d056245fc8dc680383297e1c11d1e78";
-          sha256 = "1kwazr0kixr64jggrh7gs172qcprz7ifg1zdm4cf0947nsspjnc1";
+          rev = "d5660ad14f29e17cd26ae92eeb585b24030e9570";
+          sha256 = "1aqllsn965km3796q92w3a3z92hkpm5i0l6p4fm3va9xq7j79cyc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic";
@@ -70208,12 +71740,12 @@
       melpaBuild {
         pname = "ob-prolog";
         ename = "ob-prolog";
-        version = "20180720.344";
+        version = "20190410.1430";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "ob-prolog";
-          rev = "85ada8fc1f523167f137746c82d823a194160141";
-          sha256 = "1fa3hn9l9av7z6g4az8cfr2157g5cdryzp8nrmjr8w9386p13m4l";
+          rev = "149abd3832fc5a6a1cb01a586a1622a8f25887dc";
+          sha256 = "033pqfm3hj2585ibmqjhf7s1imckf615s6zg38jsq21wxv5fx8nc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
@@ -70234,12 +71766,12 @@
       melpaBuild {
         pname = "ob-restclient";
         ename = "ob-restclient";
-        version = "20180904.9";
+        version = "20190519.445";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "00b2c5a6637ab6e504708612357ffb29b5416e4b";
-          sha256 = "03jsdczywys5df1ac7bmli31wkxvbsymd5k0s6iaz62kc454l3wj";
+          rev = "fab4559d07993ce554ab6b06b50f4b445b36716c";
+          sha256 = "11mr4dkh3v8ynr3k83ms61cyw9bqqcj5j4yi37q9qgaidc3dg2sp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d/recipes/ob-restclient";
@@ -70339,12 +71871,12 @@
       melpaBuild {
         pname = "ob-sql-mode";
         ename = "ob-sql-mode";
-        version = "20190212.1255";
+        version = "20190421.839";
         src = fetchFromGitHub {
           owner = "nikclayton";
           repo = "ob-sql-mode";
-          rev = "49dac3b64f9eaebe9d406e398f95a40b2993e6d0";
-          sha256 = "0js5ygc43qi83jzfcri2nv71ii4q7a9yc1m4q34iyn0zli70r4gh";
+          rev = "b31a016585324ad91f1742ff6205bcb76f3ece6e";
+          sha256 = "1k2cfxaq38wv8s2x1c52v0bw55c12n399614l0dx1aqy2wh1afgi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode";
@@ -70575,12 +72107,12 @@
       melpaBuild {
         pname = "objed";
         ename = "objed";
-        version = "20190407.1014";
+        version = "20190530.736";
         src = fetchFromGitHub {
           owner = "clemera";
           repo = "objed";
-          rev = "5aa473d7c276f1ed5956e51b7f7df4e35d0ec895";
-          sha256 = "00gmssf91gp76b5rl0glggfwpilld7hg7w2fy6binvgjbn8ncr46";
+          rev = "70cf23ee694651e9b6feada6e380318e519b649b";
+          sha256 = "080nlv4hdhmk791g6r15p04prgmhqyzdrphaiz5mj1zdws2yjhmb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4abc6d927a2bf238d23256adcc9f09a751c90374/recipes/objed";
@@ -70855,12 +72387,12 @@
       melpaBuild {
         pname = "oer-reveal";
         ename = "oer-reveal";
-        version = "20190407.1005";
+        version = "20190525.911";
         src = fetchFromGitLab {
           owner = "oer";
           repo = "oer-reveal";
-          rev = "a42da802360d3dd90711e353ea83ac4c74f8bbc7";
-          sha256 = "0yw9dnz33p8v6084fa2w3cvlcjpi5gi86aphpzfza42cxbc3wwss";
+          rev = "061ca951e33513da88ad9e99c56e1c99999bbcfd";
+          sha256 = "04bns9jqw4pjc6xf3rg7yl8ifi1ra4r9qdpg96fglaslhva5ib4j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5982e377cd4cc2e72bfe4650c473c9f6b71085e3/recipes/oer-reveal";
@@ -70950,32 +72482,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    olivetti = callPackage ({ emacs
-                            , fetchFromGitHub
-                            , fetchurl
-                            , lib
-                            , melpaBuild }:
-      melpaBuild {
-        pname = "olivetti";
-        ename = "olivetti";
-        version = "20190330.933";
-        src = fetchFromGitHub {
-          owner = "rnkn";
-          repo = "olivetti";
-          rev = "cb22f8ab14b7a7ad3b3650b0e36a1b61d1253950";
-          sha256 = "149zf7cbd8jzj4a4rpi2vbg0z90zqsdiizb1yy579phg3v2s4b69";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
-          sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
-          name = "recipe";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/olivetti";
-          license = lib.licenses.free;
-        };
-      }) {};
     om-mode = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -71181,12 +72687,12 @@
       melpaBuild {
         pname = "omnisharp";
         ename = "omnisharp";
-        version = "20190227.2222";
+        version = "20190526.531";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "be97227714bc14b625c5cbf6eaa9a2a74c940631";
-          sha256 = "1b3zpckbhpada02yq6lzag8b1ayaw4py4i3rvq2lz5qbjpchhv5k";
+          rev = "9c0bc9de44e71184e3b23cce62d70db43cf616e7";
+          sha256 = "1wx6k30f10hqbfzl31gi28w4j1mgviwl23ny6dq8mnh4pcgjijyq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -71297,12 +72803,12 @@
       melpaBuild {
         pname = "one-themes";
         ename = "one-themes";
-        version = "20181030.442";
+        version = "20190424.40";
         src = fetchFromGitHub {
           owner = "balajisivaraman";
           repo = "emacs-one-themes";
-          rev = "1b50f2f88fe5e207cbe6d68db710361e3bc4a9ce";
-          sha256 = "1jap6i7kavvwv7bis4x8s7a3ww4srsm3qb05r2vbchfgk7adw92m";
+          rev = "e62e4ebef7ef8ccb1e90781d613638d30cf24d7a";
+          sha256 = "13vjlgac3ikd5xr6cjqb3aaj8qr201lc3ndvwhj3k617474312jh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28/recipes/one-themes";
@@ -71898,12 +73404,12 @@
       melpaBuild {
         pname = "org-brain";
         ename = "org-brain";
-        version = "20190305.616";
+        version = "20190604.1318";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "62cf65d3586cfeecb6339adcacc0515a36bbcc63";
-          sha256 = "0vjq1nnk5qq0362ccp367sxj1qwz0ahmb4qkfcz92fkpzhxch2v9";
+          rev = "20720b84395d396ee466aaa7e338fda510cf0783";
+          sha256 = "0sgd6ghsdch7zxlgck5a8008420fa42x4dszxlhlq65gaw9jdn4z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -72029,12 +73535,12 @@
       melpaBuild {
         pname = "org-chef";
         ename = "org-chef";
-        version = "20190320.1617";
+        version = "20190528.510";
         src = fetchFromGitHub {
           owner = "Chobbes";
           repo = "org-chef";
-          rev = "22fc63ca946a3e684c4298e0482cec9acb1af0fb";
-          sha256 = "1fnlazvj2fhhiv33b5f43d5h32c4n1sz7kav6g5gnb90sb6qnzly";
+          rev = "e1ccda68d146349fae1a2072c932a4ff5078f495";
+          sha256 = "0qirp3pbp7knrv9m7g7z7qgpqx4pgfyd1b58gv4xjmqjw6p5kmi8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef";
@@ -72055,12 +73561,12 @@
       melpaBuild {
         pname = "org-cliplink";
         ename = "org-cliplink";
-        version = "20181022.539";
+        version = "20190518.712";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "7ab98f2b17a627e907b50c27737ec1a8ae8b0f3d";
-          sha256 = "0rwh5602d6hd0nvr3j50m2xz48a2kwknnn0f4aabshhb5x0ry5g8";
+          rev = "e03aa07fef350cfeb6374c669d1cd80eeb1a0f26";
+          sha256 = "05yrvz25c6d6j2631yc8rdw0vl247mbdj2jcl4z8imy9mj5bklx9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -72110,12 +73616,12 @@
       melpaBuild {
         pname = "org-clock-csv";
         ename = "org-clock-csv";
-        version = "20180313.1957";
+        version = "20190418.805";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "4a6e9e4895799afa0b994f4a908c1e3c2043451f";
-          sha256 = "1f7xvarimv82xwiw5cavnak7av0yi4afn94nhhp60pyfh8azls50";
+          rev = "e2fbaa1ad1a1be40fceecde603a600b292b76acc";
+          sha256 = "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -72269,11 +73775,11 @@
       melpaBuild {
         pname = "org-d20";
         ename = "org-d20";
-        version = "20190120.1417";
+        version = "20190415.1310";
         src = fetchgit {
           url = "https://git.spwhitton.name/org-d20";
-          rev = "0154efc1f20fca5c1c0bedd59920512d0f72b7a1";
-          sha256 = "0rapd9rwazpb1fpzp93b0may9qyhf6drx9vqqb1pvigav3j892hi";
+          rev = "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61";
+          sha256 = "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20";
@@ -72372,12 +73878,12 @@
       melpaBuild {
         pname = "org-download";
         ename = "org-download";
-        version = "20190404.605";
+        version = "20190604.640";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "055c92e56ac156dddd3185fd7d088d8b5a27e7d2";
-          sha256 = "1xfl6jyrw023filx0xj8gdmfkz7fx3r51l4gpxw9ca8b88yljxlf";
+          rev = "ac72bf8fce3e855da60687027b6b8601cf1de480";
+          sha256 = "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -72836,12 +74342,12 @@
       melpaBuild {
         pname = "org-jira";
         ename = "org-jira";
-        version = "20181223.2159";
+        version = "20190502.637";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "4b67f6cc2460f64df7b50983d018f9e29db48b1a";
-          sha256 = "13hwyz5l9d07w0wyjym9vd9x2ndn906r6c5ir2qkji9rvlp6drnl";
+          rev = "883501bf57ee99d9add9c6eac47c79d372c0f61e";
+          sha256 = "0vfkr9cppagqvacl8cwpkzp62igf9rwzs5nwc2rk3g014wylp6s6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0a2fae6eecb6b4b36fe97ad99691e2c5456586f/recipes/org-jira";
@@ -72862,12 +74368,12 @@
       melpaBuild {
         pname = "org-journal";
         ename = "org-journal";
-        version = "20190329.1315";
+        version = "20190517.743";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "bca2c39c692f7c58dbbe03698748187f87822043";
-          sha256 = "1zlbi1d4kny0sf9g4drqk1q4zdm91l2xmlvzz360nwm8ha88nx29";
+          rev = "529993646e2c399dd169ce11c0e37f35d2c7e39d";
+          sha256 = "0bzbhsicfgnfn1kzaqpwhby6yvayr253n5gx2z8ccc8v6qqdvxdh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -72917,12 +74423,12 @@
       melpaBuild {
         pname = "org-kanban";
         ename = "org-kanban";
-        version = "20190323.944";
+        version = "20190527.2207";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "03387a779167c4acbc04d4970cd33c52a2ca0bcd";
-          sha256 = "0arjx1a7skdlmagyy0bbxwc134dn951y99yv4jg6l64j1f31y0yg";
+          rev = "dcf5e8c0a2d82bc4101c03ba21a2d38b406ea00b";
+          sha256 = "02n5753kqvb6ankqrynrlalik5r9g367rg4yzmf8mhx52x1h5va4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
@@ -73108,12 +74614,12 @@
       melpaBuild {
         pname = "org-mime";
         ename = "org-mime";
-        version = "20190402.321";
+        version = "20190513.637";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986";
-          sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm";
+          rev = "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c";
+          sha256 = "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -73188,12 +74694,12 @@
       melpaBuild {
         pname = "org-mru-clock";
         ename = "org-mru-clock";
-        version = "20180419.606";
+        version = "20190602.1108";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109";
-          sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw";
+          rev = "a816e173ee22ff96f0fef6c54316e2583192af32";
+          sha256 = "09zcnvz4mgw1lak5vnpa9b4r4gpskviyl2jwpjqmwqgvjhw31g0v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -73299,12 +74805,12 @@
       melpaBuild {
         pname = "org-noter";
         ename = "org-noter";
-        version = "20190307.926";
+        version = "20190502.725";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "f6f7a8d3af1c3e7e26173b245ba4a95e3cf03074";
-          sha256 = "092d8icw5pny685yqkm0c5bx6d7axgh6rcvnc3yri84dlbdzpfbv";
+          rev = "920798e2a977ca74b77cf728ee40bb48450f941b";
+          sha256 = "1sx4pf5hwbq7r967zigzq3jhhisd3x9pf3nmp7iickyd1jcg3qbv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -73589,12 +75095,12 @@
       melpaBuild {
         pname = "org-pomodoro";
         ename = "org-pomodoro";
-        version = "20171108.1314";
+        version = "20190530.745";
         src = fetchFromGitHub {
           owner = "lolownia";
           repo = "org-pomodoro";
-          rev = "3deed1c26dcbda4d5231b9085ddf68e302b0f9dc";
-          sha256 = "0mpcqqrz8mrqn1gbvffyw5d0qgpg3cpljxqk028s9snj4vy6xpz5";
+          rev = "aa07c11318f91219336197e62c47bc7a3d090479";
+          sha256 = "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro";
@@ -73669,12 +75175,12 @@
       melpaBuild {
         pname = "org-pretty-tags";
         ename = "org-pretty-tags";
-        version = "20190327.1447";
+        version = "20190527.155";
         src = fetchFromGitLab {
           owner = "marcowahl";
           repo = "org-pretty-tags";
-          rev = "6ac9c35e489dbe3a2e9c3101b49d8b0ea77cad23";
-          sha256 = "0scar1938xlr8c3zsbfw5z8mzrrr3255qisl9rjyh4kw80vai8bs";
+          rev = "9cc14f19bffd6efc733f6b1ab43198659c61a7ef";
+          sha256 = "1dxf3kgcbysb150j0jpsbs94vb8qy34pmdpd5ds2wgsjpvzxqy28";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad60399420764d4ef5d6acddae9241205937e78/recipes/org-pretty-tags";
@@ -73890,12 +75396,12 @@
       melpaBuild {
         pname = "org-re-reveal";
         ename = "org-re-reveal";
-        version = "20190405.959";
+        version = "20190518.0";
         src = fetchFromGitLab {
           owner = "oer";
           repo = "org-re-reveal";
-          rev = "871b37110dfc806b9183ec9c9550942bba190d0f";
-          sha256 = "1f1n2lbql1ik69b4bqwm0y9hpgf4glbk6k7jcd0xd62fq8x1yigc";
+          rev = "9d4a1bee112db8007c0e0a1fcb6be725f787a79a";
+          sha256 = "1pq3ynp441j1vhac0cz98r2riqw2187vdwc33hz92924kly66m9h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal";
@@ -73936,42 +75442,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-readme = callPackage ({ cl-lib ? null
-                              , fetchFromGitHub
-                              , fetchurl
-                              , header2
-                              , http-post-simple
-                              , lib
-                              , lib-requires
-                              , melpaBuild
-                              , yaoddmuse }:
-      melpaBuild {
-        pname = "org-readme";
-        ename = "org-readme";
-        version = "20151204.417";
-        src = fetchFromGitHub {
-          owner = "mattfidler";
-          repo = "org-readme";
-          rev = "4cb9f768d282a2835b4510b6504ff9ede487007d";
-          sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme";
-          sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
-          name = "recipe";
-        };
-        packageRequires = [
-          cl-lib
-          header2
-          http-post-simple
-          lib-requires
-          yaoddmuse
-        ];
-        meta = {
-          homepage = "https://melpa.org/#/org-readme";
-          license = lib.licenses.free;
-        };
-      }) {};
     org-recent-headings = callPackage ({ dash
                                        , emacs
                                        , fetchFromGitHub
@@ -73983,12 +75453,12 @@
       melpaBuild {
         pname = "org-recent-headings";
         ename = "org-recent-headings";
-        version = "20170907.2129";
+        version = "20190115.740";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4";
-          sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn";
+          rev = "01633b51ac3958b41cc6c79e6d3714047a91c1e9";
+          sha256 = "0gsrzmg3mssh9s28yjm9m866fnhm1pcligssz1q6brga6dm6f2yy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -74071,12 +75541,12 @@
       melpaBuild {
         pname = "org-ref";
         ename = "org-ref";
-        version = "20190318.858";
+        version = "20190604.848";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "e73bcc5bc07555f5eed4b63d14e4f209bb877c20";
-          sha256 = "17ijwzmzclp0gfscy42ir2j997l34smf868j1f6kr00snyagzjxk";
+          rev = "e95f3434a5c5a298321d2c6898a72337a8079781";
+          sha256 = "1l5zvys4i91jl5z46b11j3xc9015d1cj57ilzxa693pbckln173f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -74135,12 +75605,12 @@
       melpaBuild {
         pname = "org-reverse-datetree";
         ename = "org-reverse-datetree";
-        version = "20190404.2002";
+        version = "20190527.740";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "org-reverse-datetree";
-          rev = "99e7ae3d0860dfe0f4d647ceb045f8b00bf1fe77";
-          sha256 = "1ji8c2480ib48n1lq4ypgq524slgzfszpxwsv1q2wyqnjzbc2csv";
+          rev = "4ad43bb2895c2ec99e6b2338aceb4c18387f03b4";
+          sha256 = "0ga0bggn1552qnj7vrhxr6q6lma725cbb4mh9rn1nj2xn0yn2qal";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a08612af18bb620955f7b5450eba3f44cdb60673/recipes/org-reverse-datetree";
@@ -74292,12 +75762,12 @@
       melpaBuild {
         pname = "org-sql";
         ename = "org-sql";
-        version = "20190402.2035";
+        version = "20190529.1959";
         src = fetchFromGitHub {
           owner = "ndwarshuis";
           repo = "org-sql";
-          rev = "3793b270d5cd5ec047d7a32f2b34033592ffddf9";
-          sha256 = "0hlp4qdpdh5a1jnj8mas8vnmfd5j7g6vkyczblgi2f5vvfvls0v6";
+          rev = "1fc730deb82471b4235f931e808d8610a18be2dd";
+          sha256 = "1nwlxh6c8gds2alclmlbsx834qmw4chgjlwqmmrwxaxpwapr0s8a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/012573a35a302e9bb6f127cf28ac04f93796400e/recipes/org-sql";
@@ -74320,12 +75790,12 @@
       melpaBuild {
         pname = "org-starter";
         ename = "org-starter";
-        version = "20190406.314";
+        version = "20190604.507";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "org-starter";
-          rev = "4fa28564cab2acfde56ca815882caa9e715c848a";
-          sha256 = "1vjv2y3g02v5sg88z0kqig3jn0ryvck9s2syzdjpfsxp2jwbsw7a";
+          rev = "726e402fcf3357ee6ae077dc5507c7b71a872f24";
+          sha256 = "0s8nv6qjd9vmxp8qsvsl3bsd2ppjs9mg8acqnv27zra1algzfg0n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bdd9c835184ef1a6fabfaf7adb56a51514b75ea/recipes/org-starter";
@@ -74346,12 +75816,12 @@
       melpaBuild {
         pname = "org-static-blog";
         ename = "org-static-blog";
-        version = "20190403.526";
+        version = "20190527.2157";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-static-blog";
-          rev = "0269bbaa6de78a3fce8d926f54bb6e7b975f9c3a";
-          sha256 = "1f1v73x58fd80hwm0pfmjp4fijcx2y6zvcpas1ys3sjl2230z8s5";
+          rev = "53d53b6d02c2369654196c230056630cb21bd8d8";
+          sha256 = "06zdyinl00xy59khab0r7454bmlchyc755k953lxv1sfhqmnb2r8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
@@ -74782,12 +76252,12 @@
       melpaBuild {
         pname = "org-variable-pitch";
         ename = "org-variable-pitch";
-        version = "20190128.1251";
+        version = "20190409.1115";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "elisp";
-          rev = "05bd1d5db68df144bc7552a460371d94a2cb5b3c";
-          sha256 = "0v3swpbhi27nlwcav3iwanckqzirjvz6gl49if8kskmp8pdvy5fs";
+          rev = "a2bf11f6dd8c990c50929759c7b6ccdb4af78cd4";
+          sha256 = "1qqr2vd4yz413cvqfb4sk6rv8990nhcz5cr59va8zcz5d7gdzv2w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9632b7e98772b584d6420f8d0f9652d67118e05e/recipes/org-variable-pitch";
@@ -75036,12 +76506,12 @@
       melpaBuild {
         pname = "org2issue";
         ename = "org2issue";
-        version = "20160426.1818";
+        version = "20190531.241";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "org2issue";
-          rev = "0f7f13463e389f2d8d7d830a928042d0cf1c71eb";
-          sha256 = "1lvwkvzqgy9nlz7zmqfl9j8cairjfv3vknpzcqp6rzp6hkq04zk5";
+          rev = "910b98c858762fd14b11d261626c5e979dde0833";
+          sha256 = "0xgrrbkfqkhj15n7mbmh61g8i535ykhxh5y71054p3kikgnrh290";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad1759854c3bd302aa353dea92cf462e981aff2f/recipes/org2issue";
@@ -75161,16 +76631,16 @@
       melpaBuild {
         pname = "organize-imports-java";
         ename = "organize-imports-java";
-        version = "20190304.1047";
+        version = "20190516.2126";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "organize-imports-java";
-          rev = "e201750cee13876dbea2fba8508ade1b9f76b29a";
-          sha256 = "0lnsxa3aiyaww62z4y07ciwak2gxv881qraz6sl5csfjdmbycii1";
+          rev = "92989a7bf02340f8c65e1e69263c9c8ffc5afbeb";
+          sha256 = "1pr4zbv2k0rjljppv0kiq37h0s62pzyvqypxagmjdfkhkn7jssvr";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad0242f941ff44b4897c94d336bc0af498582dd7/recipes/organize-imports-java";
-          sha256 = "1k8s7pm268w42fm0lqlqg77mib8mbccw11ppf99r574510a1bni3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/organize-imports-java";
+          sha256 = "1n91qd9il2sq5wkcc2ag8mvgr1jkgwygrw9kpq7j16qch420i3fj";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs f s ];
@@ -75217,12 +76687,12 @@
       melpaBuild {
         pname = "orgit";
         ename = "orgit";
-        version = "20190304.1007";
+        version = "20190417.1024";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "2456436a7e64d26bcf455b3890a586acaa3e7f93";
-          sha256 = "1i52dq2ynddb1irgigr5mdwfbfd3bvm1f29jnzd7nlc0nk186nvh";
+          rev = "a2d39370409b70dfe543329befbc876dd24832bd";
+          sha256 = "0lxp74ncl75czmgy09lirng96ai1ykpw22q61wc655nsr5qqxrba";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -75993,6 +77463,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    ovpn-mode = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "ovpn-mode";
+        ename = "ovpn-mode";
+        version = "20190421.2048";
+        src = fetchFromGitHub {
+          owner = "anticomputer";
+          repo = "ovpn-mode";
+          rev = "8d26902ea61c59e716147a7113493f110abdf635";
+          sha256 = "04935x2acqh75snfcr0gz3k654qw619x7i89gqzs22liabll81s7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/16430ce0597c18925d7fdf83acfca996e8ad6457/recipes/ovpn-mode";
+          sha256 = "1p0gk3yiq7srpjcqhy0h2402m9ijb3nl9yz2lhnxvc41n9fj65gd";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ovpn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     owdriver = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -76187,12 +77684,12 @@
       melpaBuild {
         pname = "ox-hugo";
         ename = "ox-hugo";
-        version = "20190317.2148";
+        version = "20190602.1941";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "86a6196a431df4a9f81dbd00657e20a03c622c03";
-          sha256 = "098gwyrzkr8fj54jfdirc1m9rbcr2rsmi1klm0fv6hzfh8di1j93";
+          rev = "5be9bae6fe0d6aa7cd6c8e158c34e4a90d6e6e36";
+          sha256 = "155a6wady9gq36hm62ximj2fw1bx7m8k68aim1w9kbf7da80qwaa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -76510,16 +78007,16 @@
       melpaBuild {
         pname = "ox-reveal";
         ename = "ox-reveal";
-        version = "20161027.226";
+        version = "20180721.2003";
         src = fetchFromGitHub {
           owner = "yjwen";
           repo = "org-reveal";
-          rev = "d7ffc3fd1b095ed81e0af005ecbb0b42427d13b0";
-          sha256 = "0y8cnpm7hw8s3d09j8imdpaddqq914nfy3skjm7i10g9xacrp294";
+          rev = "1cdd088ec5fab631c564dca7f9f74fd3e9b7d4d4";
+          sha256 = "1vjxjadq2i74p96y9jxnqj1yb86fsgxzmn7bjgnb88ay6nvc1l72";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal";
-          sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2f267bb13a2fe5e1af49fd70d831a07d83b7d5/recipes/ox-reveal";
+          sha256 = "1lsq9xx95nhz1914wx7781fajfs84m27iwv980hqq29lyn2lzbl6";
           name = "recipe";
         };
         packageRequires = [ org ];
@@ -76537,12 +78034,12 @@
       melpaBuild {
         pname = "ox-rfc";
         ename = "ox-rfc";
-        version = "20190310.2321";
+        version = "20190429.433";
         src = fetchFromGitHub {
           owner = "choppsv1";
           repo = "org-rfc-export";
-          rev = "b0345990036a2322609a6fa360deba079d7001fe";
-          sha256 = "05962hwww6wkbd9p4svnc5ynbsgnnfryf900nr65qap41bzxfa3y";
+          rev = "4cac33c387bc10e32f18940298aa5095d060ed3e";
+          sha256 = "0y442swdsh8fl3471bz9276r2srv6dp7j12y09s82xx5nm668nmb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f49159d6a379bf435e2af8920176fd84693a60/recipes/ox-rfc";
@@ -76829,12 +78326,12 @@
       melpaBuild {
         pname = "ox-wk";
         ename = "ox-wk";
-        version = "20181111.134";
+        version = "20190526.324";
         src = fetchFromGitHub {
           owner = "w-vi";
           repo = "ox-wk.el";
-          rev = "9fc37e7e2f789b0ba07cb117ea1e1dcd14a2fd83";
-          sha256 = "00wsx21nmnvci2wfvxaci1kdxplavi2a4dw8ahvl7ncr3b60219f";
+          rev = "3da2213be1874d9d3e8a9337b09003d9c102b943";
+          sha256 = "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0947993df2d9bee493c2c25760f1ac5bcc1136ac/recipes/ox-wk";
@@ -77011,12 +78508,12 @@
       melpaBuild {
         pname = "package-lint";
         ename = "package-lint";
-        version = "20190307.1612";
+        version = "20190519.352";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "e494a1a9027e73fa07fc42236b953792ce0a32bf";
-          sha256 = "0vwr1v491a0hp6dx5ipsf5zd3zmi7igd1j59wzl6njmq9miarzy1";
+          rev = "152492f8325451f002c5090b837f7abcf5861e8b";
+          sha256 = "02lmc1np5vs4rdsazbazxry2ighhww7w5r0k60jxbwd2yar6hibp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbfb0250a58b2e31c32ff1496ed66a3c5439bd67/recipes/package-lint";
@@ -77250,12 +78747,12 @@
       melpaBuild {
         pname = "page-break-lines";
         ename = "page-break-lines";
-        version = "20181221.1508";
+        version = "20190519.1538";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "page-break-lines";
-          rev = "87e801efb816b24e83ebf84c052001e178e180bc";
-          sha256 = "0y2ag7gfspcndjmap87n8mxn5kglb80fzpdmramzjjsrcx7dwdix";
+          rev = "6f19d894bda6a981c10a58df5e23419f4d2ba353";
+          sha256 = "0b9jlqf5hk5m5zywwfcgxjb88aqhij73fxwkp16psfm4bv0zy78p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -77410,12 +78907,12 @@
       melpaBuild {
         pname = "panda";
         ename = "panda";
-        version = "20190401.2306";
+        version = "20190604.1507";
         src = fetchFromGitHub {
           owner = "sebasmonia";
           repo = "panda";
-          rev = "a7f2045cc568a5ec8b97734abdbb8618990748ca";
-          sha256 = "0a6ravwfjaf70mkkpd174y6w1hp2q18wjl5mmpa9gzyfa0c27v1q";
+          rev = "85a8552e1131442afdf6354e67d79bf5bdb3a469";
+          sha256 = "1yxdij2iaxzwbvrj7x0kxyxh3md99d8mb5mb9w7rxk7bfsx4cnn1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69800de45dda180450ed9d47a24181b659d9d1ae/recipes/panda";
@@ -77514,12 +79011,12 @@
       melpaBuild {
         pname = "pangu-spacing";
         ename = "pangu-spacing";
-        version = "20170317.157";
+        version = "20190421.2214";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "pangu-spacing";
-          rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498";
-          sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq";
+          rev = "3a741c1b669c7194fb766b784c10d52a8de9b87f";
+          sha256 = "12980pwsk4pvvya2x9nbwzkyxy75qfqzs0jxl4jdblgrhh104bs0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing";
@@ -77599,12 +79096,12 @@
       melpaBuild {
         pname = "paradox";
         ename = "paradox";
-        version = "20190406.1609";
+        version = "20190429.457";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "7ccf2403b5d056bd6cbf75c110420e3f5f0e8c0b";
-          sha256 = "1vq1qj8gif2215z4zqxlkqqn9qcb1v5rpzphhrcn6lwvl20qfja0";
+          rev = "906cf2a944c3ef0cd7bf08dc76ec5049e461f5d6";
+          sha256 = "0rx9xys7xk769p1sn1h37lyn09jflgffnh9p7n9flky17vdr70mk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -77617,6 +79114,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    parchment-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "parchment-theme";
+        ename = "parchment-theme";
+        version = "20190603.1212";
+        src = fetchFromGitHub {
+          owner = "ajgrf";
+          repo = "parchment";
+          rev = "d3cbff72e39d0351e6f701b1b5cae7e79da853a5";
+          sha256 = "1z5iqc10p24qglrzqy1qmsrnbbzd4zdz64jr1vk5zin9248ql1ry";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2302f512053b22e5abbd6a654cf94e4d5c7f5ca/recipes/parchment-theme";
+          sha256 = "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/parchment-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     paredit = callPackage ({ fetchgit
                            , fetchurl
                            , lib
@@ -77909,12 +79432,12 @@
       melpaBuild {
         pname = "parseclj";
         ename = "parseclj";
-        version = "20190327.151";
+        version = "20190531.11";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "parseclj";
-          rev = "dec638c5ca02deac7b83718828279c5d0b49725f";
-          sha256 = "15ylphnmk4dyrympi143g08jan8na31ncdzsifjhh68kisw7xzl4";
+          rev = "b34d3e13a249d4b92f1a008cdc1df20a92f866c5";
+          sha256 = "1bnlqkmpqpnmmsyhx49mryhkrkaq6v68x7a4kg2pn19ycf9xz6ds";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj";
@@ -78124,12 +79647,12 @@
       melpaBuild {
         pname = "password-store";
         ename = "password-store";
-        version = "20190405.1930";
+        version = "20190425.1942";
         src = fetchFromGitHub {
           owner = "zx2c4";
           repo = "password-store";
-          rev = "5c9f614cc43c963a49b695abef8cb9be3f146e85";
-          sha256 = "00sllhdr9xcb30x93aqh0j8pp7gqcn57yawkkx7jb8bbdmqkimcg";
+          rev = "0ee5ab3c5267faeafe6f95271ad7d5c59e15c90f";
+          sha256 = "1hs714w1sscxg6l6rrm0syjxb7bmcbij2p16j08hhcxvk4vy6rhk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
@@ -78749,12 +80272,12 @@
       melpaBuild {
         pname = "pdf-tools";
         ename = "pdf-tools";
-        version = "20190308.2344";
+        version = "20190413.1318";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "9a63f3909e5a331b6974deb03abd2c4bad42c2d9";
-          sha256 = "11i4kbwclwyvznyd9q69fq36fjasvs72ziz0555hl3fjbbq0n71q";
+          rev = "d780b82a5ea5eb64140a3a68fa278f877771a1fc";
+          sha256 = "1kv8lvwwjkgglb6qx1xvxq5xk95wl44x3sw84jpqjya3p0xx75yc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -78767,6 +80290,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    pdf-view-restore = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild
+                                    , pdf-tools }:
+      melpaBuild {
+        pname = "pdf-view-restore";
+        ename = "pdf-view-restore";
+        version = "20190423.925";
+        src = fetchFromGitHub {
+          owner = "007kevin";
+          repo = "pdf-view-restore";
+          rev = "12d9734d2133dead548497193016c86ab28e9477";
+          sha256 = "1z5483jclfn1xrcdrvrw2c94fpnb1skv6c2ppi3w5nj4myny6nsv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/66f0d3e9c7eea64f23191a3f7ac05158e3ae68bc/recipes/pdf-view-restore";
+          sha256 = "1n3l7iyv5w937n0ihng8mzkaz09ngwclg5fv2s576d36b6jwm2k8";
+          name = "recipe";
+        };
+        packageRequires = [ emacs pdf-tools ];
+        meta = {
+          homepage = "https://melpa.org/#/pdf-view-restore";
+          license = lib.licenses.free;
+        };
+      }) {};
     pdfgrep = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
@@ -78920,6 +80470,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    pepita = callPackage ({ csv
+                          , emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "pepita";
+        ename = "pepita";
+        version = "20190604.1025";
+        src = fetchFromGitHub {
+          owner = "sebasmonia";
+          repo = "pepita";
+          rev = "3378b4557a3b359fb1cc7eeff97cf94f352ae1cf";
+          sha256 = "1m8n491hdzz4y0b5iv8n374gn0i9x6jsix5il4962q8bajjl3slv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a393b11eaa29dbd0bf966fa0ab290b08ac7f39/recipes/pepita";
+          sha256 = "0xyy137hl8g74grhj8ipij4c80xrga1afjvzz5hf8hpx4zqbljpx";
+          name = "recipe";
+        };
+        packageRequires = [ csv emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pepita";
+          license = lib.licenses.free;
+        };
+      }) {};
     per-buffer-theme = callPackage ({ cl-lib ? null
                                     , fetchhg
                                     , fetchurl
@@ -78945,6 +80522,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    perfect-margin = callPackage ({ cl-lib ? null
+                                  , emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "perfect-margin";
+        ename = "perfect-margin";
+        version = "20190425.1945";
+        src = fetchFromGitHub {
+          owner = "mpwang";
+          repo = "perfect-margin";
+          rev = "a64336810929ecf801a4b65bb722e401e2cccf09";
+          sha256 = "13bl84g66hd1x6d3dhbzl4jd6hk1srxmzm4z34w75q00ap7qhyzb";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8cd6a81d46da6beff2754f69b1d74ff9cc1d49/recipes/perfect-margin";
+          sha256 = "0bn9bjz1bbl07z3wzhjplp0n5zla3yqc8phr3maap6mch3q0jc1y";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/perfect-margin";
+          license = lib.licenses.free;
+        };
+      }) {};
     perl6-mode = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
@@ -79110,12 +80714,12 @@
       melpaBuild {
         pname = "persp-mode";
         ename = "persp-mode";
-        version = "20180930.1020";
+        version = "20190511.702";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "689f63e7370cd9424d84b9f7b2eb3d1955443313";
-          sha256 = "141yakk7xfs0b58far1zqmwimim139bbzk0ymyzgghf5vyb5lxin";
+          rev = "e330e6240bbb82589077f30472b05b95d1ff430d";
+          sha256 = "0gy0h9mrgig0d2gjs2z949ld1ccgfhmp0dfd8g33g2kxgzp7wnv2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -79245,12 +80849,12 @@
       melpaBuild {
         pname = "pfuture";
         ename = "pfuture";
-        version = "20190322.52";
+        version = "20190505.306";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "pfuture";
-          rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d";
-          sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d";
+          rev = "263227534e8bb98aedce18698c34db9fd4d6500b";
+          sha256 = "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -79379,12 +80983,12 @@
       melpaBuild {
         pname = "phan";
         ename = "phan";
-        version = "20180527.2039";
+        version = "20190520.1903";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phan.el";
-          rev = "6b077b3421a0b2c0b98a6906b8ab0d14d9d7bf50";
-          sha256 = "1af4pam149dgxqzwqkjklxxqq2n8fg3l1b9w6bmaw24lx1pdxcyv";
+          rev = "82c2d962cd5cab647e8f2f5636bc83511ea40cb4";
+          sha256 = "1bypr6d85xr623bqq9j4hl2q4jiw8hyjhx1mp7q4jcm7pibkbjci";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
@@ -79767,12 +81371,12 @@
       melpaBuild {
         pname = "php-mode";
         ename = "php-mode";
-        version = "20190401.1042";
+        version = "20190530.1210";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "php-mode";
-          rev = "bcde734c37ca36e6c2a925038760247b09ca8825";
-          sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540";
+          rev = "c53e0c1ec154fcfe6e5db56d1513d503a62e0355";
+          sha256 = "1gg156pj51wp61y42844667xy75ds3wh6qjasj55b9wci5l1hv04";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode";
@@ -79879,12 +81483,12 @@
       melpaBuild {
         pname = "phpactor";
         ename = "phpactor";
-        version = "20190402.1916";
+        version = "20190531.800";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpactor.el";
-          rev = "5dc331636786bdcee9ce2868d4d313c40aca1303";
-          sha256 = "0qwklrsd8hxjvcddjj4ks3p24nyc3rcsxs9hyn3jphxww2igjbiv";
+          rev = "f5df770f70a509f1ec2861512c38845ec1490277";
+          sha256 = "0y1f8c6wnqci9vi85q4c7nzkmmfsd46fbwq7dl88ymw3fz03pnzj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
@@ -79939,8 +81543,8 @@
           sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
-          sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/43808f57146a395b92ed498803fa948a33e5f3c2/recipes/phpstan";
+          sha256 = "1nx9d4mhxhvbgrxawkpkw03b75bg1xpli1x83g2bhs8ar8lypjik";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -79949,6 +81553,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    phpt-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , php-mode
+                             , polymode }:
+      melpaBuild {
+        pname = "phpt-mode";
+        ename = "phpt-mode";
+        version = "20190512.1109";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpt-mode";
+          rev = "deb386f1a81003074c476f15e1975d445ff6df01";
+          sha256 = "0wv1q44f5hmpsrjvjb5y8c1gnjkazdghmgbzw6l30i3j3z36fy60";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/59a0e7aabf45c98b1ecf9db49f6420a6e051733b/recipes/phpt-mode";
+          sha256 = "1isq3l6qhya5vafmcqbda7r0irdmgvmlmdg98n7h8yck5imi78yf";
+          name = "recipe";
+        };
+        packageRequires = [ emacs php-mode polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/phpt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     phpunit = callPackage ({ cl-lib ? null
                            , emacs
                            , f
@@ -80376,12 +82008,12 @@
       melpaBuild {
         pname = "pipenv";
         ename = "pipenv";
-        version = "20190307.355";
+        version = "20190522.103";
         src = fetchFromGitHub {
           owner = "pwalsh";
           repo = "pipenv.el";
-          rev = "189cf5a4d425b6bdcd26742a460cf12cc540f524";
-          sha256 = "0dcd7gmjs5s17h55nnpyppxg3zf96p3w8bsb9sk2wy1jwxn566cm";
+          rev = "03edaaa44a5a4212d2e5a14e3ae6303189d76703";
+          sha256 = "04y6p8gd20xhn7qkz2gp94yxizwl67yhi7qs0x6c8nrxpqd1y5y9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv";
@@ -80628,7 +82260,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ emacs
+    plantuml-mode = callPackage ({ dash
+                                 , emacs
                                  , fetchFromGitHub
                                  , fetchurl
                                  , lib
@@ -80636,19 +82269,19 @@
       melpaBuild {
         pname = "plantuml-mode";
         ename = "plantuml-mode";
-        version = "20190316.458";
+        version = "20190531.153";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "2b84a2df523904c180a3556c851f59beb0e070d7";
-          sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv";
+          rev = "27d48942a6bde22386694d87ec1b263a9f210d3a";
+          sha256 = "1nv1bjqdcqhpx37l3ir28n7iqn97papxr9719l849cnxq81g1v2w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -80967,22 +82600,23 @@
           license = lib.licenses.free;
         };
       }) {};
-    po-mode = callPackage ({ fetchgit
+    po-mode = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
                            , melpaBuild }:
       melpaBuild {
         pname = "po-mode";
         ename = "po-mode";
-        version = "20180505.415";
-        src = fetchgit {
-          url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "a57ffdb2f17d040a737e84114544fcd748fa87fa";
-          sha256 = "19qg3l6w2lapjv73yvjiy5mj6j8kv7ch1gjpx2b86y2y5mqrqii7";
+        version = "20190511.842";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "po-mode";
+          rev = "1916142f6a817c733d5ec37e3b4fbae3da67e499";
+          sha256 = "0nvpr5ry86by1dm7mp2w5p534qg4c9dpdich3x13gbbp9vazc7h6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
-          sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/38e855cde9264bff67016d23e7e5e00f113c55bf/recipes/po-mode";
+          sha256 = "1w06i709bb04pziygdn7y47gcci7gybg0p7ncdsm07d0w7q14v2z";
           name = "recipe";
         };
         packageRequires = [];
@@ -81145,6 +82779,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    poe-lootfilter-mode = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "poe-lootfilter-mode";
+        ename = "poe-lootfilter-mode";
+        version = "20190330.417";
+        src = fetchFromGitHub {
+          owner = "jdodds";
+          repo = "poe-lootfilter-mode";
+          rev = "5ef06684cb2b17b090ee1f303c2b789fa71bc106";
+          sha256 = "1lxfbsixvr0rjcck4h4v000yb0iscvk9fwyw322y2cv2hvgwvkdw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/006f39eaf8a87822fe8becab1da2822ff6fc2beb/recipes/poe-lootfilter-mode";
+          sha256 = "0iw3a2lf0mnv3lamphy458nfyjjm1yvln1syfad49av3karca05z";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/poe-lootfilter-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     poet-client = callPackage ({ emacs
                                , fetchFromGitHub
                                , fetchurl
@@ -81310,12 +82970,12 @@
       melpaBuild {
         pname = "poly-R";
         ename = "poly-R";
-        version = "20190323.1424";
+        version = "20190605.1403";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-R";
-          rev = "3d90219d7e099ba65449681700ffc62cf88d9cc4";
-          sha256 = "1327rqdhc0xaad2k5rjwma6wwky72a8bfqmw1wqy0d4wzbn2wbrf";
+          rev = "0443c89b4d2bc2ed235a0c017109c2dbd342aa02";
+          sha256 = "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R";
@@ -81373,12 +83033,12 @@
       melpaBuild {
         pname = "poly-erb";
         ename = "poly-erb";
-        version = "20190317.723";
+        version = "20190605.1402";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-erb";
-          rev = "5339b0ba665cbf62dc09571e9fbc5e824c5bf5e4";
-          sha256 = "13bvgh0y4nlwxyxph7xs1m9akwb9cln2s5bnnn6fhwhgamsbqcvi";
+          rev = "304204f415b9e46ee36b64531b7d170540828335";
+          sha256 = "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb";
@@ -81401,12 +83061,12 @@
       melpaBuild {
         pname = "poly-markdown";
         ename = "poly-markdown";
-        version = "20190317.652";
+        version = "20190605.1402";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-markdown";
-          rev = "852755d339197ea5b2197b64a97d0b9c03b94e9c";
-          sha256 = "00y510ky587frzpzbyi82rqngi8ifnfzd5r15lh9w34v3dxjif6f";
+          rev = "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc";
+          sha256 = "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown";
@@ -81428,12 +83088,12 @@
       melpaBuild {
         pname = "poly-noweb";
         ename = "poly-noweb";
-        version = "20190317.652";
+        version = "20190605.1402";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-noweb";
-          rev = "1ce8d4f5c69376255e7be03fd03aa3b3bc00cfb5";
-          sha256 = "00n86lyrgffznspryc5h9bgqz5m0c0zwsxf9mlli62jf6c3wsd1q";
+          rev = "4e65cb22d6bca901021205257f867f868989c665";
+          sha256 = "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb";
@@ -81455,12 +83115,12 @@
       melpaBuild {
         pname = "poly-org";
         ename = "poly-org";
-        version = "20190320.1337";
+        version = "20190605.1403";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-org";
-          rev = "28421de2993de4da1e1db3b34a1215ce3ccc1d8b";
-          sha256 = "14f2752j55gj9is4prcx601km716vsq1fg25157bniiwd42vinqs";
+          rev = "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f";
+          sha256 = "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org";
@@ -81482,12 +83142,12 @@
       melpaBuild {
         pname = "poly-rst";
         ename = "poly-rst";
-        version = "20190317.735";
+        version = "20190605.1403";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-rst";
-          rev = "62a5cb9403f48f5c060244903ba0d14cb6822f6c";
-          sha256 = "1m2w9rlgpvdki083vyl9916fjb7dl7rd418kha3la46wks7z8ca5";
+          rev = "1a7d38e1c1d35cf64e4dad408db486a8e1931e61";
+          sha256 = "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst";
@@ -81537,12 +83197,12 @@
       melpaBuild {
         pname = "poly-slim";
         ename = "poly-slim";
-        version = "20190320.1342";
+        version = "20190605.1403";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-slim";
-          rev = "1b9fe0fc9fb7f65975be22322d17dc49bdac7c4a";
-          sha256 = "1czjanp9h4l7jry2gkb7596zhdmh3m29931npfdk1fb0lafrqhik";
+          rev = "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d";
+          sha256 = "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim";
@@ -81563,12 +83223,12 @@
       melpaBuild {
         pname = "polymode";
         ename = "polymode";
-        version = "20190406.303";
+        version = "20190605.1359";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "polymode";
-          rev = "0327dcac0f25e175e26f3774c24683d6bd6fc7a0";
-          sha256 = "0g0mkvk0ky8akm7bpf78n2zm4a52m89aiq0bfc2y87dgpbnvjyp4";
+          rev = "82a0c3d71cc02e32a347033b3f42afeac4e43f66";
+          sha256 = "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode";
@@ -81590,12 +83250,12 @@
       melpaBuild {
         pname = "pomidor";
         ename = "pomidor";
-        version = "20180614.128";
+        version = "20190523.714";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "8859aecdb48b76a36c5e251793da0f108b2dfeb4";
-          sha256 = "07amyi7i6jb8byv4gmyhadiyyqwpd9d64aayr826x7pnzx5gcg5s";
+          rev = "590e64d316d9210bd00cb4eb39d2f07ddc16809a";
+          sha256 = "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -82007,12 +83667,12 @@
       melpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "20190407.549";
+        version = "20190605.2006";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "posframe";
-          rev = "11c2fa2d6e0236f20c83da86c37b005c64b8c5cb";
-          sha256 = "1m1vgv3ps99xdrvya7w7jlfm068ik3wswpl2hnr858vmyjp4ggi6";
+          rev = "e9547ab066da28a89daa3efe3301a36f3faaf6fc";
+          sha256 = "0w2vavml94gyrp10j6i44fgp1a59wnx6zhkp8cyfxyw0vjv44vcz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
@@ -82138,16 +83798,16 @@
       melpaBuild {
         pname = "powerline-evil";
         ename = "powerline-evil";
-        version = "20151112.710";
+        version = "20190602.2040";
         src = fetchFromGitHub {
-          owner = "raugturi";
+          owner = "johnson-christopher";
           repo = "powerline-evil";
-          rev = "98b3a102b6dba6632aa0755a7257300c9b164309";
-          sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
+          rev = "b77e2cf571e9990734f2b30d826f3a362b559fd1";
+          sha256 = "1hs9jvl5lmfwr9k6qcnxjhd61zsmzq53ania1w5616gqa4qnjzhn";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a44108579409ab2aab3e75ccabffb207843ec1ee/recipes/powerline-evil";
-          sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c1a92c8b5b92269773d314aa6cec4f0057291a68/recipes/powerline-evil";
+          sha256 = "1x5hvnjdrpn3c8z6m7xfk30qd5y58p3jcyqr48qx91d0109gk342";
           name = "recipe";
         };
         packageRequires = [ evil powerline ];
@@ -82164,12 +83824,12 @@
       melpaBuild {
         pname = "powershell";
         ename = "powershell";
-        version = "20190113.45";
+        version = "20190421.1338";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "87cba2c5e0510bda3915b8324ae67ac52adcae31";
-          sha256 = "1dlyl8h539y75av144869ckz7difgmc1y2a2ngym7i6id22j1plp";
+          rev = "87826777bd3ebd53740be99b4546bfc11ccc625d";
+          sha256 = "038pcb7hv05yja9fvrmps6vh096a5rrdmyx9l8nisxqnsqf97ghv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell";
@@ -82296,12 +83956,12 @@
       melpaBuild {
         pname = "prescient";
         ename = "prescient";
-        version = "20190227.1043";
+        version = "20190529.913";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "9d15739133bac00ae222c98211a6735f41d88f86";
-          sha256 = "17ci1kdrw5j0h284i7akmjqnw465fawz5n2bqwqlpvzd6ghc2z8b";
+          rev = "1964f605f1f1e50c64a33aa3910cde7a23b45afc";
+          sha256 = "02q57qvw29ckrc53g5s9jicgxj87my30pk2iv8a865rvwbqqzs45";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
@@ -82428,12 +84088,12 @@
       melpaBuild {
         pname = "pretty-hydra";
         ename = "pretty-hydra";
-        version = "20190226.1946";
+        version = "20190530.1353";
         src = fetchFromGitHub {
           owner = "jerrypnz";
           repo = "major-mode-hydra.el";
-          rev = "2142be970874c679300e539a1d9d0f048eb72a7f";
-          sha256 = "00hxv2nlzz4kgyzrldhqfnvnrhdcb82lm90xdbvn059f1v1zihn3";
+          rev = "a93eb369e0ffd553f1fe9da2cdb7cee2edd02206";
+          sha256 = "1sr4zhsjz83qq0cvzawhfpl5jgg4x1jxhhn01inz3v2030raf9gp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/pretty-hydra";
@@ -82788,16 +84448,16 @@
       melpaBuild {
         pname = "project-abbrev";
         ename = "project-abbrev";
-        version = "20181206.902";
+        version = "20190516.2221";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "project-abbrev";
-          rev = "21572d56a70fc95ef2d3782310e634f1a2623bc5";
-          sha256 = "0f8vd0yqa7k27jl9hxfqdfk6qs9q8p11j2iabdxi0v3wddhq3s2v";
+          rev = "b94f829bb24570782b9f6bbcfdec4b391091b778";
+          sha256 = "0lkliz9hycag1gf5hxvh7mrgl5my2vbkn52g4pkh2x7hsdkxhxjy";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/11580720cfbbbaeed9d914abb8a48705c195b159/recipes/project-abbrev";
-          sha256 = "0771r4a652r3sqb601q5j6348kx1741s7svzxyfr2a4lspfffvqb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/project-abbrev";
+          sha256 = "12d0w3b9fh7hdi1qwm13s535k574xfh3ck48zpsv3jlxr59q5bqw";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -82946,12 +84606,12 @@
       melpaBuild {
         pname = "projectile";
         ename = "projectile";
-        version = "20190402.2319";
+        version = "20190603.2330";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "5bd9db6f4b0a9e1c27136561b134a4d119552cdb";
-          sha256 = "1k9r5ssm4wavypd8m5mb64fgia68jzpkk1p0p598qcywvbxlbw35";
+          rev = "fd85829ef2bdb8b2c183ea1b3ccfd50925824d78";
+          sha256 = "0kf5izn62c647y9axhchjcc1s40h0khk5ry0jpb3p32lv71b4xvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -83021,6 +84681,7 @@
         };
       }) {};
     projectile-git-autofetch = callPackage ({ alert
+                                            , emacs
                                             , fetchFromGitHub
                                             , fetchurl
                                             , lib
@@ -83029,19 +84690,19 @@
       melpaBuild {
         pname = "projectile-git-autofetch";
         ename = "projectile-git-autofetch";
-        version = "20190103.1235";
+        version = "20190417.1259";
         src = fetchFromGitHub {
           owner = "andrmuel";
           repo = "projectile-git-autofetch";
-          rev = "c6b4b99046122bc965e25cd20c737483d84fa8cc";
-          sha256 = "08hs4pbx0bw9lsfkc9za66am9ayyshlys5jrdh2aln1rfxrrr6hj";
+          rev = "8d8d090fdff42671e9926f095deb3448d24730b1";
+          sha256 = "1x1x1hn8k6hpj1vljbgmgznvgnky75xg4scy5y57k937pvkmyg6j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
           sha256 = "0m0raddsw5yvjrw2v6bdaswffmva8y9hxksdgf9axpvrd3rzlk9n";
           name = "recipe";
         };
-        packageRequires = [ alert projectile ];
+        packageRequires = [ alert emacs projectile ];
         meta = {
           homepage = "https://melpa.org/#/projectile-git-autofetch";
           license = lib.licenses.free;
@@ -83089,12 +84750,12 @@
       melpaBuild {
         pname = "projectile-rails";
         ename = "projectile-rails";
-        version = "20190110.208";
+        version = "20190421.1201";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "78f5cbe2c212ce19d4732212c46472d1c412659f";
-          sha256 = "09aby7yxk28rqz0vaps889idl5n41wj72pa0dr7bqmidq8i5jv4h";
+          rev = "3f8226c1136bd91bc919dce27cf952742aa254d0";
+          sha256 = "14cr1sgl2ln7xq25740fmggdiza2i791v9yafrdf2m6rhx50zksr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -83336,12 +84997,12 @@
       melpaBuild {
         pname = "promise";
         ename = "promise";
-        version = "20190405.105";
+        version = "20190414.2350";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "f237a52200b514d642a5e89f1437b0245f063e5d";
-          sha256 = "0k8bdz5lnipyj1bnyf3vwaqyd1y7wc6mxavqigv435r04520fmx7";
+          rev = "7ac038c9ef96f07b14919dd2ae648dce82324510";
+          sha256 = "0vj4ykfs4xd9711gsslplxk93iq0nw2w5kx27prqdlf5vx8jv3mh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -83361,12 +85022,12 @@
       melpaBuild {
         pname = "prompt-text";
         ename = "prompt-text";
-        version = "20160106.609";
+        version = "20190407.2010";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "prompt-text-el";
-          rev = "3cc486c070b7a7c806c8d6002f9ba4979f56107d";
-          sha256 = "1hv4p1x5sli5lplm8hl6frxmwvbc1vmamgj9m2ryk17ykqmr05r5";
+          rev = "b842bf13c53d0a2bd2bc7a00d37cc713d69fa9e9";
+          sha256 = "016gs6llc5p0p0sxn0syyq9ra8bkhvfx5x37a1fy0nkhv8jg33dv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17d2bc3e53865fe8c98aabb6ef0ad1d10fcb1061/recipes/prompt-text";
@@ -83413,12 +85074,12 @@
       melpaBuild {
         pname = "proof-general";
         ename = "proof-general";
-        version = "20190212.633";
+        version = "20190531.1518";
         src = fetchFromGitHub {
           owner = "ProofGeneral";
           repo = "PG";
-          rev = "8f90ac961c22099a615c03ed07576aaef820e06d";
-          sha256 = "07rwy1q0pii1k7z18hpfs768w07n7qg0wrvcqkrjfii3hx19vbwf";
+          rev = "9ebfbb6abbd5480b434ceadebec824d7c8804e73";
+          sha256 = "1p7i3ms6lny3yr7wrdpazchxryai329vx43qgvbqdrh51kdxyfvv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/135c8f2a04739145b500b8742a697907e398d270/recipes/proof-general";
@@ -83694,12 +85355,12 @@
       melpaBuild {
         pname = "psession";
         ename = "psession";
-        version = "20181214.2338";
+        version = "20190502.1138";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "psession";
-          rev = "983830eabdbea2bdd72fcdf2f05ca5c271fd4122";
-          sha256 = "09vw3wn69y712b9vpcr8m95if7xn63k3hsc6w9jwkz3xnlrz66q4";
+          rev = "2557ca67a7a81f5270fb98a0b0a92838d09343b8";
+          sha256 = "0wspxsis3p2zm1f0wfxmi4dpyswcip6jzx2jcan7j2mqiwld6l33";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession";
@@ -83776,12 +85437,12 @@
       melpaBuild {
         pname = "pubmed";
         ename = "pubmed";
-        version = "20190316.1651";
+        version = "20190502.1421";
         src = fetchFromGitLab {
           owner = "fvdbeek";
           repo = "emacs-pubmed";
-          rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc";
-          sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5";
+          rev = "67fbb6e8834feda85e8301adc5c17d9e38395d6a";
+          sha256 = "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed";
@@ -83828,12 +85489,12 @@
       melpaBuild {
         pname = "pulseaudio-control";
         ename = "pulseaudio-control";
-        version = "20190331.18";
+        version = "20190419.2241";
         src = fetchFromGitHub {
           owner = "flexibeast";
           repo = "pulseaudio-control";
-          rev = "638a02b0b59cd9662abbbb9dc947d0fed115b72d";
-          sha256 = "0kiqm9vcp2gi4a4c7isgffppx4bchf03vwlx8h70yhfycns2v0bk";
+          rev = "552206807c9af6ec150540bbdda5d08393196e0a";
+          sha256 = "1bb14xcglvamvlqsx3dz75zq5ws17774g32484x5ksfpajpibwas";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control";
@@ -83951,6 +85612,7 @@
         };
       }) {};
     purescript-mode = callPackage ({ cl-lib ? null
+                                   , emacs
                                    , fetchFromGitHub
                                    , fetchurl
                                    , lib
@@ -83958,19 +85620,19 @@
       melpaBuild {
         pname = "purescript-mode";
         ename = "purescript-mode";
-        version = "20190227.1345";
+        version = "20190522.1530";
         src = fetchFromGitHub {
           owner = "purescript-emacs";
           repo = "purescript-mode";
-          rev = "43d8d205506d10ef829e77079fc4b8c569998f44";
-          sha256 = "0xbqy408532gnknfj78cnp9raqcmfk4scaxym7nzb8ffh2bd721n";
+          rev = "8db1d0243c03da31adac4d7c5287407a4df6aff2";
+          sha256 = "07z5m8h5a1dhqlzf8wqyxqw2mz3kxzjfpb0p7az3bhs3xsxq6q1q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55462ed7e9bf353f26c5315015436b2a1b37f9bc/recipes/purescript-mode";
           sha256 = "1g30xbv3xvv52r873465a2lp6fnws9q8dz277697qm0mgxkpimbp";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/purescript-mode";
           license = lib.licenses.free;
@@ -84528,12 +86190,12 @@
       melpaBuild {
         pname = "pyim";
         ename = "pyim";
-        version = "20190405.2125";
+        version = "20190530.1831";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "a80a203b7149d927a92d9bc27278117df44f05f2";
-          sha256 = "1z6yinn5azn4g1g6y4p55a579xm3rhhn9sxbmjlpd2ff66ahi8z3";
+          rev = "50e2b0d825dde89639fe1257fad8c9bf450b2c7f";
+          sha256 = "1gf0cix5gc20ab9rsvj13rdnvcsqsjkbaql7xbv5lyl555dlbpn7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -84944,12 +86606,12 @@
       melpaBuild {
         pname = "python-mode";
         ename = "python-mode";
-        version = "20190313.409";
+        version = "20190503.938";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "e916afc06f2a9bc1f02d93081ee0ee1ec2e8740b";
-          sha256 = "03vc619iq7hd5q7m5rlxlq7h1irc288x2hr6gnm58b711gyax5fk";
+          rev = "9ba43eaac8200e73fbd4cf938ecece4b8bfadaa0";
+          sha256 = "0rdv5zs15rl7d6lla3k1wh4c1icxrbn6pbd9jqrrm96a5q8hm8v9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -85580,12 +87242,12 @@
       melpaBuild {
         pname = "quiz";
         ename = "quiz";
-        version = "20170818.415";
+        version = "20190525.506";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "quiz.el";
-          rev = "b7c8fc14ebad50ca170c40e4ecb07b7f49f054ba";
-          sha256 = "1kxivd572ww5c6m7d3183ikiyrgvmvhbs8kkyhpc9y3y8ziaid1x";
+          rev = "570bf53926d89282cdb9653bd5aa8fe968f92bbd";
+          sha256 = "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
@@ -85638,12 +87300,12 @@
       melpaBuild {
         pname = "racer";
         ename = "racer";
-        version = "20190319.1756";
+        version = "20190524.1950";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "9d8984ef384932e0e7647ecb057db7ad1e9833f1";
-          sha256 = "10q26bkv26fgdcvs6cn2vb2i4359yn7a4n3r7vs8qfpnck7i0j8x";
+          rev = "f9fc3e9847210867f4a621ceeddcb1724cc0001b";
+          sha256 = "1basr4b7nv525yiq1hrncxiglhzbcxhgq5pnq53d23fv63cn994p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -85661,24 +87323,23 @@
                                , fetchFromGitHub
                                , fetchurl
                                , lib
-                               , melpaBuild
-                               , s }:
+                               , melpaBuild }:
       melpaBuild {
         pname = "racket-mode";
         ename = "racket-mode";
-        version = "20190405.745";
+        version = "20190603.1849";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "b2681c50afd180ed3a89345e015926eb31dba30d";
-          sha256 = "038f03y8nmzfjdbxcyfg6sd6y9zimlc9yvcs9lggvps1ni2y4j58";
+          rev = "efba679bdb9d024c36024945da4518663f6f8f15";
+          sha256 = "0h4g45ixdl0x1izpac99amz63c9sb4i45k7qwr0m4kk6jly0c5hd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9af8dea03aba378f21c6109faf48278b4d2bf59f/recipes/racket-mode";
           sha256 = "0cmlz314w5227br0vns5d7jhpspv1byzalgzv8f9v2qjyvk6jvsn";
           name = "recipe";
         };
-        packageRequires = [ emacs faceup s ];
+        packageRequires = [ emacs faceup ];
         meta = {
           homepage = "https://melpa.org/#/racket-mode";
           license = lib.licenses.free;
@@ -85948,12 +87609,12 @@
       melpaBuild {
         pname = "ranger";
         ename = "ranger";
-        version = "20170817.857";
+        version = "20190411.2324";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef";
-          sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p";
+          rev = "53096cd1296aaae4308e62b52de01d487a353271";
+          sha256 = "1s8inrf9vjf7550jhn03zha85pmn46mvdxz3dmx2vfb184hv46cx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -86230,12 +87891,12 @@
       melpaBuild {
         pname = "rdf-prefix";
         ename = "rdf-prefix";
-        version = "20180127.1006";
+        version = "20190511.512";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
-          sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
+          rev = "6daf675d96aa4a0bc78adc93560b791a77651b22";
+          sha256 = "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -86428,8 +88089,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    realgud = callPackage ({ cl-lib ? null
-                           , emacs
+    realgud = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
                            , lib
@@ -86440,25 +88100,19 @@
       melpaBuild {
         pname = "realgud";
         ename = "realgud";
-        version = "20190121.1643";
+        version = "20190603.1457";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud";
-          rev = "1da5f2b5161bd5d5671b38ab182084e2d89e7c45";
-          sha256 = "19ijc3v1wz01631hyc3x1bgx9kczhdzc99jlxxfq9y5yr8p1s2qa";
+          rev = "593ccf1347f823559011112ace1f5c4e2a11ce65";
+          sha256 = "1b4x7ymnsv39isn5j8gw8xvcdr75amg66s8iyirlcwgbyzil3y8f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud";
           sha256 = "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c";
           name = "recipe";
         };
-        packageRequires = [
-          cl-lib
-          emacs
-          load-relative
-          loc-changes
-          test-simple
-        ];
+        packageRequires = [ emacs load-relative loc-changes test-simple ];
         meta = {
           homepage = "https://melpa.org/#/realgud";
           license = lib.licenses.free;
@@ -86469,52 +88123,197 @@
                                   , fetchFromGitHub
                                   , fetchurl
                                   , lib
+                                  , load-relative
                                   , melpaBuild
                                   , realgud }:
       melpaBuild {
         pname = "realgud-byebug";
         ename = "realgud-byebug";
-        version = "20180308.1923";
+        version = "20190520.440";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud-byebug";
-          rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
-          sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
+          rev = "f8f20b92c6b13f75cc9797921c0e28d3def48b1c";
+          sha256 = "1f6g5ajimha2n45dykc2vrpdd25ylwrn98fijj3i9m8n0f7jyjrn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-byebug";
           sha256 = "1akv9raa6yb5h4lsvz7mxlnd9l7adg2rpgw7ski6036n6facn18a";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs realgud ];
+        packageRequires = [ cl-lib emacs load-relative realgud ];
         meta = {
           homepage = "https://melpa.org/#/realgud-byebug";
           license = lib.licenses.free;
         };
       }) {};
+    realgud-ipdb = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , melpaBuild
+                                , realgud }:
+      melpaBuild {
+        pname = "realgud-ipdb";
+        ename = "realgud-ipdb";
+        version = "20190603.1909";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-ipdb";
+          rev = "3642767a286e0542bf03cbb240cf47b2a89ad3f5";
+          sha256 = "1lgqh80w4ksa4a3zyxdz812jn0yg5xn1z5z0c23sf5vqzzxkzx7h";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c8182de5fceca3fc517a21abdb8d6e9c860e041b/recipes/realgud-ipdb";
+          sha256 = "134b1n2fci0z85cyvqjq3i5wb3pm110src87la6kq2pin1nrdkcm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-ipdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-jdb = callPackage ({ cl-lib ? null
+                               , emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , load-relative
+                               , melpaBuild
+                               , realgud }:
+      melpaBuild {
+        pname = "realgud-jdb";
+        ename = "realgud-jdb";
+        version = "20190524.2057";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-jdb";
+          rev = "5e3211a17a8282d2d0027e73149e01034082bc41";
+          sha256 = "0d2qkzm09dxv9969xc74b5vvygn2kn0qxwl2y4pjjwhn4mw6gc37";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4f03a731e4fbf2099b1ba0902ef514fd8c930d30/recipes/realgud-jdb";
+          sha256 = "02vlzv8lvm4vcw5c3ajn8lb499jdsrlg92kwib1hjwb2smjkb6ba";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-jdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-lldb = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , melpaBuild
+                                , realgud }:
+      melpaBuild {
+        pname = "realgud-lldb";
+        ename = "realgud-lldb";
+        version = "20190604.2";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-lldb";
+          rev = "f2f77d6ddfa42430ead400eaf81c605c3a04dead";
+          sha256 = "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e40b575cc22fa7b4773cf617862495e93565e4/recipes/realgud-lldb";
+          sha256 = "1l43h14a42cpgjcmbhk9vkk87z4ap9rdz7jrz8id666qxbza5xzg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-lldb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-debug = callPackage ({ cl-lib ? null
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , load-relative
+                                      , melpaBuild
+                                      , realgud }:
+      melpaBuild {
+        pname = "realgud-node-debug";
+        ename = "realgud-node-debug";
+        version = "20190525.934";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-node-debug";
+          rev = "72e786359ce9dace1796b0d81a00e9340e9c90ad";
+          sha256 = "1zn465bikzv1aizjjcnzsx105pdwwarqmd1fij82rhrspc8p8zis";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50a3644b62f61622169c1aa109db80b1f53d3d8a/recipes/realgud-node-debug";
+          sha256 = "0mw2sl9g8j08v40g5x2ai52i5ljvbxvcq37jwaz7vwdkafpnfyis";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-node-debug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-node-inspect = callPackage ({ cl-lib ? null
+                                        , emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , load-relative
+                                        , melpaBuild
+                                        , realgud }:
+      melpaBuild {
+        pname = "realgud-node-inspect";
+        ename = "realgud-node-inspect";
+        version = "20190523.551";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-node-inspect";
+          rev = "e0f18442d759b8ce4479c01e090975b62270257d";
+          sha256 = "1w4jxz2lc2ia9zy9cx1kwvjsn5z53wnkybn9j80ijly431m4hlxg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/88388c61c0402534ccf9751b3cec318b62d72655/recipes/realgud-node-inspect";
+          sha256 = "1mfhvhww0w7mksfmgfjd2s8wa10k7q2sqm6s55nm71jyx5h48k07";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-node-inspect";
+          license = lib.licenses.free;
+        };
+      }) {};
     realgud-old-debuggers = callPackage ({ cl-lib ? null
                                          , emacs
                                          , fetchFromGitHub
                                          , fetchurl
                                          , lib
+                                         , load-relative
                                          , melpaBuild
                                          , realgud }:
       melpaBuild {
         pname = "realgud-old-debuggers";
         ename = "realgud-old-debuggers";
-        version = "20170316.31";
+        version = "20190520.450";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud-old-debuggers";
-          rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94";
-          sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g";
+          rev = "0fad38283e885c452160232e01adf3f6ae51983b";
+          sha256 = "01x819j80yc5ybwaz5xglibv88r2aah5gqxwi1q9azd6f70zanvi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-old-debuggers";
           sha256 = "14kig9yxss9nfc0cc54ph80pbdrmh1mdazypiwxbnj2nk1dk3qsv";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs realgud ];
+        packageRequires = [ cl-lib emacs load-relative realgud ];
         meta = {
           homepage = "https://melpa.org/#/realgud-old-debuggers";
           license = lib.licenses.free;
@@ -86525,55 +88324,87 @@
                                , fetchFromGitHub
                                , fetchurl
                                , lib
+                               , load-relative
                                , melpaBuild
                                , realgud }:
       melpaBuild {
         pname = "realgud-pry";
         ename = "realgud-pry";
-        version = "20160805.745";
+        version = "20190520.439";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud-pry";
-          rev = "fca36075a223f6a4a643764199babe3d1dfde2ac";
-          sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp";
+          rev = "9f6151bde12d9b3a5d3f3ff18368c2ba4b2c44d3";
+          sha256 = "0spy9j93j8gf5qpc3l2r934nsgqzwgzsswb2zr2z0f3l06yxbqs6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-pry";
           sha256 = "1f8qap30r26gg33i76474zk6fs3r9qjf7jrxpm4xwpbjraggqy3z";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs realgud ];
+        packageRequires = [ cl-lib emacs load-relative realgud ];
         meta = {
           homepage = "https://melpa.org/#/realgud-pry";
           license = lib.licenses.free;
         };
       }) {};
-    realgud-rdb2 = callPackage ({ fetchFromGitHub
+    realgud-rdb2 = callPackage ({ cl-lib ? null
+                                , emacs
+                                , fetchFromGitHub
                                 , fetchurl
                                 , lib
+                                , load-relative
                                 , melpaBuild
                                 , realgud }:
       melpaBuild {
         pname = "realgud-rdb2";
         ename = "realgud-rdb2";
-        version = "20160303.43";
+        version = "20190520.446";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud-ruby-debugger2";
-          rev = "e63eeed131517a9e8225f972c9f6c975c8121e41";
-          sha256 = "0skaw5fzvqk56mfk3ciy9n85vznq1sxv6w575v3jd80w2dns4yay";
+          rev = "3594aa74f7afda3c3251bb2af7fe0e8ec6d621ae";
+          sha256 = "1nalr0yd1wvqdf81nidxmh9fr3ncqdjb706p6832fsmbpk7r9haw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-rdb2";
           sha256 = "16pk034g26xnbsz0w9z8p76jiaraz8lvbf5hf0mmg1f5f4xlinz7";
           name = "recipe";
         };
-        packageRequires = [ realgud ];
+        packageRequires = [ cl-lib emacs load-relative realgud ];
         meta = {
           homepage = "https://melpa.org/#/realgud-rdb2";
           license = lib.licenses.free;
         };
       }) {};
+    realgud-trepan-ni = callPackage ({ emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , load-relative
+                                     , melpaBuild
+                                     , realgud }:
+      melpaBuild {
+        pname = "realgud-trepan-ni";
+        ename = "realgud-trepan-ni";
+        version = "20190528.1511";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-trepan-ni";
+          rev = "4cd936edcc89324a819b21aa1afd331c02e6bd3e";
+          sha256 = "0h0d8566km6v7rgiqx54lwazwwl929npxicg8dx8qw12q13vkk31";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2464e03d11cd660c3c9c760e16b90911151cf184/recipes/realgud-trepan-ni";
+          sha256 = "1p7sn1swmdyyzaaa5xza70md4pl2p15swyh7y3fbmpp35nabv9zi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-trepan-ni";
+          license = lib.licenses.free;
+        };
+      }) {};
     reason-mode = callPackage ({ emacs
                                , fetchFromGitHub
                                , fetchurl
@@ -86841,12 +88672,12 @@
       melpaBuild {
         pname = "rectangle-utils";
         ename = "rectangle-utils";
-        version = "20160914.2108";
+        version = "20190411.1057";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "rectangle-utils";
-          rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a";
-          sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545";
+          rev = "46f7e73340fee40c1ab9a4e766a08ae3fce83ebe";
+          sha256 = "0dcga10lg2bl1p259s78jib7pd03v183hima8aksfr0c84s438yq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils";
@@ -87081,12 +88912,12 @@
       melpaBuild {
         pname = "reformatter";
         ename = "reformatter";
-        version = "20190209.2001";
+        version = "20190529.1538";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "reformatter.el";
-          rev = "00413b21ec418f92f3c7d8235a809cf50a10f288";
-          sha256 = "0hmi6c3kf7plg3pdcyiiwhl5ckdr5p43d9y9172kw89y6ivf4635";
+          rev = "b29fdd346d0d06bef4cafc75adbde51a46392e90";
+          sha256 = "0ahi9z3qpbg9zcb1fzbxqd6gb8ip44zdf9assimch7yklg5ph2ca";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/58de8cf8864867f7b3969f3a048a4844837078b4/recipes/reformatter";
@@ -87390,12 +89221,12 @@
       melpaBuild {
         pname = "renpy";
         ename = "renpy";
-        version = "20180907.1234";
+        version = "20190419.1049";
         src = fetchFromGitHub {
           owner = "billywade";
           repo = "renpy-mode";
-          rev = "cf9c9ead6084210a4c0290a0d999a099b8d00a81";
-          sha256 = "1blv8f1qr0nd7j7ciyba05n5a4jijffqmchxjhl7nxljlghwiy27";
+          rev = "943e1af71d23128ff100d41d178ccffe28f97944";
+          sha256 = "1l2dglkbpb3d6c6cnifhngcjc4yy726mq6yic8x9409c6r0apn2n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc928aed12275dc3780d7d8acc6ceca0f69ef63f/recipes/renpy";
@@ -87468,12 +89299,12 @@
       melpaBuild {
         pname = "repl-toggle";
         ename = "repl-toggle";
-        version = "20180501.328";
+        version = "20190430.13";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "934f59478a5c5577795f9507e945d564be368510";
-          sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j";
+          rev = "a36caac7649fbffbe30f7b06541c9efd723563fc";
+          sha256 = "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
@@ -87812,12 +89643,12 @@
       melpaBuild {
         pname = "restclient";
         ename = "restclient";
-        version = "20190405.1308";
+        version = "20190502.1514";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "236810ad1d4b13f27e85931c0d8bb3549a35e865";
-          sha256 = "0f0hn91k6s4vkqzac3x9sma4sx78m4b6h7fpkc4jslv2v0b0dplv";
+          rev = "422ee8d8b077dffe65706a0f027ed700b84746bc";
+          sha256 = "067nin7vxkdpffxa0q61ybv7szihhvpdinivmci9qkbb86rs9kkz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -87917,12 +89748,12 @@
       melpaBuild {
         pname = "reverse-im";
         ename = "reverse-im";
-        version = "20180213.525";
+        version = "20190428.1011";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "16931909115a922b1cf3846b1f60509b6590001f";
-          sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc";
+          rev = "e30815653aa81eac097f27be14886806d9df4ea4";
+          sha256 = "0i34q5bj5y0xnvc8d82w5vpfscl1nvqv584sd9kqpi81gy3qphrw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -88011,6 +89842,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    rfc-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "rfc-mode";
+        ename = "rfc-mode";
+        version = "20190525.1210";
+        src = fetchFromGitHub {
+          owner = "galdor";
+          repo = "rfc-mode";
+          rev = "5cdf7172e307c0e23bb5342c61263d4439292ede";
+          sha256 = "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a61d769cf7c61619a594337fe8a12ccc6a6fd6e/recipes/rfc-mode";
+          sha256 = "0z7krcfdyr8hblz8dc7apqlpn6sj2zwrjw4wh86js8vf7fiv8svy";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/rfc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rg = callPackage ({ cl-lib ? null
                       , emacs
                       , fetchFromGitHub
@@ -88099,12 +89957,12 @@
       melpaBuild {
         pname = "rich-minority";
         ename = "rich-minority";
-        version = "20190321.658";
+        version = "20190419.436";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "rich-minority";
-          rev = "04bc21b109c4507e16747b709d55f9be9553779c";
-          sha256 = "15m39qqllkj1a328dyl23a830ix6m1f9sfmj19nwrsysxqik7vg6";
+          rev = "a03e693f6f9232cf75363aaaf1cb041f21675c19";
+          sha256 = "0nr5lazllp5qphllnmwrwiywkc5zd3a51ciwb8k0h8zw5axhp0v7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -88123,23 +89981,24 @@
                                        , fetchurl
                                        , lib
                                        , melpaBuild
+                                       , ordinal
                                        , popup }:
       melpaBuild {
         pname = "right-click-context";
         ename = "right-click-context";
-        version = "20181220.2128";
+        version = "20190528.1132";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "right-click-context";
-          rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965";
-          sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj";
+          rev = "4b1a2cd2b3eaea2393d3696a36da8f42e386c23d";
+          sha256 = "1y0sa1k8pc8g6mzsqv3n34v2ziyvlr6l74409kh8673lp5r7cx1f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context";
           sha256 = "189nkxkc7lr2fm5qgmylmz6xv6mpphslj4fgpmr8ynnx9z3nxms2";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs popup ];
+        packageRequires = [ cl-lib emacs ordinal popup ];
         meta = {
           homepage = "https://melpa.org/#/right-click-context";
           license = lib.licenses.free;
@@ -88337,12 +90196,12 @@
       melpaBuild {
         pname = "rmsbolt";
         ename = "rmsbolt";
-        version = "20181227.655";
+        version = "20190507.2309";
         src = fetchFromGitLab {
           owner = "jgkamat";
           repo = "rmsbolt";
-          rev = "246377bbff99734f30daedf2c47c03283c97e7c5";
-          sha256 = "05v16g2drc57cjcdjqy9rk5m4i74v8raspgfsc62qbapy4kqvn78";
+          rev = "fcefc0509dd0a4ec2e02020c83e1c4a1101ef903";
+          sha256 = "1zbpp4ilf9kvjnxc0cgs90l02lmpp6pa905cahi441l2pn71kbld";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/798e7978f3ee32b3667956da8dc2dc7f005b6996/recipes/rmsbolt";
@@ -88364,12 +90223,12 @@
       melpaBuild {
         pname = "robe";
         ename = "robe";
-        version = "20190305.1346";
+        version = "20190520.1758";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "69abadccf36220167f5d158dbdd3a801b3b89eff";
-          sha256 = "087jl5b220i6g7shfbfxvxvv6zdlgagvrhwf4axllybif1p47nd3";
+          rev = "8190cb7c7beb8385dd3abf6ea357f33d8981ae8a";
+          sha256 = "1lqckmfxm2csh0as22bwf4rvbn5rwqry18xx9m5nfhfl57360q75";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -88440,12 +90299,12 @@
       melpaBuild {
         pname = "rope-read-mode";
         ename = "rope-read-mode";
-        version = "20190315.907";
+        version = "20190527.327";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "3542bf0199d242729e198beac3305cc88497dc89";
-          sha256 = "0l6r2g3i475nlzrwra38f6w5izl3ajd4dilf4yvcs66ah9bzhh2r";
+          rev = "ba7cb7e046a2353ae43c2c69fbe7dd2e703e0a20";
+          sha256 = "0vf6w4g1mcv4wf53zfmgcaaz0im09pa2pl8jmkf7dj34djlk4iw9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -88458,6 +90317,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ros = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "ros";
+        ename = "ros";
+        version = "20190602.809";
+        src = fetchFromGitHub {
+          owner = "DerBeutlin";
+          repo = "ros.el";
+          rev = "b5deea437bf8999907e381d3b16f8b0ec0185045";
+          sha256 = "0clvj1n9ib50spfbz6ph59kznz665vwv6h1dniisfp2fdw3l8i3f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7df44ae0ba89a2c4089a39b212784a6a359f1521/recipes/ros";
+          sha256 = "1frlg1zn9ip2s3ija20rkmf880smk01jz6jclqkygx6kd4fsbi9m";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ros";
+          license = lib.licenses.free;
+        };
+      }) {};
     rotate = callPackage ({ fetchFromGitHub
                           , fetchurl
                           , lib
@@ -88618,12 +90503,12 @@
       melpaBuild {
         pname = "rtags";
         ename = "rtags";
-        version = "20190320.817";
+        version = "20190410.915";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3232afea229ee090df61bc58786a1de65894f413";
-          sha256 = "0z3xj5s1p14sk8na7xhx4kxc2kz3sg7z58iz5mlaf6mdna85cy3x";
+          rev = "de17d52cb18ca2228d04a9dc8b1c0ed04009d9e7";
+          sha256 = "0z42fm77135vsjszmvr0f3fq0gnvb17cnwafaz8cyqbz6ya0770c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -88980,12 +90865,12 @@
       melpaBuild {
         pname = "ruby-test-mode";
         ename = "ruby-test-mode";
-        version = "20190313.805";
+        version = "20190412.209";
         src = fetchFromGitHub {
           owner = "ruby-test-mode";
           repo = "ruby-test-mode";
-          rev = "aa11267824561eb2b6a40b3dc5e2ad1cfb800f84";
-          sha256 = "1k2mv2zgjsq8sn6lr5ad1xicb786xkvj8v588xavn1m50brn1gc9";
+          rev = "a7e2d912756269d7d88896a9fe0306475cd2b085";
+          sha256 = "0zlpvqpi2rq5ggrifmbp0hpjfaz8aplw0lkfy2d37rla8vsl9m0y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f781a76a519afc0222cdf7255822a23e33745deb/recipes/ruby-test-mode";
@@ -89209,12 +91094,12 @@
       melpaBuild {
         pname = "rust-mode";
         ename = "rust-mode";
-        version = "20190304.536";
+        version = "20190517.1337";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "a871d108c745276e93ff1dec7c65e2e5a57e6d8c";
-          sha256 = "12yyc9d1b5jj2mqxdgjn95ah9dnxbl8jkq2mrxyrr9y34c6fycr6";
+          rev = "c62185ae1c6edf0335261f169241eb8ee9713ad5";
+          sha256 = "0jq8hb8j484vqnd743d2azw4zg1gn2j0l6h60bd0vcqd2hgag1nw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -89271,12 +91156,12 @@
       melpaBuild {
         pname = "rustic";
         ename = "rustic";
-        version = "20190318.1112";
+        version = "20190413.906";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "rustic";
-          rev = "e73f29bd273670a1193e595ff13641ec0675cfb4";
-          sha256 = "1jfvvq4yz3ypw32q10g926ys1y4j1dyskpbl25qgqnw5dwjy7vsk";
+          rev = "4ab8f78167c81b040ca87caac5290ac69df8a2ff";
+          sha256 = "0rm62n5ad3caanxglmk2d2glgq2470c1yd4h7yzci3ay74p7szz8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic";
@@ -89627,12 +91512,12 @@
       melpaBuild {
         pname = "sass-mode";
         ename = "sass-mode";
-        version = "20161006.2326";
+        version = "20190501.1753";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "sass-mode";
-          rev = "37105f46f6ea3592039f2ea7d0463ae7f042616e";
-          sha256 = "0gd0n5mh2f1gr2aq65d94zmvc2d04z2yb1baw24m0c11fai4y710";
+          rev = "247a0d4b509f10b28e4687cd8763492bca03599b";
+          sha256 = "1nhk12lhvkwdk8s8fx33p6rssi0gcfx2zkanq23rz6k28v5zi5yp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/sass-mode";
@@ -89702,12 +91587,12 @@
       melpaBuild {
         pname = "save-visited-files";
         ename = "save-visited-files";
-        version = "20170228.2250";
+        version = "20190430.808";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "save-visited-files";
-          rev = "33e8d223f622001f5792c52d8b36661e46b5834c";
-          sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim";
+          rev = "7eb71a6c4f9cb770b387fcef80231d9a9f648188";
+          sha256 = "01ampk085k0rb0bw85imwbs44p4wp20giiwwpbrv6f97bh1065m2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files";
@@ -89829,12 +91714,12 @@
       melpaBuild {
         pname = "scad-mode";
         ename = "scad-mode";
-        version = "20180108.1809";
+        version = "20190413.546";
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "2de6815c7c2ade42e53e86751b9584ac4a5e1ef9";
-          sha256 = "188wbnhdgk0820izing6hb7fca1d42hw9bnn405kms157kvcgqsi";
+          rev = "abf18ce66f6d6318c1e8ac8c1e2be7a172f5759e";
+          sha256 = "0ng5snm3l3psbbaf4lm1dlvwackx12hkix5lc1xfgfrandkrggnm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -90770,12 +92655,12 @@
       melpaBuild {
         pname = "semi";
         ename = "semi";
-        version = "20190405.739";
+        version = "20190517.1523";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "semi";
-          rev = "13bb56eb978439957964032cc3118a8bea43d7f4";
-          sha256 = "0328yis2hwzsgdi6rkrj5yhl5qlz48grnqkp3y56xyb6wf25cn96";
+          rev = "4cf114c95fb49ad75eb6916f678b45b04bad8122";
+          sha256 = "0gx9y5q1xb9d30yf1dcvmh9ixynr5cr5qk25pjnrhmblkhl5b2nz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi";
@@ -90788,6 +92673,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    seml-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , htmlize
+                             , lib
+                             , melpaBuild
+                             , simple-httpd
+                             , web-mode }:
+      melpaBuild {
+        pname = "seml-mode";
+        ename = "seml-mode";
+        version = "20190530.2242";
+        src = fetchFromGitHub {
+          owner = "conao3";
+          repo = "seml-mode.el";
+          rev = "58eea4c2009b3e747d8e68a38417fcbf8a243c4b";
+          sha256 = "0q2anb8f43wsp1n021wx700f52w682av6zql9ivs4k7bsf9ldwz2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8b8d877ba3164bf20f7f0e56ea564b88f493e/recipes/seml-mode";
+          sha256 = "0fmfnglxm57mhynzdsgs14qaxsw3nf83qbz3adknv63qymbfhgbw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs htmlize simple-httpd web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/seml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     sendto = callPackage ({ emacs
                           , fetchFromGitHub
                           , fetchurl
@@ -91627,12 +93541,12 @@
       melpaBuild {
         pname = "shimbun";
         ename = "shimbun";
-        version = "20190404.1600";
+        version = "20190516.2216";
         src = fetchFromGitHub {
           owner = "emacs-w3m";
           repo = "emacs-w3m";
-          rev = "28f7af52ec09f7c6feb608431f0afae59c69d4fa";
-          sha256 = "0njaf3pwilcxac1hd1w7ilrcmjv2iaxb4zzkwjnk73f1smgcxy2m";
+          rev = "0cabba57549069a1dbd8207f97d439414da1dd51";
+          sha256 = "16ixcr3jknfqpkim00hiv5pnybldcc23379gbbjl6va0fmh2qgfw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a423647410357f0e63afba5b52bbe880fce969/recipes/shimbun";
@@ -91723,29 +93637,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-marks = callPackage ({ fetchFromGitHub
-                              , fetchurl
-                              , fm
-                              , lib
-                              , melpaBuild }:
+    show-eol = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
       melpaBuild {
-        pname = "show-marks";
-        ename = "show-marks";
-        version = "20130805.749";
+        pname = "show-eol";
+        ename = "show-eol";
+        version = "20190516.1957";
         src = fetchFromGitHub {
-          owner = "vapniks";
-          repo = "show-marks";
-          rev = "97609566582e65eed0d0a854efa5c312f209115d";
-          sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
+          owner = "elpa-host";
+          repo = "show-eol";
+          rev = "9342099be0e79d80a808c13fb1b438cc11598dcf";
+          sha256 = "1d5xb2b9ci1i0jv3vhad922zvvbixnybnhqhxr5vyj8gcnwn01rs";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks";
-          sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ae308e8c251b7a6942f7d9f739830986f7315ea/recipes/show-eol";
+          sha256 = "1k0ihimb4acc30qfmjj3hfpxknif3gzj0iikz23gizrsks7n5p1g";
           name = "recipe";
         };
-        packageRequires = [ fm ];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "https://melpa.org/#/show-marks";
+          homepage = "https://melpa.org/#/show-eol";
           license = lib.licenses.free;
         };
       }) {};
@@ -91880,6 +93794,37 @@
           license = lib.licenses.free;
         };
       }) {};
+    shroud = callPackage ({ bui
+                          , dash
+                          , dash-functional
+                          , emacs
+                          , epg ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
+        pname = "shroud";
+        ename = "shroud";
+        version = "20190524.204";
+        src = fetchFromGitHub {
+          owner = "o-nly";
+          repo = "emacs-shroud";
+          rev = "a7706ee48ef8dc67e6240377c61946c73a7fae3a";
+          sha256 = "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e4334a47a173e9cfb1e803d5781317da27702d7/recipes/shroud";
+          sha256 = "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg";
+          name = "recipe";
+        };
+        packageRequires = [ bui dash dash-functional emacs epg s ];
+        meta = {
+          homepage = "https://melpa.org/#/shroud";
+          license = lib.licenses.free;
+        };
+      }) {};
     shut-up = callPackage ({ cl-lib ? null
                            , emacs
                            , fetchFromGitHub
@@ -91915,12 +93860,12 @@
       melpaBuild {
         pname = "shx";
         ename = "shx";
-        version = "20190309.1056";
+        version = "20190602.1425";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57";
-          sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2";
+          rev = "6b53896ad2d80f22454ae8b09dbaa7c352e4e37f";
+          sha256 = "1ps4by78ly7incc4s8767wbmcqfw9him3xdaif5akzg4qqymcayb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -91984,23 +93929,22 @@
         };
       }) {};
     side-notes = callPackage ({ emacs
-                              , fetchFromGitHub
+                              , fetchgit
                               , fetchurl
                               , lib
                               , melpaBuild }:
       melpaBuild {
         pname = "side-notes";
         ename = "side-notes";
-        version = "20190403.137";
-        src = fetchFromGitHub {
-          owner = "rnkn";
-          repo = "side-notes";
-          rev = "2319ee180a4a67175b9e95322cd30b3ac70a9bdf";
-          sha256 = "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2";
+        version = "20190523.2132";
+        src = fetchgit {
+          url = "https://git.sr.ht/~pwr/side-notes";
+          rev = "6f14e0bc13f586ebfb4c801285aec0d5aac60ac9";
+          sha256 = "1s2yh4n9ik03gca1gp1fqdjax9wj8v5xjsj9kysns99nkg8mxy97";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes";
-          sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9829ece8343a2a4309b5f7f5e324f0a1145e1e83/recipes/side-notes";
+          sha256 = "1adan5v04awjxahmn2ndqj8fns5hkk4am5jnhic9y036qdcpd9mv";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -92016,12 +93960,12 @@
       melpaBuild {
         pname = "sift";
         ename = "sift";
-        version = "20190104.917";
+        version = "20190521.123";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "sift.el";
-          rev = "16bdffd2edf9300db50a81dc0b456da7ad6da86c";
-          sha256 = "0wg7dnn721ff3h22s8bs2g4alrixzrry1m509md20qdklz9d6iwy";
+          rev = "33b2c9ff964fe53bb55b37429faaa4e903bead7a";
+          sha256 = "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
@@ -92251,12 +94195,12 @@
       melpaBuild {
         pname = "simple-paren";
         ename = "simple-paren";
-        version = "20190315.1156";
+        version = "20190603.1136";
         src = fetchFromGitHub {
           owner = "andreas-roehler";
           repo = "simple-paren";
-          rev = "2530d5419301c80bc584ee4888ce2d048fba8add";
-          sha256 = "0zcak1x2b7y0g29c0njblspawxjxkbkgyn3100wawfcswyav3nri";
+          rev = "8b03b71303070b05d5def3c8a2564e4b5e67098a";
+          sha256 = "1g508x8hf8zlvi6kz9r8jxavl11y47y2gjldjnc6z6ijiqisy3dm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren";
@@ -92601,12 +94545,12 @@
       melpaBuild {
         pname = "slack";
         ename = "slack";
-        version = "20190402.2337";
+        version = "20190519.16";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "53816e274ce1c65fdfbd93fe0076fdaf79bbfbf2";
-          sha256 = "0z9cbajam923v07fji0zmn240z3dgqv77csn9aanv5qpi6xkm1sp";
+          rev = "9ffc865097f5e4d779e2dace43b00a4a10305719";
+          sha256 = "1aagdhc68dcx8jnv7vbrl0vrz4dm28r0w5ml3z3bdvx0ng7ffir2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -92679,12 +94623,12 @@
       melpaBuild {
         pname = "slime";
         ename = "slime";
-        version = "20190319.230";
+        version = "20190531.834";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "6945edd4a6532e84caca53fbb44b09ca14cd50cc";
-          sha256 = "1g6pq3xri7r54whradbrc1kbsj96x65x3nqcpy2a05h4wqbn8psk";
+          rev = "01531b09debe1199d9726ed91c4672cd9587fb58";
+          sha256 = "12gi3zfn688k61szjyq2czhppwydlxbghpdzsjkcm9c8yyn4md7y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime";
@@ -92736,12 +94680,12 @@
       melpaBuild {
         pname = "slime-docker";
         ename = "slime-docker";
-        version = "20181126.624";
+        version = "20190429.1857";
         src = fetchFromGitHub {
           owner = "daewok";
           repo = "slime-docker";
-          rev = "8b511c8c922f6944867f3cfaa7268988384064f1";
-          sha256 = "0k7rvvyrrbbg9z46bxvzc4z4lnn9hjmv23m47ag191cqgag6r4fq";
+          rev = "151cec4a11965cdc00d231900a50f2c9f455fce2";
+          sha256 = "1sp6qi2i1cl41ga9y6fwf7q855y0b59fcbxdiggdhigwd5zslzcv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -92754,6 +94698,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    slime-repl-ansi-color = callPackage ({ emacs
+                                         , fetchFromGitLab
+                                         , fetchurl
+                                         , lib
+                                         , melpaBuild
+                                         , slime }:
+      melpaBuild {
+        pname = "slime-repl-ansi-color";
+        ename = "slime-repl-ansi-color";
+        version = "20190426.714";
+        src = fetchFromGitLab {
+          owner = "augfab";
+          repo = "slime-repl-ansi-color";
+          rev = "fdd0c7a75a217abca2ff16ab9281d55f392bd841";
+          sha256 = "0d3q9js5vybddniyirvvabljmxasgdqimjdpy7pn48hh4rd875di";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/07fd791e2674ce3c773e2c213e045d6c7d12d848/recipes/slime-repl-ansi-color";
+          sha256 = "187xs5gfwjpkg31zhrrivjkp0j8wrr2xbjszr1hayzx5c8d7yz39";
+          name = "recipe";
+        };
+        packageRequires = [ emacs slime ];
+        meta = {
+          homepage = "https://melpa.org/#/slime-repl-ansi-color";
+          license = lib.licenses.free;
+        };
+      }) {};
     slime-theme = callPackage ({ emacs
                                , fetchFromGitHub
                                , fetchurl
@@ -92917,12 +94888,12 @@
       melpaBuild {
         pname = "sly";
         ename = "sly";
-        version = "20190315.1523";
+        version = "20190523.1101";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "sly";
-          rev = "0a622da46251e620433d76f5ed98e40ef375ee01";
-          sha256 = "0zzda1fjskgkr162j3zi7y23zi3k4kg1hbcpcb1jyyp0bq8vwla5";
+          rev = "ff9741599ab32b2182402307ad79049330669bf9";
+          sha256 = "098sc5h1ajqp68y0sfs2lf9a5jlr9s8v0mh2cvk87nyl77ld9crz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/974d8812a4c5e45221ce3c32ae72c15ed29665c3/recipes/sly";
@@ -92935,6 +94906,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    sly-asdf = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , sly }:
+      melpaBuild {
+        pname = "sly-asdf";
+        ename = "sly-asdf";
+        version = "20190428.1547";
+        src = fetchFromGitHub {
+          owner = "mmgeorge";
+          repo = "sly-asdf";
+          rev = "f6e434fad349ca54b151fd46db87423219d2b40c";
+          sha256 = "09giv87ys3gcmvnp8f60gg96v6ibcqwj3ysavr1jjh7nh047pjyi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/09e59410bebffb8ab7e3236ee97f692665833f31/recipes/sly-asdf";
+          sha256 = "1fn1gm439x1axmslgcxinj8lx2vh7jq2qjbxpyjgv5lj9wia0bzi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs sly ];
+        meta = {
+          homepage = "https://melpa.org/#/sly-asdf";
+          license = lib.licenses.free;
+        };
+      }) {};
     sly-hello-world = callPackage ({ fetchFromGitHub
                                    , fetchurl
                                    , lib
@@ -93124,12 +95122,12 @@
       melpaBuild {
         pname = "smart-compile";
         ename = "smart-compile";
-        version = "20180315.2030";
+        version = "20190522.425";
         src = fetchFromGitHub {
           owner = "zenitani";
           repo = "elisp";
-          rev = "16ebc3c570f1949b8198fcc8663d6d26df32717a";
-          sha256 = "0i5g7inbr90l3n1rsf4152ax4wkbw2q41ks9j3x6a956zxn8q92w";
+          rev = "366a4cdab1ad20105910bc24c4f3e4f8734e4eae";
+          sha256 = "1kk7ya14p4vpw31rzcgwq0pmay0wm3pg2j70fv5mms9ala1jyhsy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
@@ -93277,12 +95275,12 @@
       melpaBuild {
         pname = "smart-jump";
         ename = "smart-jump";
-        version = "20190216.1206";
+        version = "20190422.1858";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "smart-jump";
-          rev = "f8f98f1c032352f5d8d465a45b3b5b49cd9247d6";
-          sha256 = "00v6a04ywxvikfwwgf85hr4p77xlm7shyai558ww3vf2gyhw1ily";
+          rev = "7df77da872dc836dbf032388fc6de82dbc9fa22c";
+          sha256 = "0w8jfsm6k2ayk0hg0imsm2vv8y5im5crlij9zi18iwa1mrqkmhsp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump";
@@ -93329,12 +95327,12 @@
       melpaBuild {
         pname = "smart-mode-line";
         ename = "smart-mode-line";
-        version = "20190327.1241";
+        version = "20190527.456";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "268319aafee710ce8916c8612a5a8dcdce55fc1b";
-          sha256 = "0j1m5xms3jgkd19baqnsyx2dzrc85c17nx49d1wklicn17kkawyb";
+          rev = "999be065b195f2eddb4e1b629f99038d832d44b7";
+          sha256 = "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -93592,12 +95590,12 @@
       melpaBuild {
         pname = "smartparens";
         ename = "smartparens";
-        version = "20190128.947";
+        version = "20190522.1534";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "4d1571019080fec63b11474db32380b5fa4eb418";
-          sha256 = "0r9lf7vsaw8z1dydi850azha1ig1ldid8yn6zx1da2fvfpgyly7v";
+          rev = "d3184b789177da42e2664c79d6c777c1ad69cdfd";
+          sha256 = "029amkz34ma3hdji4d1cm29b893x43vxdrsymys7h38nj86fmgpa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -93998,12 +95996,12 @@
       melpaBuild {
         pname = "snakemake-mode";
         ename = "snakemake-mode";
-        version = "20181007.1950";
+        version = "20190411.1928";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "0cadd2bbd20aae1555561e81ed72fec43ec7296e";
-          sha256 = "1i4cwdyhfyawfx07i63iqdx524mlphgbrl44wqqnnxrbdqm0h534";
+          rev = "d49c6580e5e01a5e80198f4026caf1d5a717f8a0";
+          sha256 = "0lxxd0a735sy4igncf6f0ljk2wy38x2pm1yq90gxymwi26j75ram";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -94148,6 +96146,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    soar-mode = callPackage ({ fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "soar-mode";
+        ename = "soar-mode";
+        version = "20190503.1143";
+        src = fetchFromGitHub {
+          owner = "adeschamps";
+          repo = "soar-mode";
+          rev = "ebb79789cd35530aea2c6d0eb4f4b280e97107d4";
+          sha256 = "1hy77nb1mv6np9424z8ri0rxjzh0pjizyx7vajxwd6m1zcv9xixq";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/818113ef6f93cc86fd30441d508012e5baa71893/recipes/soar-mode";
+          sha256 = "0jm4vllbppzs2vvkky96hwdv581142dxdfssrp6wsd56j38nr9sd";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/soar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     socyl = callPackage ({ cl-lib ? null
                          , dash
                          , fetchFromGitHub
@@ -94262,12 +96285,12 @@
       melpaBuild {
         pname = "solaire-mode";
         ename = "solaire-mode";
-        version = "20190312.2257";
+        version = "20190424.1742";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "d648ad7c06554c14077335b631410df989536e97";
-          sha256 = "0ajwf4ymqpskxjmd2fnr5g66wdncq1rsiv50yk3z0zxls6jap7d6";
+          rev = "77b12d27ae733adc6e8762b9e276e40c94d31f92";
+          sha256 = "1nz381ka62885sq81qzh2gnm1qbd6d13z6pksqnhivjs7qn0nnlq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -94290,12 +96313,12 @@
       melpaBuild {
         pname = "solarized-theme";
         ename = "solarized-theme";
-        version = "20190219.1751";
+        version = "20190513.5";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "74c6b5acd6892faeafd08029898663d81ab0a4d5";
-          sha256 = "03pkc5bads459sx5a562ikpf5a6py0iqv7lihva7rqa8dj43jx0h";
+          rev = "c42a932e5c467c1ce12c42276d35bfb8f666e96d";
+          sha256 = "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -94817,12 +96840,12 @@
       melpaBuild {
         pname = "spacemacs-theme";
         ename = "spacemacs-theme";
-        version = "20190116.1307";
+        version = "20190527.1809";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "3eae3726faf39aa2a9e4c919a657f335282fefb7";
-          sha256 = "0csj0mygv3mlvlxi600i5pkxjirqg58fa7rsh205733iyqxpff93";
+          rev = "89f8c9e20e4554ede5599d36e81496256708d88c";
+          sha256 = "15w2gzhhwqgyqd7nrbjgibw6cfn79453kialgs71wbydiv8q3aqf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -94999,12 +97022,12 @@
       melpaBuild {
         pname = "speed-type";
         ename = "speed-type";
-        version = "20190227.2200";
+        version = "20190526.253";
         src = fetchFromGitHub {
           owner = "parkouss";
           repo = "speed-type";
-          rev = "d905b79ba3c80c556562ce18a96760202826eedc";
-          sha256 = "1pwi9f7iv604cv91j05r77bac2g17daya621g11lmfk1w09k35d5";
+          rev = "c98f9ebd4abf96db967f9c0dff9ccfa4b7f4035b";
+          sha256 = "1hjpxr5nb08g5vz7wmlf3zxazvj419528rfwdpkpbmdsjmy67fbf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
@@ -95527,12 +97550,12 @@
       melpaBuild {
         pname = "sqlformat";
         ename = "sqlformat";
-        version = "20190113.1750";
+        version = "20190420.1556";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "sqlformat";
-          rev = "e9f5446f5a11304cfd1315d499838016752410c5";
-          sha256 = "1wj9ls0858wxc9vrkzgs46j45gm0s7f4yhsaki64dm44l02l5xsy";
+          rev = "f7f46be6f06b83642c312151f3b5276f8830d9d7";
+          sha256 = "00z60y08likwqfd27ibvzhy62qs29i4d4y4vq3p3slx43rfdgvxs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6bdaa1ccae12f2ea779ac6989607d8027feac2c9/recipes/sqlformat";
@@ -95628,12 +97651,12 @@
       melpaBuild {
         pname = "srcery-theme";
         ename = "srcery-theme";
-        version = "20181231.503";
+        version = "20190526.527";
         src = fetchFromGitHub {
           owner = "srcery-colors";
           repo = "srcery-emacs";
-          rev = "561d83d5bbd4c1c939ad9f52863e75b969af320d";
-          sha256 = "19zxc4f559s6x0qlkb181h1wpyd0mrdl08dc3fhn9h1hg1lmn11p";
+          rev = "a47a40c7c5d39d251bf15e45f184565c5240b33e";
+          sha256 = "1i3c7y0a7dzvb3c8pk69gvh33945bhm00j0fwl49yh7hg2d9w118";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme";
@@ -95706,12 +97729,12 @@
       melpaBuild {
         pname = "ssass-mode";
         ename = "ssass-mode";
-        version = "20180428.1339";
+        version = "20190520.1949";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ssass-mode";
-          rev = "5f36a169a1ad497f1d7a465be386ffb5e1f80bcf";
-          sha256 = "1n1q26p52i6c6i8svkr0bn91hliqm540y1fcz3jci8w2ws0s5x11";
+          rev = "c2c610abd85fecd171466bf5a9a4943bd62ffda5";
+          sha256 = "0vbh0nqbc7j2xjksk0xdfsrqfxd64fcqyladgk2v3jw0qply6ydw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
@@ -95809,12 +97832,12 @@
       melpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "20190208.54";
+        version = "20190502.2208";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "a57ae0c5906277e3a293ff1396325e26345bc475";
-          sha256 = "0434c0r8ar8g4qn7isql6qivy1lf7jjdzr49gabxh8v8m1ysxy18";
+          rev = "009e9f81c8fc199e77815928bc8915643b019b32";
+          sha256 = "0y3jwn3qkmibrhgcbq6xcbfsgqjng6xi7fx1iimldhv14gg83gzq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -96960,6 +98983,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    sv-kalender-namnsdagar = callPackage ({ fetchFromGitHub
+                                          , fetchurl
+                                          , lib
+                                          , melpaBuild }:
+      melpaBuild {
+        pname = "sv-kalender-namnsdagar";
+        ename = "sv-kalender-namnsdagar";
+        version = "20190421.821";
+        src = fetchFromGitHub {
+          owner = "matsl";
+          repo = "sv-kalender-namnsdagar";
+          rev = "fff970f49c77abfc69e37817f25a939818420971";
+          sha256 = "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f9327ea6ae9f4eaeeb6c0fb40bad77e403b4f55c/recipes/sv-kalender-namnsdagar";
+          sha256 = "1l89y6bjkw8px89qaw1ldfp6qmbm5nq09i6pr32n0k553670v4sr";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sv-kalender-namnsdagar";
+          license = lib.licenses.free;
+        };
+      }) {};
     svg-mode-line-themes = callPackage ({ fetchFromGitHub
                                         , fetchurl
                                         , lib
@@ -97129,12 +99177,12 @@
       melpaBuild {
         pname = "swift-mode";
         ename = "swift-mode";
-        version = "20190205.32";
+        version = "20190524.2316";
         src = fetchFromGitHub {
           owner = "swift-emacs";
           repo = "swift-mode";
-          rev = "13628495bdb2dcf30eea04412e1d3e3c80b8e999";
-          sha256 = "1rl2rh1mzy7ig5wsd63lk3plrw7ivf2gir6w0ls2k0n2qxav3qb1";
+          rev = "3b6bdad3870ecb87190cfec993bdae0545a8dbaa";
+          sha256 = "1x68fli13nd8mwjzc5d7sk2kkjrw22z9xl3srvzh7qqfm8pwcd2r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode";
@@ -97182,12 +99230,12 @@
       melpaBuild {
         pname = "swiper";
         ename = "swiper";
-        version = "20190407.1029";
+        version = "20190604.308";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "11b00073cb348aedf1d648a991bab71e20178268";
-          sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n";
+          rev = "c11797a32f5456f23663d3b725d1fe8315867000";
+          sha256 = "0wnmya8cj7zy5kr8cw5yjddmshcvwc2dz8qnzkkxx9hxk5312h63";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -97371,12 +99419,12 @@
       melpaBuild {
         pname = "symbol-overlay";
         ename = "symbol-overlay";
-        version = "20190305.843";
+        version = "20190525.1925";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "88c3ed02a06bea87ab7e41918b39e07bb3fc255b";
-          sha256 = "0yr2n6vld3shlcsmfvwgkrnw0zxry0bfkzd8y1ylfr826qll2cmv";
+          rev = "ff16ccf472507ef4a4d8303e79bb12bf25345714";
+          sha256 = "1fik6k1fil2rl4z3dasm4c0jxjpc5f1nqqvmm1hn3il4263p0qsc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -97609,12 +99657,12 @@
       melpaBuild {
         pname = "syntactic-close";
         ename = "syntactic-close";
-        version = "20181026.931";
+        version = "20190513.247";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "426975d73c474eb4e6a0af20f34455aac6e89610";
-          sha256 = "1gyhz4mzd5gcfy9mx65aym8abz4wfdgy229aj1ng1c0j32fjk9rm";
+          rev = "2bd46845b664ae828c8b973839ef454cde501028";
+          sha256 = "1r1ia1yw43vvyk62d6r1k55zcz185777s10ix9bg3fllczdbyzcz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -97919,12 +99967,12 @@
       melpaBuild {
         pname = "tablist";
         ename = "tablist";
-        version = "20190129.1013";
+        version = "20190413.2343";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "tablist";
-          rev = "af8703139d80be54b6c3077dd3e54ca7f3087043";
-          sha256 = "15gnwainawzaidhclfqa2pyp6hgh172xxx127hvq6fabc1zm4ykg";
+          rev = "8079801527da1f596bc942162026328d7bdf6ad9";
+          sha256 = "11bm7z4kdxrq6pv93zwrmg729mnvqvhgmna9r2wqx2wyf87vdh00";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist";
@@ -98123,12 +100171,12 @@
       melpaBuild {
         pname = "taskpaper-mode";
         ename = "taskpaper-mode";
-        version = "20190225.703";
+        version = "20190516.812";
         src = fetchFromGitHub {
           owner = "saf-dmitry";
           repo = "taskpaper-mode";
-          rev = "4b15b0f473a42ff40742cd790d06a08452276bef";
-          sha256 = "1visq29mg5a0czx4bgq7jzqk4xbqbdhsxv85n4cji8h8rzagn21c";
+          rev = "0f31dca5dc87b5848736fb5ad574947940fd7a03";
+          sha256 = "05mv8aii1d0r1ayhj4wfbkrj0yd31jc88cv4d8rk9jc7f1zg73fd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode";
@@ -98389,12 +100437,12 @@
       melpaBuild {
         pname = "telephone-line";
         ename = "telephone-line";
-        version = "20190127.723";
+        version = "20190424.1234";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "17901f39119702cb6754ae6907549c7b795fe747";
-          sha256 = "05mys10x3cn39b5ddn6ic2x9kh74gwm3g478bc3gbia5x5acl11c";
+          rev = "408e05e105e8e521735221f4c98fc358e007df3b";
+          sha256 = "123fxr4pjm7z3pidrwgcalb99s0vq3d6imkwgla6fyqyyn9wvag2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -98689,12 +100737,12 @@
       melpaBuild {
         pname = "term-run";
         ename = "term-run";
-        version = "20190317.2055";
+        version = "20190529.43";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "term-run-el";
-          rev = "72db83728c22314522bdba692b145f48711052a0";
-          sha256 = "149vska920b4c18gij7jgwyr8flzlym719jxpjch8m2bvwiya0dk";
+          rev = "fe8bf58814b167f887aaef98a148b8d5d8a11d3f";
+          sha256 = "0jzk0b07rj5a7va6nc93sjd4zii228gg63v1q49wg0hz2x2yjmfl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run";
@@ -99062,12 +101110,12 @@
       melpaBuild {
         pname = "texfrag";
         ename = "texfrag";
-        version = "20181001.53";
+        version = "20190508.2138";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "texfrag";
-          rev = "87ebd2653c39abe0b02a91ab2182e6fff562f6c7";
-          sha256 = "0fi9cih597g6iigrvdyfxa9cc3irsvfcbzf74fkp62ggpmqlal90";
+          rev = "270a8a4b5dadddc5b226d9a9c6c7868ea6bfe86f";
+          sha256 = "18ahbksxg1i3gvsayx2mhkjd1p75c60x5f8d9a3abm4h50gs5mvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag";
@@ -99259,6 +101307,7 @@
         };
       }) {};
     theme-looper = callPackage ({ cl-lib ? null
+                                , emacs
                                 , fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -99266,24 +101315,51 @@
       melpaBuild {
         pname = "theme-looper";
         ename = "theme-looper";
-        version = "20190402.1924";
+        version = "20190430.1827";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "a9195e1899dcd7dd5c630d053841c1ab958f1728";
-          sha256 = "1mw2w09fr4s3621q4xb1027yf268hi1lc1ypabhgrckclih81aiy";
+          rev = "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1";
+          sha256 = "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
           sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/theme-looper";
           license = lib.licenses.free;
         };
       }) {};
+    theme-magic = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , seq }:
+      melpaBuild {
+        pname = "theme-magic";
+        ename = "theme-magic";
+        version = "20190502.1527";
+        src = fetchFromGitHub {
+          owner = "jcaw";
+          repo = "theme-magic";
+          rev = "6e842aac9204f3561a9051ffd842a82f69960d73";
+          sha256 = "0fqwbn1blsrx11aic7i228f6dai7awyc4qh51dl03yrpw330b3zm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/321c8ea8e095aa55d12f8dfb07001b9398adcbc5/recipes/theme-magic";
+          sha256 = "01vkwdfbhh7ifk1ziqmz257mjgn3ijmcva42ay4ih1n6268lr7k5";
+          name = "recipe";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/theme-magic";
+          license = lib.licenses.free;
+        };
+      }) {};
     therapy = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
@@ -99529,12 +101605,12 @@
       melpaBuild {
         pname = "tide";
         ename = "tide";
-        version = "20190321.911";
+        version = "20190507.1033";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "f1a3d411a3b9b7992d24f53e6afa02840a652780";
-          sha256 = "19m96firhn3rxjxxcn8d9sbbprhrmxg99lc5k665pdvdmdf1kbvx";
+          rev = "5224eae7da0a286d94a394620f9bbc8c7446a268";
+          sha256 = "0y8mpn6wlmi064crhszir1i1r2cj7dpb2i2c09rrbj1yjkgc92ri";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -99884,23 +101960,24 @@
                         , fetchFromGitHub
                         , fetchurl
                         , lib
-                        , melpaBuild }:
+                        , melpaBuild
+                        , request }:
       melpaBuild {
         pname = "tldr";
         ename = "tldr";
-        version = "20180122.312";
+        version = "20190425.49";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "398b197c8d2238628b07e1b32d0f373876279f4c";
-          sha256 = "0iq7qlis6c6r2qkdpncrhh5vsihkhvy5x4y1y8cjb7zxkh62w33f";
+          rev = "2ff0834bc58590f98bfece3efc5656d1b47c325d";
+          sha256 = "1qwx4hmqj6fbpmv230kgdv2qwv5jfmbf5kvdhcq48p4rak1r30qj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs request ];
         meta = {
           homepage = "https://melpa.org/#/tldr";
           license = lib.licenses.free;
@@ -99966,12 +102043,12 @@
       melpaBuild {
         pname = "toc-org";
         ename = "toc-org";
-        version = "20181108.821";
+        version = "20190603.103";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "ebff38bfa4cc95476a20a349014e2d1862ff4647";
-          sha256 = "0ml075741iw9n4apiy9iv30wx4bgzpn6iisrzx3mxjl85kgmlmf2";
+          rev = "5ce7c249207b617c72febb27dbad7076342c1afd";
+          sha256 = "04yl9zqv6jrqfms0vxlh3zpsv1dxmx1qh0a2krzs3mrdplq4dzjm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -99984,6 +102061,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    todoist = callPackage ({ dash
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , org
+                           , transient }:
+      melpaBuild {
+        pname = "todoist";
+        ename = "todoist";
+        version = "20190604.728";
+        src = fetchFromGitHub {
+          owner = "abrochard";
+          repo = "emacs-todoist";
+          rev = "5f3fe44f32466c89db09625965c0c5706b42a534";
+          sha256 = "0qfv6zlw4rk6fri48s1yqg1x6x5q7rk82a28ssclbvx8q9am15wh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a75eb89bfeb0b7362bf6d2ffaf6b4750984b3a/recipes/todoist";
+          sha256 = "0fspvqr0m36mxbrnkql1gl8hwlv8qxd48f632zqzylj0vsygaxhf";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs org transient ];
+        meta = {
+          homepage = "https://melpa.org/#/todoist";
+          license = lib.licenses.free;
+        };
+      }) {};
     todotxt = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -100569,12 +102675,12 @@
       melpaBuild {
         pname = "tramp-term";
         ename = "tramp-term";
-        version = "20180223.727";
+        version = "20190509.1219";
         src = fetchFromGitHub {
           owner = "randymorris";
           repo = "tramp-term.el";
-          rev = "7c29f888de0385a676dbf9a4e17bac0111f5c10a";
-          sha256 = "1ch9y632kggl3q6yx3g685j3dfbhy7yiwqh8cbxs3wja3rvml8xa";
+          rev = "27b370f3a43638d6845b3b3a93c3d7a806bd3b66";
+          sha256 = "1jsr7j6wc0qzbcb0d7ljvf1qyvsjcpfb9wnhhz587ygcd4yvfqfv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3/recipes/tramp-term";
@@ -100622,12 +102728,12 @@
       melpaBuild {
         pname = "transient";
         ename = "transient";
-        version = "20190319.1228";
+        version = "20190528.104";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "transient";
-          rev = "9e30038d2d69e4ad0f3333777137af52e4771442";
-          sha256 = "0mp4sfnaznqy5klslgnma5aj7k07r1qka2qnr48qi4shgq3s23jy";
+          rev = "8bfa489644ba5c287f1775b317a5755a3f232e48";
+          sha256 = "08iyw5sww0c3glwykc9030nxda23d5agi8m91rxyn7740vviyv77";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7bfefdf4423d63706a6dcf128886ca6b514e6b/recipes/transient";
@@ -100787,12 +102893,12 @@
       melpaBuild {
         pname = "treemacs";
         ename = "treemacs";
-        version = "20190405.748";
+        version = "20190601.1554";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "32a241d0aaa5c713815a1a040eea52a5c2b01589";
-          sha256 = "0s6znv09y1ngca5hxw85niqhp5ddg9f0w88qjkp2ryva1q1wc0c3";
+          rev = "c639085595485ce749d150f65589d26d38b3aab9";
+          sha256 = "10vddvb9n35w0v4q79y5bn0fr33380w75r90484kirvs5ilq896h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs";
@@ -100814,12 +102920,12 @@
       melpaBuild {
         pname = "treemacs-evil";
         ename = "treemacs-evil";
-        version = "20190214.1221";
+        version = "20190416.2225";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "de1ba5217ca4c41fc36d405832b749b6fffd2b82";
-          sha256 = "0wk280qs99py3s3lykm3pd3v3nbml1c9hkal29cx0475m12fc5lw";
+          rev = "39364c8f3392ffe93035169f68128f8eeaaaa2e7";
+          sha256 = "0y69n7c55d5bf0j1qicxw6pjjzbn4rff773ldlr5hwfi485wc13y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-evil";
@@ -100871,12 +102977,12 @@
       melpaBuild {
         pname = "treemacs-magit";
         ename = "treemacs-magit";
-        version = "20190327.2335";
+        version = "20190501.2241";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "4e5f182eb11c5e4ee752de4972a92adab1320d29";
-          sha256 = "189gvc5v0ggy4xm81f0467al20qzbfb0gw2vg4l7y07bf3fzzvq8";
+          rev = "3f98c6af32b355f2cf62e8ef174a2c29f3de76ff";
+          sha256 = "09z1mrvnwj6inmg4k8m6y4cw09yak0zz2l9yybp2w3r3jvrnn56v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1719c6bfc346e63f58221ea2c6e625b98f4ea368/recipes/treemacs-magit";
@@ -100898,12 +103004,12 @@
       melpaBuild {
         pname = "treemacs-projectile";
         ename = "treemacs-projectile";
-        version = "20190402.2237";
+        version = "20190416.830";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "2392ac22caa196ed6850f0accf9d7cd24b11375d";
-          sha256 = "0d1k9nmvycbw46b4fjsj15srnmdahfklrh3c6r6sr95ngwl17dic";
+          rev = "7ba9dcaaf850640e805f29d0d64aa254ec544c04";
+          sha256 = "1l4llp9znrxyvcy60bcx1kr1zzxl9jw0w7pdi6n1v6idbs4rvjrs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-projectile";
@@ -100953,12 +103059,12 @@
       melpaBuild {
         pname = "trident-mode";
         ename = "trident-mode";
-        version = "20190329.433";
+        version = "20190410.1336";
         src = fetchFromGitHub {
           owner = "johnmastro";
           repo = "trident-mode.el";
-          rev = "a128f766e1138e6e04146312b7c8ebbad0dae131";
-          sha256 = "141gvvwzql7pnv0d161cj2hpvpkav27lp1gdk1ilf45b3fqqqa87";
+          rev = "109a1bc10bd0c4b47679a6ca5c4cd27c7c8d4ccb";
+          sha256 = "0blbxjaddzhkvzlys46yrzszywmyjkmfhwks52v4laya76rgxm45";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/trident-mode";
@@ -101186,12 +103292,12 @@
       melpaBuild {
         pname = "tuareg";
         ename = "tuareg";
-        version = "20190407.807";
+        version = "20190604.718";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "9157f25980dede0599c6f9a42cc492081752f515";
-          sha256 = "0lvjh3a1sl1y29hsfh8dm7hjf25q0mmagdiv8bm07a680wgfii9x";
+          rev = "b6271c4496a29b74ad1e47d6802b9cfba415fe77";
+          sha256 = "02a1bgaakh89s40adc363jmgrs5dkswmgqlwjkq0blyj01rih2yi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -101883,12 +103989,12 @@
       melpaBuild {
         pname = "undo-propose";
         ename = "undo-propose";
-        version = "20190322.917";
+        version = "20190408.2336";
         src = fetchFromGitHub {
           owner = "jackkamm";
           repo = "undo-propose-el";
-          rev = "036e66c1ac4b0358b34727d2c9b65853347dad89";
-          sha256 = "1ah2x0fwf2ybz3i4cjs19fmx7aq1xfgnh4x623qy12v7ab4pvd3m";
+          rev = "5f1fa99a04369a959aad01b476fe4f34229f28cd";
+          sha256 = "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/308eec15ebfd301b34f0d9f019250c9089c4d6e2/recipes/undo-propose";
@@ -102581,12 +104687,12 @@
       melpaBuild {
         pname = "use-package";
         ename = "use-package";
-        version = "20190405.1347";
+        version = "20190529.1340";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "0ee88b5cac41acf974c4bedb8859931ead8bfc79";
-          sha256 = "0gv976iajc0qf9pbqyljc9mdnyirf353d3w6h38khwqmqv11p6br";
+          rev = "4aa14a4fcd5ca52b3f1bfcf5ab294173f7bbe390";
+          sha256 = "0ilizp2kdv9j792fsmndjfq33fx2c19rr2g4pgaajp1cad2pp2jw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
@@ -102717,16 +104823,16 @@
       melpaBuild {
         pname = "use-ttf";
         ename = "use-ttf";
-        version = "20181206.902";
+        version = "20190516.2202";
         src = fetchFromGitHub {
-          owner = "jcs090218";
+          owner = "elpa-host";
           repo = "use-ttf";
-          rev = "569b5df758bb85b69a98b3bed108b0735179eed9";
-          sha256 = "0ama7qqi32vp5mgsdbz6vixp6h5jhkq1m82jqrrgddcd5ih8zan1";
+          rev = "3ee594ac25f01c9c2a92e5e3f64ee078f745b861";
+          sha256 = "11zvb1vwmljk46dypsd5332z4qrl15crhjlynddmi2n7kgw4d5f5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8af853b2db58300ba1685e3547a9f96c05b04df6/recipes/use-ttf";
-          sha256 = "08bylry03q1vy1dx8vcdc4drrn4c97hr45nsz5xc0369jmfvqavs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ec27ae185c0308c445e461dc84f398483ca08c5a/recipes/use-ttf";
+          sha256 = "0gxrn05qcnf54c5895nw68088b9mngsf7sij2prwyfw0ghdl9s8k";
           name = "recipe";
         };
         packageRequires = [ emacs s ];
@@ -103104,12 +105210,12 @@
       melpaBuild {
         pname = "vc-hgcmd";
         ename = "vc-hgcmd";
-        version = "20190404.1202";
+        version = "20190506.338";
         src = fetchFromGitHub {
           owner = "muffinmad";
           repo = "emacs-vc-hgcmd";
-          rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a";
-          sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil";
+          rev = "e0f6e412c66bb8d57549d0d83dcdcab5b71db664";
+          sha256 = "0mcdyy3qcci0x78q06kilfxm14nzmwfzwg7n3njh93i2h1plr7ic";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd";
@@ -103266,12 +105372,12 @@
       melpaBuild {
         pname = "vdirel";
         ename = "vdirel";
-        version = "20181001.435";
+        version = "20190429.2324";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "dfe5f9478405b8292f85fc911db92e81b627626a";
-          sha256 = "1m1k5sfmvi3hw8l4qd4sfhi9h8wk9jd4psb62m4bjf5gbk5ld1pw";
+          rev = "255496e6808e7a3da1b0afef873dc4920c2b117f";
+          sha256 = "0zq2lqj4s3n4japfmjm56yg120l1lk7d0h1jysdp8d4mzdb2m0p0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -103867,12 +105973,12 @@
       melpaBuild {
         pname = "visual-fill-column";
         ename = "visual-fill-column";
-        version = "20190405.1454";
+        version = "20190422.1454";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "a84e36e483ac14eddf1a905e9025534a06bbc0d1";
-          sha256 = "1l7j6h9x57gr46i88h830fg4qs2yqi5r08z6vdxnx4m5gdv0ll0s";
+          rev = "772d4b25ba19f57409cd03524be0f5bfdc2e8da1";
+          sha256 = "1k4a7nqc2zxwxrcrryap2jk6bwc6ln3j6yzgkg5yyf2imsbil4br";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -103893,12 +105999,12 @@
       melpaBuild {
         pname = "visual-regexp";
         ename = "visual-regexp";
-        version = "20170228.1716";
+        version = "20190414.114";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
-          sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
+          rev = "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca";
+          sha256 = "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -104090,6 +106196,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    vterm = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "vterm";
+        ename = "vterm";
+        version = "20190502.1000";
+        src = fetchFromGitHub {
+          owner = "akermu";
+          repo = "emacs-libvterm";
+          rev = "db9679d77dda82299f7c3aab79a3f5b0967ddce3";
+          sha256 = "1rb4raq9hx86pv4pkkf5vx62x9bip1hjdx3iiwxviz6kkzfcy236";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/91a71615c0a32565e455ac81d9bc90443aa8caf9/recipes/vterm";
+          sha256 = "0nn15pz2ys4bmpyks190x22f8s2fcr793f95h0c2m67cfjmnd478";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/vterm";
+          license = lib.licenses.free;
+        };
+      }) {};
     vue-html-mode = callPackage ({ fetchFromGitHub
                                  , fetchurl
                                  , lib
@@ -104126,12 +106258,12 @@
       melpaBuild {
         pname = "vue-mode";
         ename = "vue-mode";
-        version = "20190212.1412";
+        version = "20190414.1931";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "vue-mode";
-          rev = "a2e60b0fd245f8f502025dd32399a9f10b82dcb3";
-          sha256 = "1ybz7djmcp2mpga04g7jlsfkjirajg8w5z6jx0dsyqk69rd21gln";
+          rev = "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71";
+          sha256 = "047l5nxw86dvls8an65mmqcy673n37pyli7s0d52yi07jk0lw1yx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/vue-mode";
@@ -104202,12 +106334,12 @@
       melpaBuild {
         pname = "w3m";
         ename = "w3m";
-        version = "20190404.1609";
+        version = "20190527.2050";
         src = fetchFromGitHub {
           owner = "emacs-w3m";
           repo = "emacs-w3m";
-          rev = "0b85cb2dd4deb348edff25b40e17332af49ad981";
-          sha256 = "0sjc6giwzvkndyh6r6v2jiggdqln6y8v39809dn9lj0gj9wz3p4d";
+          rev = "bbece278b90269260399458c4357ed2542c68211";
+          sha256 = "1wy6fbzkgww23bqhjhc5wlkzqjg8j68wc5v35qr0db3m1r81gnmj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85c53c48caab0845101c487e4fee7e2cda15f706/recipes/w3m";
@@ -104385,12 +106517,12 @@
       melpaBuild {
         pname = "wand";
         ename = "wand";
-        version = "20180815.331";
+        version = "20190514.356";
         src = fetchFromGitHub {
           owner = "cmpitg";
           repo = "wand";
-          rev = "5c0d4833a3afc57e4b2398250139729cc9131d16";
-          sha256 = "1d7zv5mk9mqlp40hzbf62y080a2aqvjw4x7y9frh33217r8h5b6i";
+          rev = "39ae16ad4f031c25c56b4bb82130d3815c0000f8";
+          sha256 = "1sg7xyzaw55rl85hkjn5p06cfhz6r4zlw17nrppwbfs2yvq71b6h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -104745,12 +106877,12 @@
       melpaBuild {
         pname = "web-mode";
         ename = "web-mode";
-        version = "20190301.900";
+        version = "20190521.2310";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "c8a3b33e088d2a910c000804966b804bba33f982";
-          sha256 = "04py5kqzhmgw2g9rqjlx9cffz71xbcdn1sjiglibmawqgy83chk3";
+          rev = "a67d387f41d45a1bfad694fa06a4fcd504e6e357";
+          sha256 = "1drdp51dz1jin7ycsr4nlx2nxy7h3wk67pia4ydaxsk45k3k6zpm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -104772,12 +106904,12 @@
       melpaBuild {
         pname = "web-mode-edit-element";
         ename = "web-mode-edit-element";
-        version = "20181214.509";
+        version = "20190531.152";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
           repo = "web-mode-edit-element";
-          rev = "30f0f697212a85a9b881549fc272fa7c96d3e703";
-          sha256 = "1qnk4skzj6b47h8c2yg05hc7iv8y4102izlfc490307y264rv051";
+          rev = "ad5d7e4dc2420bdd00ce65d9adffbd38a5904afa";
+          sha256 = "143xh6xc7qd88hjjmcs9fd2zlgxl0hhgx5fplhbi9zxd2ihhz0dg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
@@ -104957,12 +107089,12 @@
       melpaBuild {
         pname = "websocket";
         ename = "websocket";
-        version = "20190405.2119";
+        version = "20190407.1852";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "d34f5f095dced553eb3f30924a22a88e6763f4b4";
-          sha256 = "08qi79a0lb2d3hqbv3hanwwhhqv29z5h97v4417apnd045jl855k";
+          rev = "a5a3ddb5cad82f4259c07b7a49c95cdfe5fe6daa";
+          sha256 = "1zlazr9imm9zlf48mgrag1yaa1s224v42rc1624zvdy58n7la1sx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -105011,12 +107143,12 @@
       melpaBuild {
         pname = "weechat";
         ename = "weechat";
-        version = "20180513.310";
+        version = "20190520.851";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "bcf714e32b012c6a89d5c0a82ab3a74d454908ff";
-          sha256 = "1gm2yhz3qy55qqwf0ccrqw4nifxaig4jpdqmcl0ydx1n3myxx64l";
+          rev = "d9a13306ea8be27367f92e9202d116a88fa1f441";
+          sha256 = "1z9lav09jsmhshlk0xnbp21y9apzhd9zv08h88sdg942v0fn2fid";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -105245,12 +107377,12 @@
       melpaBuild {
         pname = "which-key";
         ename = "which-key";
-        version = "20190315.548";
+        version = "20190528.1814";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "187ac0eb8990b62d4bfd83aac10a0ae68cdd2ff5";
-          sha256 = "0zl2vksl5jk3l23z4v7m05xha6l953c84zw1ffalcqxrrcs0737r";
+          rev = "ba03e7e5bcbe3f7d95be2cfddd71454151bb98c8";
+          sha256 = "1rwnvkwa7cvp7rbsik8xlv6f01s8x7f3bcrxfbi9q3ylr1c145fl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -105263,6 +107395,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    which-key-posframe = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , posframe
+                                      , which-key }:
+      melpaBuild {
+        pname = "which-key-posframe";
+        ename = "which-key-posframe";
+        version = "20190427.403";
+        src = fetchFromGitHub {
+          owner = "yanghaoxie";
+          repo = "which-key-posframe";
+          rev = "e7f28608c7fc9507e407c6b840dff09062df533a";
+          sha256 = "0954llm57gfy3lvq8s32mqdswbv20na0v28gi61kw7023f1wg7ri";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/56ab10dc99ea4f5b207f9874124aff414d859a17/recipes/which-key-posframe";
+          sha256 = "1vpdni3ascz2zw6k1xrnw2vqnq8p30mc7d8v81qdbjb58q27l8ll";
+          name = "recipe";
+        };
+        packageRequires = [ emacs posframe which-key ];
+        meta = {
+          homepage = "https://melpa.org/#/which-key-posframe";
+          license = lib.licenses.free;
+        };
+      }) {};
     whitaker = callPackage ({ dash
                             , fetchFromGitHub
                             , fetchurl
@@ -105374,12 +107534,12 @@
       melpaBuild {
         pname = "whizzml-mode";
         ename = "whizzml-mode";
-        version = "20180711.910";
+        version = "20190512.1856";
         src = fetchFromGitHub {
           owner = "whizzml";
           repo = "whizzml-mode";
-          rev = "f457052dc5426d542ca69185a5a87905f08f1310";
-          sha256 = "15nlnch97rgpcsxv5prw4ikzl5gbnzycqmq4h1x8n16ianbgh249";
+          rev = "cb476ed0d6be52e0b8c38f5b643cbbfceda1b4ca";
+          sha256 = "1iklmzqb7200xniygd3gj3pa8d18z3pnabslsvd0k4qqvyvwnlxw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -105392,6 +107552,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    whois = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "whois";
+        ename = "whois";
+        version = "20190529.854";
+        src = fetchFromGitHub {
+          owner = "lassik";
+          repo = "emacs-whois";
+          rev = "b4cdab4d25225c6e834727a7d85cdb0d493da152";
+          sha256 = "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/719895d3db6daae5df00d4823a62fcc0f7bf2d9d/recipes/whois";
+          sha256 = "061jbk97ma21id0vpkvxdslfvs2x0wqw8c32mwhdcqjqjc74k9km";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/whois";
+          license = lib.licenses.free;
+        };
+      }) {};
     whole-line-or-region = callPackage ({ fetchFromGitHub
                                         , fetchurl
                                         , lib
@@ -105399,12 +107585,12 @@
       melpaBuild {
         pname = "whole-line-or-region";
         ename = "whole-line-or-region";
-        version = "20181211.1556";
+        version = "20190410.1915";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "whole-line-or-region";
-          rev = "d816cf566f02a37ab46b44675e9f538a63a47d05";
-          sha256 = "1b8n02dv5fyspsgi7daz6i790hp6s0lkiyj7gz8q34sf2924knvf";
+          rev = "15f17488f98868f1628a3f9d91a812b1f89bc73a";
+          sha256 = "18qzmpw41bqw2ymynya3hgn9skj13r5s6d2b14r78hvmv4bc9h9r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
@@ -105995,12 +108181,12 @@
       melpaBuild {
         pname = "with-editor";
         ename = "with-editor";
-        version = "20190224.131";
+        version = "20190511.457";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "38df9bfc2227bcb7ac4899c83a03756d5f171450";
-          sha256 = "00jz4a3004w10l6ip7wcb4zbvlsi8wbgnjpgr5p030y21q6gk5ki";
+          rev = "66bec91c859f305445b766394eb25248c1172426";
+          sha256 = "1z2h9casyw1b93ikq2mf9xixyvbl90zddf0s66lqfiyj2y376pq3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -106077,12 +108263,12 @@
       melpaBuild {
         pname = "with-venv";
         ename = "with-venv";
-        version = "20190123.1834";
+        version = "20190515.2306";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "with-venv-el";
-          rev = "4dd29606e2f29de1488c0678736b3ea92876f09e";
-          sha256 = "1i3dsvkvcmf5zmfwy988bz9wp7jbcpdrijdzcfqyy5spkqgv031c";
+          rev = "283b35e33f012657ef23e154b6bdf362377d82e6";
+          sha256 = "1s0vnsvhlcx1z5sbiyhk4iizakx4cbvjxwygdamrl8s0bnigqhfd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/555a2e49f18fbae59913459466babf8d55bd2151/recipes/with-venv";
@@ -106290,12 +108476,12 @@
       melpaBuild {
         pname = "worf";
         ename = "worf";
-        version = "20190404.323";
+        version = "20190519.948";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "57c4c1a02532fdc8c2393cec69d89ef423ed529e";
-          sha256 = "1nn2hkj0lnk81ga4976h2dbgfarnidrvcf9zfcz6gxxrsp7knh8c";
+          rev = "00d191b347397bd7ad1f5b95cfe39fa3fce9fc91";
+          sha256 = "0mp5f6hp8pqckfsi4bxcg09kcfndvsbc2nnqbgdw87bidwlzhzmy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -107331,12 +109517,12 @@
       melpaBuild {
         pname = "xquery-tool";
         ename = "xquery-tool";
-        version = "20170605.126";
+        version = "20190523.419";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "171abb0c4560c1a50e1a7def07eb61052ed30609";
-          sha256 = "1h3zqq4izzwlg22lj0813bid4j4r5m0blcx33rfak1ngw34zrcza";
+          rev = "dc939a6d779e83fa06c4486e53dbeb3846c38c02";
+          sha256 = "10rp8wbvbab2z3rcyfsb2jxyj3fphq9g25wmai8c610z4s8rldlq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool";
@@ -107409,12 +109595,12 @@
       melpaBuild {
         pname = "xterm-color";
         ename = "xterm-color";
-        version = "20190407.1110";
+        version = "20190602.501";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "749307da49323883c15d8789a958fa74607228cc";
-          sha256 = "0hh18vxkr71p4ipzly4w6jx4qy4c1zrfzz2q38vshh1x78lcm77l";
+          rev = "ff64312ad412c8b3e87a059139f288205d221e15";
+          sha256 = "1hl2n0mlnskz0f43dz41h11dkyw1pn3x9sq61w0qzjkkbbyz5cqk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
@@ -107771,12 +109957,12 @@
       melpaBuild {
         pname = "yang-mode";
         ename = "yang-mode";
-        version = "20180306.407";
+        version = "20190507.24";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "340aec635e359609b22f7e94df15af1af2b070f6";
-          sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
+          rev = "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded";
+          sha256 = "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -107797,12 +109983,12 @@
       melpaBuild {
         pname = "yankpad";
         ename = "yankpad";
-        version = "20190319.716";
+        version = "20190604.1327";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "91effa1b160cc984c99f126152690da9cba95e30";
-          sha256 = "03dqicig1axdadmj8xdzcwnnvvf3k8j0y5wjwjp6rszhzlk0ag60";
+          rev = "ae60dcdf44ef42e77db1d9ba0e0c68d063d85294";
+          sha256 = "1fpy7d47x2liysa74adk9yn7jxhyqqjfkc1mxj0prdaa6skcarza";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -107848,12 +110034,12 @@
       melpaBuild {
         pname = "yara-mode";
         ename = "yara-mode";
-        version = "20170719.2351";
+        version = "20190423.10";
         src = fetchFromGitHub {
           owner = "binjo";
           repo = "yara-mode";
-          rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c";
-          sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp";
+          rev = "cd8093b1bc4fc260462f5284b157008fefa84880";
+          sha256 = "04pl0kbx5g8wz00x7bhpi9w29wmxdmy5dhdq3j4rk3nys5njxr8v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
@@ -107976,12 +110162,12 @@
       melpaBuild {
         pname = "yasnippet";
         ename = "yasnippet";
-        version = "20181015.512";
+        version = "20190502.1514";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f";
-          sha256 = "01sjmc62rvyjysp031pwiqizk6b8i1jdxnq4v24ikx7d2f3bmpjy";
+          rev = "f056a4def80fa07132d9dd929ddedfb9d0fabd28";
+          sha256 = "1n9gdp4a06g9rzckp4m6lwjbqsi45ha5zlb7zcvzk3wkf43fd1p9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -108002,12 +110188,12 @@
       melpaBuild {
         pname = "yasnippet-snippets";
         ename = "yasnippet-snippets";
-        version = "20190316.319";
+        version = "20190513.349";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "e378404d01ad031bdc88b9bcb01d5c877c26eca6";
-          sha256 = "1g82j3a7y5f9viy24alg6ihd1535l2m6pdj4bg53j9nh19xi9jb7";
+          rev = "15e4b08f7484c049d6b043263c5e09bc73846e32";
+          sha256 = "1sva5n77bydliq1jxa3914n8gw07v3ghp9lkh1rr2q6plawrcivs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets";
@@ -108029,12 +110215,12 @@
       melpaBuild {
         pname = "yatemplate";
         ename = "yatemplate";
-        version = "20180617.252";
+        version = "20180617.232";
         src = fetchFromGitHub {
           owner = "mineo";
           repo = "yatemplate";
-          rev = "4f4fca9f04f7088c98aa195cf33635a35a6055cb";
-          sha256 = "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8";
+          rev = "1d83419746669dbc436b1c6a164c3d29bd8ff4de";
+          sha256 = "1ipjawx0sadw1vijswm7wzwjnkds1pas925mbacvc3kcxg5jwjvx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -108054,11 +110240,11 @@
       melpaBuild {
         pname = "yatex";
         ename = "yatex";
-        version = "20190406.910";
+        version = "20190524.2248";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex";
-          rev = "2ed79846fd53";
-          sha256 = "0yx4679h2g7c8di7vbg9a2341fr988badibn1i38b1qjcrinfm1b";
+          rev = "714f3527b4a1";
+          sha256 = "12sqy2wrlgzi71vn3q5h47z1i6l6di3pnr4pmn0ixdp500gvy2fv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
@@ -108137,12 +110323,12 @@
       melpaBuild {
         pname = "ycmd";
         ename = "ycmd";
-        version = "20180724.556";
+        version = "20190416.107";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "fe35b7f2e3d9370941b9e537c9bc578d814acce2";
-          sha256 = "10h3whhz4bli4r6d945qdwv0627842l84vp6binqzw7lddd72y6g";
+          rev = "6f4f7384b82203cccf208e3ec09252eb079439f9";
+          sha256 = "1bl86x8nqw4jqzb8pfm6hm316hmk1bx8v3qz7wq9z92hb67ck2kn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -108252,12 +110438,12 @@
       melpaBuild {
         pname = "yoficator";
         ename = "yoficator";
-        version = "20181220.555";
+        version = "20190509.920";
         src = fetchFromGitLab {
           owner = "link2xt";
           repo = "yoficator";
-          rev = "95840df90063ba16a5f43c84de0746af6dfc01fc";
-          sha256 = "1k9fxvc4jwbxddakig5lnk5xy79g3f6wn5151wdfk9ynq0m2fyrf";
+          rev = "fa914f9648515bca54b5e558ca57d2b65fa57491";
+          sha256 = "0mgkwjprcj47zn8kd3ppqnbnmnn00cvnbs0r0h5951966vshh13f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator";
@@ -108277,12 +110463,12 @@
       melpaBuild {
         pname = "yoshi-theme";
         ename = "yoshi-theme";
-        version = "20170330.0";
+        version = "20190505.28";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44";
-          sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f";
+          rev = "70365870ff823b954aa85972217d8f116c45d939";
+          sha256 = "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -108436,12 +110622,12 @@
       melpaBuild {
         pname = "zenburn-theme";
         ename = "zenburn-theme";
-        version = "20190317.1146";
+        version = "20190510.234";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "0f14f780420602da823271fb2eb6251ff4daab9e";
-          sha256 = "0anv22dhqpsgvag8vbvgdfbs50054715rhfj9z4qkysxwzzysmjr";
+          rev = "b6090a1a343d5173e38e2966f7cf44d96cba037c";
+          sha256 = "1arplxd7f5li0dkd8zydh8ac84yk1crwjmq6hd38nsqgc53iimcl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -108566,12 +110752,12 @@
       melpaBuild {
         pname = "zerodark-theme";
         ename = "zerodark-theme";
-        version = "20181218.49";
+        version = "20190528.223";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "a697570aeb5b8c008961e0869f5e05740f43113d";
-          sha256 = "02i2vra853wb8nng37ybii70b3z6p10j5s3jnv9j2dlcnajbfvbr";
+          rev = "df22536a244293591575e56970bf83814faa7c14";
+          sha256 = "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
@@ -108644,12 +110830,12 @@
       melpaBuild {
         pname = "zmq";
         ename = "zmq";
-        version = "20190326.852";
+        version = "20190516.1443";
         src = fetchFromGitHub {
           owner = "dzop";
           repo = "emacs-zmq";
-          rev = "3965bec1ac232f0f7f35e7e91626e192688407b4";
-          sha256 = "02lcgq53gsg3li6fhga4njxfs5vb6xdh07r8z4cq9rmwfm0wilfq";
+          rev = "e4a657b237c42151f088de95e572a238361e7fc5";
+          sha256 = "0j9sd1vcbmrpxykzkp7ifrb0v889ahlg0f6r8813lq4881yxf63j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq";
@@ -108854,12 +111040,12 @@
       melpaBuild {
         pname = "zoom";
         ename = "zoom";
-        version = "20180310.421";
+        version = "20190523.600";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "c97ffaf6d0032007f13974b4d542558f9d686e39";
-          sha256 = "0jfz9z6g1zf2jmw5sinnnwnd6z0q8qrgj337f8d2g7mchy85l6fv";
+          rev = "578295532fb1c4ad2a2e95894e65cce02f812b54";
+          sha256 = "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
@@ -109009,12 +111195,12 @@
       melpaBuild {
         pname = "zoutline";
         ename = "zoutline";
-        version = "20190211.851";
+        version = "20190520.1119";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "zoutline";
-          rev = "2232139b64f9adabe81f48dd8d2f059e3f19edda";
-          sha256 = "1hq8m8n1zq63k04z9h1wmp69r8mv6vb9fzxgslwl683kid6srqwi";
+          rev = "63756846f8540b6faf89d885438186e4fe1c7d8a";
+          sha256 = "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6f15d33f78b6..8f440819afed 100644
--- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -266,6 +266,7 @@ self:
       removeAttrs (super // overrides)
       [
         "show-marks"  # missing dependency: fm
+        "lenlen-theme"  # missing dependency: color-theme-solarized
       ];
   in
     melpaPackages // { inherit melpaPackages; }
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index e1f83e9cefad..22ad906fd6eb 100644
--- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -657,12 +657,12 @@
       melpaBuild {
         pname = "ac-php";
         ename = "ac-php";
-        version = "2.0.7";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4";
-          sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l";
+          rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b";
+          sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -676,7 +676,6 @@
         };
       }) {};
     ac-php-core = callPackage ({ dash
-                               , emacs
                                , f
                                , fetchFromGitHub
                                , fetchurl
@@ -689,19 +688,19 @@
       melpaBuild {
         pname = "ac-php-core";
         ename = "ac-php-core";
-        version = "2.0.7";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "e270e65338d5e57d0df4e167d39cd7c11537f385";
-          sha256 = "16ahvzqlbla7qid7xq0s6g1s8pfxxixvjq7vh0v2w5c1rvqc2vb7";
+          rev = "19753d091424dde53a5282a3a72f94a0ddb5fd57";
+          sha256 = "18l8s85yi94v7mcm8g8mm9fqjrm8zfp3yxka54b8nzw2zyjvwzi8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
           sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f php-mode popup s xcscope ];
+        packageRequires = [ dash f php-mode popup s xcscope ];
         meta = {
           homepage = "https://melpa.org/#/ac-php-core";
           license = lib.licenses.free;
@@ -1371,6 +1370,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    aio = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "aio";
+        ename = "aio";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-aio";
+          rev = "077722896e649e7a33dcafbc4585686a29423979";
+          sha256 = "1y7j10j74r3fy0rcb8g3cm9nlls34qb0pz9xkia7psp77syrlz54";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95744cc13e7ac8d9acd794004d951f62e5880fa4/recipes/aio";
+          sha256 = "0sd8g2w4n9r2ndmp353v89xvky8043vmd92v2ggbl45chhpjl5zw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/aio";
+          license = lib.licenses.free;
+        };
+      }) {};
     airline-themes = callPackage ({ fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -1424,6 +1449,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    alarm-clock = callPackage ({ emacs
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "alarm-clock";
+        ename = "alarm-clock";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "wlemuel";
+          repo = "alarm-clock";
+          rev = "d5706ace823f75136107c09c6dad79df7c3b290e";
+          sha256 = "1jaagkzfdn9z1plw7ky7gabp45gv0a0gap2a55is1i9cyy83kzmw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/440fe05fa0d10d54e9c52e2e54e71a1321325376/recipes/alarm-clock";
+          sha256 = "1cgrj6dzpx0q15qzr9d342wg8w92c2r4zmk7rif2h87qxr66fbrg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs f ];
+        meta = {
+          homepage = "https://melpa.org/#/alarm-clock";
+          license = lib.licenses.free;
+        };
+      }) {};
     alchemist = callPackage ({ company
                              , dash
                              , elixir-mode
@@ -1571,12 +1623,12 @@
       melpaBuild {
         pname = "all-the-icons-ivy";
         ename = "all-the-icons-ivy";
-        version = "0.1.2";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "all-the-icons-ivy";
-          rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f";
-          sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg";
+          rev = "b768b83716100701a5cda9c071da2bcac34bd6a4";
+          sha256 = "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
@@ -1631,6 +1683,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ameba = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "ameba";
+        ename = "ameba";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "ameba.el";
+          rev = "51bb5e2aea2fb9fea83e5fed5e8df479f2d85935";
+          sha256 = "1vrhyi5fc65d3czq3jalpjvm33vrxbars51s1qhv7alixqnrrpv6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/ameba";
+          sha256 = "0500r0yihd208zc8cvdqgfn58a7mrhfnb0lqy509b4k0i8y0v5mq";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ameba";
+          license = lib.licenses.free;
+        };
+      }) {};
     amx = callPackage ({ emacs
                        , fetchFromGitHub
                        , fetchurl
@@ -2060,12 +2138,12 @@
       melpaBuild {
         pname = "apache-mode";
         ename = "apache-mode";
-        version = "2.1";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "apache-mode";
-          rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
-          sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
+          rev = "354f9302a8d805ac80d846adcd1cef10830b3d51";
+          sha256 = "1grs2x51k8pa6sgfa82s5pwwdfv7zw46ccw0zvd2rvzbhpq21p2z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
@@ -2162,12 +2240,12 @@
       melpaBuild {
         pname = "aproject";
         ename = "aproject";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "vietor";
           repo = "aproject";
-          rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
-          sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
+          rev = "702caf5392288dfd821b1e744fef0bb4fd9f9281";
+          sha256 = "18n3gsghj7sxxd6kpp21b2p7qwv93giwyr1zfvgbs8pzsbc8i9rx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de10c48976352f273e8363c2f6fa60602ee86c9b/recipes/aproject";
@@ -2530,12 +2608,12 @@
       melpaBuild {
         pname = "auth-source-pass";
         ename = "auth-source-pass";
-        version = "4.0.2";
+        version = "5.0.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "5822a35fa8cb74b8fc34600e82dbba1d341ce745";
-          sha256 = "0qkyqnfx596s0ycavm4ri0nbzmy2c6g7ifgql798p0pwwjgbsjyy";
+          rev = "df074612114c3cc2fa1c3023f26ff182f9b1190a";
+          sha256 = "0qnqqdpbfr06nqw4hq7c1s7yh7zyrv4gqjj06v70cavjml7pagp6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass";
@@ -3003,12 +3081,12 @@
       melpaBuild {
         pname = "avy";
         ename = "avy";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "369af594e5ea28be1d91b22753aace16baadc046";
-          sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
+          rev = "f2cf43b5372a6e2a7c101496c47caaf03338de36";
+          sha256 = "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3923,12 +4001,12 @@
       melpaBuild {
         pname = "bm";
         ename = "bm";
-        version = "201808";
+        version = "201905";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "d224b6cd8341db4c2e11263c346dd44fb37fcd88";
-          sha256 = "18xwm1xj436bwa2l3dkfx6hlj19y6f0xqd3jbd06j4g3idpryqma";
+          rev = "637dacf4cb9112fdfb949706a704dd53cbe79c7e";
+          sha256 = "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -3950,12 +4028,12 @@
       melpaBuild {
         pname = "bnf-mode";
         ename = "bnf-mode";
-        version = "0.3.2";
+        version = "0.4.2";
         src = fetchFromGitHub {
           owner = "sergeyklay";
           repo = "bnf-mode";
-          rev = "ac004f60012d648bf8c0e87d841935461279587a";
-          sha256 = "0v9lc2kr8x8r59z7vlv89l7slcq3m05k9abd5ds46v4xv15bh2jp";
+          rev = "2f217ecf76fa775da4b28de7dd2b615460d9f8ad";
+          sha256 = "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode";
@@ -4111,12 +4189,12 @@
       melpaBuild {
         pname = "borg";
         ename = "borg";
-        version = "3.1.0";
+        version = "3.1.1";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "borg";
-          rev = "4ffec24967ba805be2b2f1750e7cfffb85e26a1f";
-          sha256 = "0hrl6sg6p73d8f7xkpr3z30k4w5f5c52ygcd4db8zrh8lgnvxb9q";
+          rev = "940af3d437b299ef81ce73da4e4ec8c2f52d7a79";
+          sha256 = "0lg2inxzfz6pcblynna4fyi5lxnmbrpl095d6574d0pnn22zdx5a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
@@ -5094,8 +5172,8 @@
           sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
-          sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/606e62bacfc6b6fc1d8bff3e716b743e6f32b29a/recipes/cask";
+          sha256 = "17jv9hhwh3azwa8rc5iljr3c2kz6razq67mvsxi9qnywq4rhrgm9";
           name = "recipe";
         };
         packageRequires = [ cl-lib dash epl f package-build s shut-up ];
@@ -5431,6 +5509,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    cfrs = callPackage ({ dash
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild
+                        , posframe
+                        , s }:
+      melpaBuild {
+        pname = "cfrs";
+        ename = "cfrs";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "cfrs";
+          rev = "06c5f82d3ae6ff83ba8bd32f051a89b9c309f360";
+          sha256 = "1gnnfw2cwix82fc3ps8f7irv40k2s043wma2lhkxyknwlgrlhla5";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3ce16d27a9d73a5eaffebf7b0ff36d90c292248f/recipes/cfrs";
+          sha256 = "03mi5iz0yny2ddvp41l3yc49583zw0wqsv33rkycjfj562903syx";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs posframe s ];
+        meta = {
+          homepage = "https://melpa.org/#/cfrs";
+          license = lib.licenses.free;
+        };
+      }) {};
     chapel-mode = callPackage ({ fetchFromGitHub
                                , fetchurl
                                , lib
@@ -6404,7 +6511,7 @@
       melpaBuild {
         pname = "cmake-mode";
         ename = "cmake-mode";
-        version = "3.14.1";
+        version = "3.15.0.-1.1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
@@ -6745,12 +6852,12 @@
       melpaBuild {
         pname = "comment-dwim-2";
         ename = "comment-dwim-2";
-        version = "1.2.2";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "remyferre";
           repo = "comment-dwim-2";
-          rev = "8cedecde018b5872195bfead6511af822776a430";
-          sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
+          rev = "3dfdd58495c46a37708344a57c5c52beca6b2c1c";
+          sha256 = "08pi3y12i6wx69aj09nk5qd6lplwxq5wz3m7w5701988q39x62xl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2";
@@ -6877,12 +6984,12 @@
       melpaBuild {
         pname = "company";
         ename = "company";
-        version = "0.9.9";
+        version = "0.9.10";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "ac82e875e144b227e926c09c53def9b0c059115c";
-          sha256 = "07zjaaf6nd6zkh0208774lw7bx7cfnl25zfgva51wki20rcq6cjp";
+          rev = "3eda0ba23921d43b733f7975e56d490a34b9f30b";
+          sha256 = "0shmv48bq9l5xm60dwx9lqyq6b39y3d7qjxdlah7dpipv5vhra42";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -6992,12 +7099,12 @@
       melpaBuild {
         pname = "company-coq";
         ename = "company-coq";
-        version = "1.0";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "bb507a11b088a8c9bb6500b384ed588bc690fcea";
-          sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl";
+          rev = "a4e0625725e4f54d202e746bb41b8bc14c14ddef";
+          sha256 = "0dxi4h8xqq5647k7h89s4pi8nwyj3brlhsckrv3p3b1g4dr6mk3b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -7413,12 +7520,12 @@
       melpaBuild {
         pname = "company-php";
         ename = "company-php";
-        version = "2.0.7";
+        version = "2.1.1";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "11234d073f363edff255e8632b728777e2807d01";
-          sha256 = "15rinvamhzbx0n1fxwpq7nbjqgqvksgf4q8k3lkyy6ifchwiqys4";
+          rev = "6069c9bdf755384b6cda0ca70fc19cf951f08b3b";
+          sha256 = "1znjx2g5004w4f8hmm4gbdjrij2zmmf5ng18ld0pm2lgb3y3cib4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -7469,12 +7576,12 @@
       melpaBuild {
         pname = "company-prescient";
         ename = "company-prescient";
-        version = "2.2.2";
+        version = "3.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e";
-          sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0";
+          rev = "ae414dde56f3430867faf41c04e4c3df75f9c960";
+          sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
@@ -7527,12 +7634,12 @@
       melpaBuild {
         pname = "company-restclient";
         ename = "company-restclient";
-        version = "0.1.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-restclient";
-          rev = "c228f559cf845b4ac8e35728841e5352c1bec3b6";
-          sha256 = "0dq7vsk2pp2q6g8wp2agwfn0jjjb80kyq004biyci0p96qxr4li4";
+          rev = "e5a3ec54edb44776738c13e13e34c85b3085277b";
+          sha256 = "0yp0hlrgcr6yy1xkjvfckys2k24x9xg7y6336ma61bdwn5lpv0x0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -7733,12 +7840,12 @@
       melpaBuild {
         pname = "company-terraform";
         ename = "company-terraform";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "rafalcieslak";
           repo = "emacs-company-terraform";
-          rev = "45a2bd090af79c119f92414c4dee8939b38903d1";
-          sha256 = "0gcg20f4nld54y48mssd3sfc7fxq07iff9gsi5av4b86kyzjfr6x";
+          rev = "2d11a21fee2f298e48968e479ddcaeda4d736e12";
+          sha256 = "0hxilq7289djrn6kgw7n926zpz0pr7iyd1wm6cy8yfhxf546a4px";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
@@ -8288,12 +8395,12 @@
       melpaBuild {
         pname = "counsel-etags";
         ename = "counsel-etags";
-        version = "1.8.3";
+        version = "1.8.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "e6fcff2254383fe680cc1d05580778128da2ca57";
-          sha256 = "1d8nlrbsyza6q7yqm9248bxxsf49qf6hchg3zwv0l11acn3w8np5";
+          rev = "e9d396bf39ae12ef1820d5ae7e2928f14ed39189";
+          sha256 = "14my9jvxl26a5yn381h5pi5481y9d9gyk7wnxxd0s4sjc964c5h5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -8317,14 +8424,14 @@
         ename = "counsel-gtags";
         version = "0.1";
         src = fetchFromGitHub {
-          owner = "syohex";
+          owner = "FelipeLema";
           repo = "emacs-counsel-gtags";
           rev = "88c47af65fafaabd908e80dec4cf2aae921581c0";
           sha256 = "0qgvic4vdmgr46c0jya80v1ky2v9viqvqgkxzmq4i81zl6f7ad4d";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
-          sha256 = "12qyb1lnzyd2rr4ankpqi30h0bj66ap5qw87y4605k0j44vhnsax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fe8fe6af7826a4b73ac784fde8859130b9ad7096/recipes/counsel-gtags";
+          sha256 = "1vxxcqijn3nab4146p06vhw6dn8zwb7arbk1610bajsvkyid428y";
           name = "recipe";
         };
         packageRequires = [ counsel emacs ];
@@ -8369,12 +8476,12 @@
       melpaBuild {
         pname = "counsel-tramp";
         ename = "counsel-tramp";
-        version = "0.6.2";
+        version = "0.6.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-counsel-tramp";
-          rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f";
-          sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7";
+          rev = "5ed06027a313b27ab17a8c8fabbc30c0e424c3b2";
+          sha256 = "1qy9lf7cyv6hp9mmpwh92cpdcffbxzyzchx6878d5pmk9qh6xy92";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
@@ -8423,12 +8530,12 @@
       melpaBuild {
         pname = "coverlay";
         ename = "coverlay";
-        version = "3.0.1";
+        version = "3.0.2";
         src = fetchFromGitHub {
           owner = "twada";
           repo = "coverlay.el";
-          rev = "8205a845d58755dd7640b2e2b5991bf842998935";
-          sha256 = "1mppan4ml4dblwxdgr8pli7nj864frc7n7c6h47q4vfb4flg29n0";
+          rev = "0beae208d0e7d746a94385428bd61aa5cd7ea828";
+          sha256 = "1qf1s0997n6bfx50bd0jln25p7z6y8pfibijnbqcg2011xmv5dqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coverlay";
@@ -8761,12 +8868,12 @@
       melpaBuild {
         pname = "ctags-update";
         ename = "ctags-update";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "ctags-update";
-          rev = "ff4f211e42df94fdeba376e62b65dc67f0388589";
-          sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y";
+          rev = "67faf248b92388442958a069263c62a345425a1b";
+          sha256 = "0442jdxvn33i0bnb4fspvpdn66gxqyazyc6n3wqjmpn3fqvzwsrp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
@@ -8779,6 +8886,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ctune = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "ctune";
+        ename = "ctune";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "maurooaranda";
+          repo = "ctune";
+          rev = "276257231e5c19fa476e01077611b5bbcec9f852";
+          sha256 = "0s9zbgibkfn7yr9dkpbvvprrn2ak62gsfzjmw4qfqgrg4y3s4x7w";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/927ecd888bc00abff13f5fc335a88dffc2bf6779/recipes/ctune";
+          sha256 = "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ctune";
+          license = lib.licenses.free;
+        };
+      }) {};
     ctxmenu = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -8969,7 +9102,7 @@
       melpaBuild {
         pname = "cython-mode";
         ename = "cython-mode";
-        version = "0.29.6";
+        version = "0.29.10";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
@@ -9227,12 +9360,12 @@
       melpaBuild {
         pname = "dash";
         ename = "dash";
-        version = "2.15.0";
+        version = "2.16.0";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "63022432e1f7bcc5af9582f29d4ed0552a2e658b";
-          sha256 = "0dx8q3jr8fh73cfl7mqi5dq0012ambpvc74d2c71fsv9rfw85693";
+          rev = "258c324d9840901db83b2cabef3fa75bba57c1ba";
+          sha256 = "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -9254,7 +9387,7 @@
       melpaBuild {
         pname = "dash-functional";
         ename = "dash-functional";
-        version = "2.15.0";
+        version = "2.16.0";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
@@ -9281,12 +9414,12 @@
       melpaBuild {
         pname = "dashboard";
         ename = "dashboard";
-        version = "1.3.1";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "emacs-dashboard";
           repo = "emacs-dashboard";
-          rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0";
-          sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r";
+          rev = "5b66b65c4c7536f43e8e58b3f7055e5bd6381cda";
+          sha256 = "1g6g8vad1kdmv1zxp95a8sn70idl26isqjb3xk1r95pqnx1cn591";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard";
@@ -9413,25 +9546,24 @@
                             , fetchurl
                             , lib
                             , melpaBuild
-                            , projectile
                             , s
                             , spinner }:
       melpaBuild {
         pname = "deadgrep";
         ename = "deadgrep";
-        version = "0.6";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "deadgrep";
-          rev = "c29f617569a82d67b2061f74c08f431520fc3f54";
-          sha256 = "12j84yp94f2763gwpc07zqfi0ikz9n1a5ciyvcpsgfxpj8bkngzx";
+          rev = "1d64c113f562a80147cdb6041a2dd48e5ba2da5d";
+          sha256 = "025xj4hc1k87wmbx2imvxb9brfnajclpd4rj7j1yg85gbk7a99v5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
           sha256 = "01m5ds7lic9g11a5iwzw86k6xcv56wbbzjm1343ckbbi255h9i09";
           name = "recipe";
         };
-        packageRequires = [ dash emacs projectile s spinner ];
+        packageRequires = [ dash emacs s spinner ];
         meta = {
           homepage = "https://melpa.org/#/deadgrep";
           license = lib.licenses.free;
@@ -9537,26 +9669,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    default-text-scale = callPackage ({ fetchFromGitHub
+    default-text-scale = callPackage ({ emacs
+                                      , fetchFromGitHub
                                       , fetchurl
                                       , lib
                                       , melpaBuild }:
       melpaBuild {
         pname = "default-text-scale";
         ename = "default-text-scale";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "default-text-scale";
-          rev = "c90c08b9fe5f25474067a00c4a4babdb413b25b1";
-          sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
+          rev = "f425d3765c4dea3f2e550720278f9d424579ee5d";
+          sha256 = "0h42jiwxrxjmk7ccwh3h25n7dy2rq61ncm5wx27jhkncc5jdm4h6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/default-text-scale";
           license = lib.licenses.free;
@@ -9648,12 +9781,12 @@
       melpaBuild {
         pname = "demangle-mode";
         ename = "demangle-mode";
-        version = "1.2.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "374c84a0b190f0f0ea76b956035003228077d1e0";
-          sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394";
+          rev = "06903d731dfde110e10b979dcc7624ef6dbb5ac8";
+          sha256 = "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -9700,12 +9833,12 @@
       melpaBuild {
         pname = "desktop-environment";
         ename = "desktop-environment";
-        version = "0.2.0";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "desktop-environment";
-          rev = "10df99c6c6805a01acbbdfb7d02dc8cf2780d88d";
-          sha256 = "1fal3yfmqg10cb53qsf5gsq2gvyz9w16wmlpnpjwjzwnjfn6l73r";
+          rev = "284c38fcb5b10746255ee4123eaa549e028df0c8";
+          sha256 = "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment";
@@ -9771,6 +9904,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    dianyou = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "dianyou";
+        ename = "dianyou";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "dianyou";
+          rev = "1a1fe6da3196f91db7b76b6c552ca4f2629e36bf";
+          sha256 = "1bgyq4zrhzlqmfgv3az4csgsrqidlshwjbx4r9l2rydk3k3gl78n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/059b003c74acdfdd917ecb6fecb782a0f54d155b/recipes/dianyou";
+          sha256 = "1mz3nvr62gfkhbayw7784c8kn8drbiq9hlqv1g5vd9pdfhxqs8jl";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dianyou";
+          license = lib.licenses.free;
+        };
+      }) {};
     diary-manager = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -10320,6 +10479,30 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-rmjunk = callPackage ({ fetchgit
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "dired-rmjunk";
+        ename = "dired-rmjunk";
+        version = "1.2";
+        src = fetchgit {
+          url = "https://git.sr.ht/~jakob/dired-rmjunk";
+          rev = "6a9fa6a35498e53e8c57282e3b08dedc896d880d";
+          sha256 = "0kpkd7qasrb303d0b01d62r82prhrmaasxqa14nf5lh01c213nr4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/75d501ae9b64d9aa083f43358881a467a7cd2a04/recipes/dired-rmjunk";
+          sha256 = "1m07z6gcsd5i1xshgfxqrpcrqpl0ffa9ls2443za5wkgbalhxx47";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dired-rmjunk";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-rsync = callPackage ({ dash
                                , emacs
                                , fetchFromGitHub
@@ -10380,12 +10563,12 @@
       melpaBuild {
         pname = "dired-toggle";
         ename = "dired-toggle";
-        version = "0.1.2";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "fasheng";
           repo = "dired-toggle";
-          rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed";
-          sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q";
+          rev = "5bcdd9f13c0b0149c5125004e93bc2dfd22f3fce";
+          sha256 = "0dghbrx364fihzp5r8ar6vxkavd7mn74qjkijy1wvy34vl0b4911";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle";
@@ -10479,24 +10662,23 @@
                           , fetchFromGitHub
                           , fetchurl
                           , lib
-                          , melpaBuild
-                          , with-editor }:
+                          , melpaBuild }:
       melpaBuild {
         pname = "direnv";
         ename = "direnv";
-        version = "1.5.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160";
-          sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la";
+          rev = "468f2fb20d825dd7134e4efbaff3666917cd4ec3";
+          sha256 = "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
           sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
           name = "recipe";
         };
-        packageRequires = [ dash emacs with-editor ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/direnv";
           license = lib.licenses.free;
@@ -10774,6 +10956,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-cli = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "docker-cli";
+        ename = "docker-cli";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "bosko";
+          repo = "docker-cli";
+          rev = "328429219574555c5fb831a421b4b5d9a2338561";
+          sha256 = "15jsp1jsb13qv394js9pd6407ya7dgqk7blzbnyf9i9abyyr0v67";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5664de22600c428b7931085985e6fe779e8876b2/recipes/docker-cli";
+          sha256 = "1pyrnxa9iwzp0a810250xy191xcbaq68c76fc5plh70c37gzribp";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/docker-cli";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-compose-mode = callPackage ({ dash
                                        , emacs
                                        , fetchFromGitHub
@@ -10907,7 +11114,6 @@
       }) {};
     doom-modeline = callPackage ({ all-the-icons
                                  , dash
-                                 , eldoc-eval
                                  , emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -10917,19 +11123,19 @@
       melpaBuild {
         pname = "doom-modeline";
         ename = "doom-modeline";
-        version = "1.9.6";
+        version = "2.3.2";
         src = fetchFromGitHub {
           owner = "seagle0128";
           repo = "doom-modeline";
-          rev = "64f1cf5de1689b76f04575758c07a74f1e9727a0";
-          sha256 = "0yklidlr9dv508mzmpnxlffyrc49vs3dxi2axlzf4yd89ng7x4lm";
+          rev = "59c81a0d81e3cb74f9c5fed809ef064519d3ef11";
+          sha256 = "1p96c4hgb4vdclbcbk3xz0jws3py8a3irpzzs7i1sq3svsilf0ha";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
           sha256 = "0pscrhhgk4wpz1f2r94ficgan4f9blbhqzvav1wjahwp7fn5m29j";
           name = "recipe";
         };
-        packageRequires = [ all-the-icons dash eldoc-eval emacs shrink-path ];
+        packageRequires = [ all-the-icons dash emacs shrink-path ];
         meta = {
           homepage = "https://melpa.org/#/doom-modeline";
           license = lib.licenses.free;
@@ -11306,12 +11512,12 @@
       melpaBuild {
         pname = "dune";
         ename = "dune";
-        version = "1.8.2";
+        version = "1.10.0";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "dune";
-          rev = "d7bfa6005cf6043df24d824ffc5a2243e70bce20";
-          sha256 = "07c615kfpxawpv1fxlvk5nf48bcf54gs5fhad8fcvmknsq4lj7ib";
+          rev = "060b6acabba7bf0713912afb28e4cdb0461c2199";
+          sha256 = "1mw8jspqf4wxawnshkbbqpnxzzdz576wl6mgnzbh6ddxr9pk2z7w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune";
@@ -11569,23 +11775,24 @@
                              , fetchurl
                              , lib
                              , melpaBuild
-                             , popup }:
+                             , popup
+                             , request }:
       melpaBuild {
         pname = "easy-hugo";
         ename = "easy-hugo";
-        version = "3.8.37";
+        version = "3.8.41";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "e7b6c75a7e46290d9d0cdac9ec56fbf35a6b9c98";
-          sha256 = "1xhyky1593qxq7kfbv2ighx957w5pizkki0q77nrvjxlwbqghgz2";
+          rev = "c80b972faa2c3addc472fe6412ca28dc5583b1d6";
+          sha256 = "08lhs0nhd19irssq4w028wyiaf5d2a7pqd1b3hp7rgza411lvwji";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
           sha256 = "1m7iw6njxxsk82agyqay277iql578b3wz6z9wjs8ls30ps8s2b8g";
           name = "recipe";
         };
-        packageRequires = [ emacs popup ];
+        packageRequires = [ emacs popup request ];
         meta = {
           homepage = "https://melpa.org/#/easy-hugo";
           license = lib.licenses.free;
@@ -11595,23 +11802,24 @@
                                , fetchFromGitHub
                                , fetchurl
                                , lib
-                               , melpaBuild }:
+                               , melpaBuild
+                               , request }:
       melpaBuild {
         pname = "easy-jekyll";
         ename = "easy-jekyll";
-        version = "2.0.19";
+        version = "2.2.22";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "5ee52c0bb01336a03a8f07e072841caf13f86c0a";
-          sha256 = "1xibnw3jmmwrc1z7hnifjzhq4mn2834lk7f22x7rwh857iamlply";
+          rev = "9b065ac1bc5a85c6ad41a7b97553eeaa9e30c791";
+          sha256 = "1pj2hafyx1lq8ifahfg0j90z72swixi1pma52j6701vrn8a5aqw6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
           sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs request ];
         meta = {
           homepage = "https://melpa.org/#/easy-jekyll";
           license = lib.licenses.free;
@@ -11760,12 +11968,12 @@
       melpaBuild {
         pname = "ebib";
         ename = "ebib";
-        version = "2.16.3";
+        version = "2.16.5";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "4d842a1eec68e08acc9d4d77d7d7c3014d5cd55e";
-          sha256 = "03fkj0grbv9xh1vb441rcxannjmkvaklqziwhxkrij287d2f0ak4";
+          rev = "eb6e7bf8cc525c41150bf5913d965e89e1fbf48d";
+          sha256 = "0jys32kvbcjrc65dwgfzz21g4fnycdhm0pybgk3akb80rv00x1vf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -12218,7 +12426,7 @@
       melpaBuild {
         pname = "egison-mode";
         ename = "egison-mode";
-        version = "3.7.14";
+        version = "3.8.2";
         src = fetchFromGitHub {
           owner = "egison";
           repo = "egison";
@@ -12368,12 +12576,12 @@
       melpaBuild {
         pname = "ejc-sql";
         ename = "ejc-sql";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "82879290aca8ef1ec7a0f8b968b5b7f355907e8e";
-          sha256 = "00qw1md2i6izpafpz2mj7i22sq1pnzgfsv2kvpq00aqbink47k83";
+          rev = "285ad107dbd9ef6a1e417f684eaf30e788fcfc79";
+          sha256 = "0vypbyx2r7v8mmdhiq7n2x0xp43njwra5fz6f6cba40wq4dnkg0g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql";
@@ -12528,12 +12736,12 @@
       melpaBuild {
         pname = "el-patch";
         ename = "el-patch";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "66510e01598a2c4ce6c973e0b6c1691d8d24c8e6";
-          sha256 = "1mvb9fpzj65yfhjcbvbdqjaa8adn64ik8zccpppls3fq656rwbml";
+          rev = "ef56cbc6950dffd91de93009bafe51efb81eb84f";
+          sha256 = "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -12864,6 +13072,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    elgrep = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "elgrep";
+        ename = "elgrep";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "TobiasZawada";
+          repo = "elgrep";
+          rev = "c2c5858f335ac1d0013dc631e5bc2dc16d9b3198";
+          sha256 = "1rlj9cniwk8fzfn1i4apffrikv08r9c2dmwxhqc6nmrhfjr2rf1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
+          sha256 = "0b8dma52zv57sh1jbrabfy6k5lzixs7f541s8dsqyrg0fzlq460j";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
     elisp-def = callPackage ({ dash
                              , emacs
                              , f
@@ -13185,6 +13419,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    elpher = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "elpher";
+        ename = "elpher";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "tgvaughan";
+          repo = "elpher";
+          rev = "b3f3e8e887f515cff6807b89fe3170b2c83b5333";
+          sha256 = "1y6awpm0ck1b3kcpb5pfxf3la9hlalpk2k9c3g1b2kmll7d63z15";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/df2162816fed4d5da7ee5adafbf547eed8815418/recipes/elpher";
+          sha256 = "1csy26ra6kgm2rnf1s6bj254r18zkaf6y7kb3rrjm1msw3vjvvr2";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elpher";
+          license = lib.licenses.free;
+        };
+      }) {};
     elpy = callPackage ({ company
                         , emacs
                         , fetchFromGitHub
@@ -13199,12 +13459,12 @@
       melpaBuild {
         pname = "elpy";
         ename = "elpy";
-        version = "1.28.0";
+        version = "1.29.1";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "b4803b554d78941e871cd976ff7828294e85c991";
-          sha256 = "073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis";
+          rev = "d98ee26f564e33c9acf233862734e72200bd3703";
+          sha256 = "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -13233,12 +13493,12 @@
       melpaBuild {
         pname = "elscreen";
         ename = "elscreen";
-        version = "2018.-4.3.-4.21";
+        version = "20180321";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "elscreen";
-          rev = "02164afab2c5fbff6e4aa7c59e0daedc6c504772";
-          sha256 = "1jzp7w2c9xl8x8kdxcchgp8s3ygvj70pi2vwwg1qilkya7yv61p0";
+          rev = "cc58337faf5ba1eae7e87f75f6ff3758675688f2";
+          sha256 = "15kffci7qlhjwz1rlr0zg0z9rq0vlsxy295dvg96wiiz4fvs4jk2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6140694c1dea0a573586d23d1f63d46c9b22936/recipes/elscreen";
@@ -13731,11 +13991,11 @@
       melpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "5.1";
+        version = "5.2";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "47b1054683f4fa0a1ecd9999cb94c5c34994e018";
-          sha256 = "1lrkj4gy592mrym0qfb05hydpr7c2sbk6ap5q19zkblizf0gnad6";
+          rev = "2253146e5607e12f62b0c1c474fded1219da2d5d";
+          sha256 = "0r0ai788mn5f3kf5wrp6jywncl2z3gpjif41pm5m0892y7l0vh9i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -13891,12 +14151,12 @@
       melpaBuild {
         pname = "emojify";
         ename = "emojify";
-        version = "1.0";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "9fac58de9b8f7539bfd4c6983bc826e27d060b30";
-          sha256 = "1z5j4nr9c6806f6ys4p3b2byxca7zc34ap1bysai8nvzxz02rzf6";
+          rev = "302d16e9bac72faf94984e0c48ecd0e4b8d66738";
+          sha256 = "1fqnj5x7ivjkm5y927dqqnm85q5hzczlb0hrfpjalrhasa6ijsrm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -13926,12 +14186,12 @@
       melpaBuild {
         pname = "emr";
         ename = "emr";
-        version = "0.3.8";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "emacs-refactor";
-          rev = "f25e3354e5e97deef359aef5386c69dea20b07b0";
-          sha256 = "107br10jwza4pwsx8gskh9kp2g28yzxclmwd2l9z137nmf24gm3a";
+          rev = "d7ffe197a617099f673bf3c5f9eb067b8037c8eb";
+          sha256 = "19xz5srffyy7kfpa11sqzfb775vkna486q8kdmh4m16fs2am48zx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr";
@@ -13988,12 +14248,12 @@
       melpaBuild {
         pname = "enh-ruby-mode";
         ename = "enh-ruby-mode";
-        version = "20190325";
+        version = "20190408";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "c478bdf32979f7b26068d1df0bd30d737a192b1e";
-          sha256 = "13m59n8xzbhn079h6dj2inabscd0pyq9z4p0vz0nhsgak1jq5ccv";
+          rev = "5c5ea7532bfff3c12c2a554d68c5def1dd984a40";
+          sha256 = "1asr52rg3230avq2bwl06nnrgkym98i7gas0xrs2vqyyaxbcpb1h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -14162,12 +14422,12 @@
       melpaBuild {
         pname = "epkg";
         ename = "epkg";
-        version = "3.2.0";
+        version = "3.2.1";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "4243b363d038b28650479b23949cb7dfd319542b";
-          sha256 = "0a1cw3jnnm47n0c5l8q4vf3arx244wqs7lcwsjblbnp7svcx0q4h";
+          rev = "1aaa64402bf91575ee81bf240c4c52320f68088d";
+          sha256 = "0ij44yp72y1flcjp2q6yfbrnr4bnzjflgcsksl3djr9nhb73cd5a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -14215,12 +14475,12 @@
       melpaBuild {
         pname = "epm";
         ename = "epm";
-        version = "0.1.-2.2";
+        version = "0.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "epm";
-          rev = "ee004d00c8c8fbe32c4e5baf6279c5e68dc5f201";
-          sha256 = "0llkgjqr9hl66nya1ppvrlcvmy3rh4pwc25ywq4zi0fbl25qsf5d";
+          rev = "6375ddbf93c5f25647f6ebb25b54045b3c93a5be";
+          sha256 = "1m0l0szrwljzsch4xj9a42nflpqfii68g8clizsjwv323h6xff4n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm";
@@ -14476,12 +14736,12 @@
       melpaBuild {
         pname = "erlang";
         ename = "erlang";
-        version = "22.0.-1.2";
+        version = "22.0.2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "221f6053f7f71747e6e86f9f1122816887cf9d21";
-          sha256 = "0jk64dcp46867rja2y5xai626fp2qrvwdfzb6in1x6gl8iyhkc39";
+          rev = "e3ca92be9f1945f50ef84631a826b431bad2bfe6";
+          sha256 = "14sbwlvn4nb33xrss9x3dn74nkzmr1gss029aycfd8sjclyzv1zn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -15679,12 +15939,12 @@
       melpaBuild {
         pname = "evil-matchit";
         ename = "evil-matchit";
-        version = "2.2.9";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "7d65b4167b1f0086c2b42b3aec805e47a0d355c4";
-          sha256 = "12if45pxfndy3d7r4gd3zx4d3jk4d64fdmwkhc3y5zhqq9h9iy4c";
+          rev = "8fa4c1390d82036f9d51750eb6d3f054785cb396";
+          sha256 = "0y6q42hml7jgf060d83m7hf270h01858g5kxw12na9n4r4jjpdg1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -16082,12 +16342,12 @@
       melpaBuild {
         pname = "evil-surround";
         ename = "evil-surround";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-surround";
-          rev = "1a4bc20f158aa9f4e4811a6363cc65ea24f167ce";
-          sha256 = "1sq7692k8ph4czqqg3f5cqlmk10q8mfkrnknnv79l9sza9jqfw9r";
+          rev = "68f7033322dcba3781dddb48465878e896a9f57b";
+          sha256 = "17wxib52qwpfi809lq3c1zsxqprmkk9ghg0q8zc3r7gq2f5d8yy8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -16397,12 +16657,12 @@
       melpaBuild {
         pname = "exec-path-from-shell";
         ename = "exec-path-from-shell";
-        version = "1.11";
+        version = "1.12";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "5e80a4159b1b78d66f99aa1c071b778f6c64e6e6";
-          sha256 = "1pqyv78cknj6zwg2xvbxp4qkdjs0bic3w9w3mj7chja4qza83ijg";
+          rev = "76cd6e3fa8a7dac937af7e40507843dfae4f9184";
+          sha256 = "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell";
@@ -16423,11 +16683,11 @@
       melpaBuild {
         pname = "exiftool";
         ename = "exiftool";
-        version = "0.3.1";
+        version = "0.3.2";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "4131fa38160dabd5d7143aad8aca5db575749292";
-          sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh";
+          rev = "c1058d99c34e62b99dbfca13ada47519fb51bf73";
+          sha256 = "0bv58is66cz21yhc0qqkp1z4nk13zfi2l7i6pjbhyi0g1n88qqyv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -16642,12 +16902,12 @@
       melpaBuild {
         pname = "eziam-theme";
         ename = "eziam-theme";
-        version = "1.0";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1";
-          sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99";
+          rev = "4402f58f6d619571c0960b2be5ce5b61962c1a67";
+          sha256 = "0a7jk5k8fhj9klsphyw22khrwb5ns3w85rbzyrdrshhcaqcr88j3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -16772,12 +17032,12 @@
       melpaBuild {
         pname = "faff-theme";
         ename = "faff-theme";
-        version = "2.4";
+        version = "2.5";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "e4721d00852ebd3a745db7e0ed7c9889c013f945";
-          sha256 = "0gqi9lzdbn5kh6p8a4kxjfyxb4yakpkac49lyaqcipz6spzhhzf1";
+          rev = "bb331f755f44f8d6db1b35c476948a080a4a40cf";
+          sha256 = "0llhsn79fp8c42hv57539k3zcyaqx0gc27hg21vq9nh8aa0jb6h2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -17665,6 +17925,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-ameba = callPackage ({ fetchFromGitHub
+                                  , fetchurl
+                                  , flycheck
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-ameba";
+        ename = "flycheck-ameba";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "ameba.el";
+          rev = "4ccb497067ce41b128eabca17d761e9b7d0ac3df";
+          sha256 = "1sd9c051ipnhm938r30wwqr41bvr2fqhc4n8546hzf3cv56v4d16";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3d31485fd7de5ebb97daccf3e28d51f320d4f8cd/recipes/flycheck-ameba";
+          sha256 = "17jfqbzzb1xkz9yx5ww6pykjnixm5w8mvwva1kqbjs4f2bsqbc6p";
+          name = "recipe";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-ameba";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-apertium = callPackage ({ fetchFromGitHub
                                      , fetchurl
                                      , flycheck
@@ -17773,6 +18059,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-clj-kondo = callPackage ({ fetchFromGitHub
+                                      , fetchurl
+                                      , flycheck
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-clj-kondo";
+        ename = "flycheck-clj-kondo";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "borkdude";
+          repo = "flycheck-clj-kondo";
+          rev = "1402fb008f10198f09c55869cd713a99c3e72dff";
+          sha256 = "0ifkkw7mn83hw4yjx81h519fcabvdk73bavs3pbzck69v6li0mmy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20dca546bbad0fa7b713dc015d1b9a9b7caf5370/recipes/flycheck-clj-kondo";
+          sha256 = "0a61jq6g0arrsa97rl3frns8k9l9qxazb96ir99y9kskim4njl6r";
+          name = "recipe";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-clj-kondo";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clojure = callPackage ({ cider
                                     , emacs
                                     , fetchFromGitHub
@@ -17919,11 +18231,11 @@
       melpaBuild {
         pname = "flycheck-grammalecte";
         ename = "flycheck-grammalecte";
-        version = "0.7";
+        version = "0.8";
         src = fetchgit {
           url = "https://git.deparis.io/flycheck-grammalecte/";
-          rev = "2f4812eaa6e809051e23c34a085df2b704a15741";
-          sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q";
+          rev = "8ba9d41dad0c9c96760614ce7594ceb823f560de";
+          sha256 = "1l2n3vi7krd61bgwj7dg7qpkccimwfx3m0946fmxgrp0k6q41fn0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte";
@@ -18243,12 +18555,12 @@
       melpaBuild {
         pname = "flycheck-objc-clang";
         ename = "flycheck-objc-clang";
-        version = "2.0.4";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-objc-clang";
-          rev = "a3781e47f14068c811534a3348bf479eeb3f2041";
-          sha256 = "00a2wg6g74plbmva3bwms7brdlv9i28w51yxisiv04la126m69js";
+          rev = "b46ad43637cebf8467cf596d3e7b5f5d371789e9";
+          sha256 = "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -18576,12 +18888,12 @@
       melpaBuild {
         pname = "flycheck-swift3";
         ename = "flycheck-swift3";
-        version = "2.0.5";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "GyazSquare";
           repo = "flycheck-swift3";
-          rev = "ba4e831ff04b180323435214dd4cca8184968ad1";
-          sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm";
+          rev = "811a765a0106bbdc8d6a721b22a2a97f3527df7c";
+          sha256 = "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -18863,6 +19175,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake-eslint = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "flymake-eslint";
+        ename = "flymake-eslint";
+        version = "1.3.4";
+        src = fetchFromGitHub {
+          owner = "orzechowskid";
+          repo = "flymake-eslint";
+          rev = "d4be92ea779ea333b599fd125817f943a676a63a";
+          sha256 = "1x0ipsg0gd5lflx7kyyaz7zv6xnjzmhh1k32f01qr69zarf31nw0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b607c3b859f4564e316532a256a299c73e5f6f0/recipes/flymake-eslint";
+          sha256 = "0avirxxgjk3k8hqpnhay83ij7s3xr4ha4wz5lji1zyx6f6im6gyb";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flymake-eslint";
+          license = lib.licenses.free;
+        };
+      }) {};
     flymake-gjshint = callPackage ({ fetchFromGitHub
                                    , fetchurl
                                    , lib
@@ -19917,12 +20255,12 @@
       melpaBuild {
         pname = "fsharp-mode";
         ename = "fsharp-mode";
-        version = "1.9.13";
+        version = "1.9.14";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "386994e7d420872a31d7dd2eee9610d8ace98faa";
-          sha256 = "15blnkcrsmm6896dpdzcx3xqzxzkc0x8d5bg9b5sw7qca6vnjbqk";
+          rev = "e2a63296681d65969d9c21144a22c6fd2f9dd57d";
+          sha256 = "0llv82jhfmxnblhihnc07z343780dsd2167xjm4vrpcqvlpp50g8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -20955,6 +21293,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    git-identity = callPackage ({ dash
+                                , emacs
+                                , f
+                                , fetchFromGitHub
+                                , fetchurl
+                                , hydra
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "git-identity";
+        ename = "git-identity";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "akirak";
+          repo = "git-identity.el";
+          rev = "11d6b495f84d35160c3e25e534e3885d419812f6";
+          sha256 = "13wg28glsdy63x2m99w2d6waadyw3q7hrn7r42hn566b6a85hz04";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebad3a7a81fbf0293ac04ba319929c8b24bb98f5/recipes/git-identity";
+          sha256 = "0kmpm5zp2x60r68in94x2bazq4wxx95n6zfc6mwiq8ln8m0164j0";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs f hydra ];
+        meta = {
+          homepage = "https://melpa.org/#/git-identity";
+          license = lib.licenses.free;
+        };
+      }) {};
     git-lens = callPackage ({ emacs
                             , fetchFromGitLab
                             , fetchurl
@@ -21385,12 +21752,12 @@
       melpaBuild {
         pname = "gitlab-ci-mode";
         ename = "gitlab-ci-mode";
-        version = "20190222.11.8";
+        version = "20190425.11.10";
         src = fetchFromGitLab {
           owner = "joewreschnig";
           repo = "gitlab-ci-mode";
-          rev = "ee4bd839c11405f770543d789ad668f0ecc9eaec";
-          sha256 = "1qp6h1yyp8259cxygxi1y4r9jk21qd3l46ggnfhz0p6lpqphc5bq";
+          rev = "dac4e5125c78aa3ae12d2e35a66196d709676236";
+          sha256 = "1jkp9mnbiccqnha9zs646znqyqvy5jjb81kah7ghbkzdqqk2avm0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode";
@@ -21585,6 +21952,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    gn-mode = callPackage ({ cl-lib ? null
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "gn-mode";
+        ename = "gn-mode";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "lashtear";
+          repo = "gn-mode";
+          rev = "fcf8e1e500d953364e97e7ebc5708a2c00fa3cd2";
+          sha256 = "0dz5kgzbgsssr38z2kg6m915cvfys42ag1k42bsra3la2pixywfx";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f5c6c27bce3d0aaf7e3791299a527d5f1fd69653/recipes/gn-mode";
+          sha256 = "1rn4xa1am1yd9k2hpi5b0zhs3pgq4hnhgxdgs258cmhszm8c6ii2";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     gntp = callPackage ({ fetchFromGitHub
                         , fetchurl
                         , lib
@@ -21802,12 +22196,12 @@
       melpaBuild {
         pname = "go-dlv";
         ename = "go-dlv";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "go-dlv.el";
-          rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
-          sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
+          rev = "df03ade331d8fb46acc57ef358e696bc36129e04";
+          sha256 = "0sfx84cbxn8d3gsjg0zjam4yc7pjlyp3g94xa3xv91k71ncnijs1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
@@ -22405,7 +22799,7 @@
       melpaBuild {
         pname = "govc";
         ename = "govc";
-        version = "0.20.0";
+        version = "0.20.1";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
@@ -22998,12 +23392,12 @@
       melpaBuild {
         pname = "gruvbox-theme";
         ename = "gruvbox-theme";
-        version = "1.27.0";
+        version = "1.28.0";
         src = fetchFromGitHub {
           owner = "greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0";
-          sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5";
+          rev = "69a6ddf6c7e8c84174b94900ba71ddd08ec0237f";
+          sha256 = "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme";
@@ -23041,6 +23435,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    gsettings = callPackage ({ dash
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , gvariant
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
+        pname = "gsettings";
+        ename = "gsettings";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-gsettings";
+          rev = "1dd9a6a3036d76d8e680b2764c35b31bf5e6aff7";
+          sha256 = "0bv6acy3b6pbjqm24yxgi7xdd3x0c2b7s5sq65sb3lxf8hy5gdf6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebdd0285684c712748d6353bd2a4774bd97dd521/recipes/gsettings";
+          sha256 = "168zq3gp874k66jv8k78i6b1cb9042763aj9wpmcs9bz437hhw32";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs gvariant s ];
+        meta = {
+          homepage = "https://melpa.org/#/gsettings";
+          license = lib.licenses.free;
+        };
+      }) {};
     guide-key = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
@@ -23150,6 +23573,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    gvariant = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , parsec }:
+      melpaBuild {
+        pname = "gvariant";
+        ename = "gvariant";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-gvariant";
+          rev = "79c34d11ee6a34f190f1641a133d34b0808a1143";
+          sha256 = "18ld0wv8r5wlbicqym8vdw33la0bn59s7bxm2fw0w97qwjka8g8k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a616ac75f77b1e61e1386bd905b6bcf3d8aaa3f/recipes/gvariant";
+          sha256 = "1ycrnfq60z9fycgqmp1y8jna0l0c2b6mlg6ggimb0rml1ili6npm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs parsec ];
+        meta = {
+          homepage = "https://melpa.org/#/gvariant";
+          license = lib.licenses.free;
+        };
+      }) {};
     gxref = callPackage ({ emacs
                          , fetchFromGitHub
                          , fetchurl
@@ -23176,6 +23626,59 @@
           license = lib.licenses.free;
         };
       }) {};
+    hack-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , s }:
+      melpaBuild {
+        pname = "hack-mode";
+        ename = "hack-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "hhvm";
+          repo = "hack-mode";
+          rev = "59862c38643b355c41a10cf455ec2e5c6739edcd";
+          sha256 = "1imlzp400hjfy011l8aqg2jgq45y8brvp4xfx7q6lsb3hrmzkysl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode";
+          sha256 = "1zs7p6fczj526wz9kvyhmxqkgrkfkkrvm9ma4cg349sfpjpxwkbl";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/hack-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hack-time-mode = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "hack-time-mode";
+        ename = "hack-time-mode";
+        version = "0.1.0";
+        src = fetchFromGitLab {
+          owner = "marcowahl";
+          repo = "hack-time-mode";
+          rev = "95ed4c8a2410e1232453b3a49274a46afb740b1e";
+          sha256 = "083b9kwhh4bq0dwn6iskrrmsgxicqg08p8k6n1m1xadgs61lgkjb";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
+          sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hack-time-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     hacker-typer = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -23522,11 +24025,11 @@
       melpaBuild {
         pname = "haskell-tab-indent";
         ename = "haskell-tab-indent";
-        version = "0.1.0";
+        version = "0.2";
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
-          rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc";
-          sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02";
+          rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853";
+          sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent";
@@ -23683,12 +24186,12 @@
       melpaBuild {
         pname = "helm";
         ename = "helm";
-        version = "3.1";
+        version = "3.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8de179db41598515f1db758b8d35728a3fd58f18";
-          sha256 = "1x3nv8zvp8vvl30bm2d83hd7zxb0ca64pc8kwb81ml9al6r3mm01";
+          rev = "381850225e621c6315e453a98c99229a0d755281";
+          sha256 = "12yyprpgh2by2pd41i4z9gz55fxg0f90x03bfrsf791xwbhf6931";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -23868,6 +24371,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-bitbucket = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , helm-core
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "helm-bitbucket";
+        ename = "helm-bitbucket";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "dragonwasrobot";
+          repo = "helm-bitbucket";
+          rev = "632495036c4a6ac30e408fc74ee9f209fd5ac429";
+          sha256 = "0rbgk982jlbqh1rhns3zmndfr3lpw7m2j9z7qylghkll4k8fcjpl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8df73e21dee5144147f9432efe95ee576ac5f435/recipes/helm-bitbucket";
+          sha256 = "19bflbnavkwipf7mcrkg3i64iz50jmzm64nl7y1ka349mpy5sm04";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm-core ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-bitbucket";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-bm = callPackage ({ bm
                            , cl-lib ? null
                            , fetchFromGitHub
@@ -23923,7 +24453,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-bundle-show = callPackage ({ fetchFromGitHub
+    helm-bundle-show = callPackage ({ emacs
+                                    , fetchFromGitHub
                                     , fetchurl
                                     , helm
                                     , lib
@@ -23931,19 +24462,19 @@
       melpaBuild {
         pname = "helm-bundle-show";
         ename = "helm-bundle-show";
-        version = "1.1.5";
+        version = "1.1.6";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-bundle-show";
-          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
-          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+          rev = "70f1ca7d1847c7d5cd5a3e488562cd4a295b809f";
+          sha256 = "12wz98fcs8v8w74ck4jqbh47pp5956xxh9ld5kpym9zrm39adpq2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-bundle-show";
           license = lib.licenses.free;
@@ -24129,12 +24660,12 @@
       melpaBuild {
         pname = "helm-core";
         ename = "helm-core";
-        version = "3.1";
+        version = "3.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "19381fb02817de196dba0f344e06e7751a1816f6";
-          sha256 = "1jh4nmmx8iwqdvpwwzq3c6f5hwyla000bmbyc2p5anmfwzsfp0lb";
+          rev = "0f59a63c225f1c9c265cd350359a1c03e42e2d1c";
+          sha256 = "19qrd8157l2cjgi5kc8l7df3y8p7l9zky7idi0gn0cp95463nd57";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -24478,7 +25009,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ghq = callPackage ({ fetchFromGitHub
+    helm-ghq = callPackage ({ emacs
+                            , fetchFromGitHub
                             , fetchurl
                             , helm
                             , lib
@@ -24486,19 +25018,19 @@
       melpaBuild {
         pname = "helm-ghq";
         ename = "helm-ghq";
-        version = "1.7.0";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
-          sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
+          rev = "d0d6aa0f407388e7012f0443df8ae657ece01779";
+          sha256 = "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-ghq";
           license = lib.licenses.free;
@@ -24539,12 +25071,12 @@
       melpaBuild {
         pname = "helm-github-stars";
         ename = "helm-github-stars";
-        version = "1.3.6";
+        version = "1.3.7";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "8cea100f788832ad28c2a61b8fc805298383e263";
-          sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma";
+          rev = "c891690218b0d8b957ea6cb45b1b6cffd15a6950";
+          sha256 = "0050i3apv72klqi3s0zw5sv4r4sizx4vlw07l52i39ij7bzjhkzz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
@@ -24642,7 +25174,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-hatena-bookmark = callPackage ({ fetchFromGitHub
+    helm-hatena-bookmark = callPackage ({ emacs
+                                        , fetchFromGitHub
                                         , fetchurl
                                         , helm
                                         , lib
@@ -24650,19 +25183,19 @@
       melpaBuild {
         pname = "helm-hatena-bookmark";
         ename = "helm-hatena-bookmark";
-        version = "2.3.0";
+        version = "2.4.3";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e";
-          sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk";
+          rev = "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e";
+          sha256 = "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-hatena-bookmark";
           license = lib.licenses.free;
@@ -25297,7 +25830,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-qiita = callPackage ({ fetchFromGitHub
+    helm-qiita = callPackage ({ emacs
+                              , fetchFromGitHub
                               , fetchurl
                               , helm
                               , lib
@@ -25305,19 +25839,19 @@
       melpaBuild {
         pname = "helm-qiita";
         ename = "helm-qiita";
-        version = "1.0.2";
+        version = "1.1.3";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-qiita";
-          rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1";
-          sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3";
+          rev = "5f82010c595f8e122aa3f68148ba8d8ccb1333d8";
+          sha256 = "1vkm2h0ia0gqqjw6cnbyik0fv37zzjwwdzk1cnh7a3s5hsg60i68";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
           sha256 = "1iz2w1901zz3zk9zazikmnkzng5klnvqn4ph1id7liksrcdpdmpm";
           name = "recipe";
         };
-        packageRequires = [ helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "https://melpa.org/#/helm-qiita";
           license = lib.licenses.free;
@@ -25715,12 +26249,12 @@
       melpaBuild {
         pname = "helm-tramp";
         ename = "helm-tramp";
-        version = "1.2.6";
+        version = "1.2.7";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "a7456cee86a83d68c966475fab90ab94006fd23c";
-          sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w";
+          rev = "af5bd50b955e385bc447080e720ffc85ed0b286b";
+          sha256 = "0s6zasnk9kwpiw3446n0jn7xi5v6w7asdpzx5aqh85karrb7bbq6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -26243,7 +26777,7 @@
       melpaBuild {
         pname = "hindent";
         ename = "hindent";
-        version = "5.2.6";
+        version = "5.3.0";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "hindent";
@@ -26413,26 +26947,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    hl-todo = callPackage ({ fetchFromGitHub
+    hl-todo = callPackage ({ emacs
+                           , fetchFromGitHub
                            , fetchurl
                            , lib
                            , melpaBuild }:
       melpaBuild {
         pname = "hl-todo";
         ename = "hl-todo";
-        version = "2.2.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "099d0f6d583009b0c5de8e51e38972d6e14e0587";
-          sha256 = "1sfpwwkhfv6a9hd8kgb4h9axc3x2mq3z32i6iaz1q1l6w6k8v0r3";
+          rev = "487d349b7b8d6738223d5dd10957dd10b45eb9f3";
+          sha256 = "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/hl-todo";
           license = lib.licenses.free;
@@ -26839,23 +27374,24 @@
                          , fetchFromGitHub
                          , fetchurl
                          , lib
+                         , lv
                          , melpaBuild }:
       melpaBuild {
         pname = "hydra";
         ename = "hydra";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
-          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
+          rev = "f27fce1b2f0a9162e159557bdeb2c0c94defb4d2";
+          sha256 = "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra";
           sha256 = "1s1hj70jjbira054q8ly1pcr0818hh91qnhj0zwbv7milmvv2wwd";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib lv ];
         meta = {
           homepage = "https://melpa.org/#/hydra";
           license = lib.licenses.free;
@@ -27646,12 +28182,12 @@
       melpaBuild {
         pname = "immaterial-theme";
         ename = "immaterial-theme";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "petergardfjall";
           repo = "emacs-immaterial-theme";
-          rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815";
-          sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c";
+          rev = "176178a57c5b342b04bebd3107c29c6d12086cf5";
+          sha256 = "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme";
@@ -27915,12 +28451,12 @@
       melpaBuild {
         pname = "inf-ruby";
         ename = "inf-ruby";
-        version = "2.5.1";
+        version = "2.5.2";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2";
-          sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z";
+          rev = "d2cc45ac1a035286decb12c4f49c696ad5f03d27";
+          sha256 = "0a1hhvfbl6mq8rjsi77fg9fh5a91hi5scjrg9rjqc5ffbql67y0v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -28274,12 +28810,12 @@
       melpaBuild {
         pname = "intero";
         ename = "intero";
-        version = "0.1.37";
+        version = "0.1.40";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "e5ca92990f0647d2d0e4a6009534910e4d2c7f00";
-          sha256 = "0bn4al2q324zlazhlsca7gw2d3s4nmvd24spdqwimfq2y769pb73";
+          rev = "8da81244783fbf03afb49660423c875f2e874fba";
+          sha256 = "17vibxapzp4wf0dfc56x98wsf3wy98ghj5h10nyf7xcfwy6k0rja";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -28708,12 +29244,12 @@
       melpaBuild {
         pname = "ivy-mpdel";
         ename = "ivy-mpdel";
-        version = "0.4.0";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "ivy-mpdel";
-          rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d";
-          sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6";
+          rev = "a42dcc943914c71975c115195d38c739f25e475c";
+          sha256 = "0zf007j3i9prlsqjaf0xw7ylaim463f867nfc63fpsr508xsn5rd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel";
@@ -28763,12 +29299,12 @@
       melpaBuild {
         pname = "ivy-prescient";
         ename = "ivy-prescient";
-        version = "2.2.2";
+        version = "3.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e";
-          sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0";
+          rev = "ae414dde56f3430867faf41c04e4c3df75f9c960";
+          sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
@@ -29259,6 +29795,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    jq-format = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , reformatter }:
+      melpaBuild {
+        pname = "jq-format";
+        ename = "jq-format";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-jq-format";
+          rev = "47e1c5adb89b37b4d53fe01302d8c675913c20e7";
+          sha256 = "1g9chp1b3lkrg46b39swrkvp5willi0ay3i177jdp6knbzhj4mq3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce800af0c5dd7f1e4ab7ade92a863ce500c12fce/recipes/jq-format";
+          sha256 = "1ljbpgcs1s1if9s5c10k12f23rad7172k7y3s38ipn7vl7wmarw0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs reformatter ];
+        meta = {
+          homepage = "https://melpa.org/#/jq-format";
+          license = lib.licenses.free;
+        };
+      }) {};
     jq-mode = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
@@ -29660,12 +30223,12 @@
       melpaBuild {
         pname = "julia-repl";
         ename = "julia-repl";
-        version = "1.0.2";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "tpapp";
           repo = "julia-repl";
-          rev = "d8b94c6dbfa47fd51540b9d5b1bb0c2dfce3ebc2";
-          sha256 = "027ib0i5af23s3kxsfbxh3jgw944crry0v4c7yxz9l8r8p3wpq1k";
+          rev = "6eb58ef8b2e922e042fb0aee399547291fce06a4";
+          sha256 = "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -29743,12 +30306,12 @@
       melpaBuild {
         pname = "jupyter";
         ename = "jupyter";
-        version = "0.7.3";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "dzop";
           repo = "emacs-jupyter";
-          rev = "83af335166a28e131159fc95586a0d0abe8efde4";
-          sha256 = "1bq6lsip5m8ci8j8h26lj892zims6d76jv713bry3pzc66lj6570";
+          rev = "112769e0c679fb95db25128051e67bb22ff36ed5";
+          sha256 = "1sda8zn1c583ccw8g5rzzyf47ganmkgga5dym2kx78ayhk50jjbc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter";
@@ -29903,12 +30466,12 @@
       melpaBuild {
         pname = "kaolin-themes";
         ename = "kaolin-themes";
-        version = "1.5.0";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "08eac2883e87ad8cf17331a86fa447a7a8bc73b4";
-          sha256 = "06wl0zmxxv2gx9cka80sa7s3kra756nn8w1d6z4d5banwcc8nmjm";
+          rev = "0aba840acbfafb87efbbdbb33f9353c8b8698978";
+          sha256 = "1cnx29arfz9rm8ma2lkgl024s0x7ryzqq9lhhr7181z3vzjh47k5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -30030,12 +30593,12 @@
       melpaBuild {
         pname = "keycast";
         ename = "keycast";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keycast";
-          rev = "7c45ff05c1e9b50a3304da71906764b6c4f6f3a4";
-          sha256 = "0bbzdjy66f8xpckkrcic1r9g9zw3d243nvp5mm4yfc9qdnx1hr6p";
+          rev = "fe416461b15543138ad4fef8ef5e2c364a6b5b2c";
+          sha256 = "15q2kc7mlmr856ldh6bkba26zq8fwia26cv1gsqwj3jmhml6mlq1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast";
@@ -30287,12 +30850,12 @@
       melpaBuild {
         pname = "kivy-mode";
         ename = "kivy-mode";
-        version = "1.10.1";
+        version = "1.11.0";
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "0c63c698fdf3f283581dcb53f2909a0bf7ab2737";
-          sha256 = "0jn16i7qnf80irxi149cfn8z38czii8paazfs8mz1qzgmx2ycj2i";
+          rev = "3e57ac0b07385384619a8042dafcab89cc10da57";
+          sha256 = "1pm0660x688rpgns9jpzg1y08pavp65dazm1aznkvpnvdhy2zs93";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -30358,6 +30921,7 @@
         };
       }) {};
     ksp-cfg-mode = callPackage ({ cl-lib ? null
+                                , emacs
                                 , fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -30365,19 +30929,19 @@
       melpaBuild {
         pname = "ksp-cfg-mode";
         ename = "ksp-cfg-mode";
-        version = "0.5.1";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "fda64705f605fb8fccee53a5040fe4865ca17d44";
-          sha256 = "19brscxk85cky2kzwyyljz6xqrfvyyyg7dqmadlnlrf8kw9wnb2x";
+          rev = "faec8bd8456c67276d065eb68c88a30efcef59ef";
+          sha256 = "192s6hz71i0d8bwxn2pdl9yggs2l5fd6jxlxmry8fpk04qg3lqrg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
           sha256 = "0azcn4qvziacbw1qy33fwdaldw7xpzr672vzjsqhr0b2vg9m2ipi";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/ksp-cfg-mode";
           license = lib.licenses.free;
@@ -30897,12 +31461,12 @@
       melpaBuild {
         pname = "libmpdel";
         ename = "libmpdel";
-        version = "0.7.0";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "libmpdel";
-          rev = "fcc719c2f23df4b5838eab76a40fef11055203de";
-          sha256 = "0qw6rrb16bbhwg1gci4ymn2nshzf21lcf2nyphxbn4vcv400cw4k";
+          rev = "38633ef7a1a40740d1a9528c4f0f0d40d489d9fe";
+          sha256 = "1fk4irsx916q81qpy6d6iarg8q30r1xm9syz63i8pfdf08l6wphj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel";
@@ -31073,31 +31637,24 @@
                          , iedit
                          , lib
                          , melpaBuild
-                         , multiple-cursors
-                         , swiper }:
+                         , swiper
+                         , zoutline }:
       melpaBuild {
         pname = "lispy";
         ename = "lispy";
-        version = "0.26.0";
+        version = "0.27.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "7756a8fbbadbebbd5e20768569ed92ad6c402c5c";
-          sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
+          rev = "9c41bc011ae570283cb286659f75d12d38d437ea";
+          sha256 = "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "recipe";
         };
-        packageRequires = [
-          ace-window
-          emacs
-          hydra
-          iedit
-          multiple-cursors
-          swiper
-        ];
+        packageRequires = [ ace-window emacs hydra iedit swiper zoutline ];
         meta = {
           homepage = "https://melpa.org/#/lispy";
           license = lib.licenses.free;
@@ -31294,12 +31851,12 @@
       melpaBuild {
         pname = "literate-elisp";
         ename = "literate-elisp";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "jingtaozf";
           repo = "literate-elisp";
-          rev = "0724b62d98cb9d9c7f3d171c322a1059648746f5";
-          sha256 = "0nnfp8rj4avn462w3fwln8c7sai3psz7kp97r3iyq4v9wavgdni2";
+          rev = "d0f228089f011b8e4f2c40784c55168120181f97";
+          sha256 = "08msx8r3vdpx9ihjf2qd2xlk5jni3h4jyk65a36nm1r3z439jd83";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4c1c4da2a5571babda9a29a56b8972ad0687c0/recipes/literate-elisp";
@@ -31348,7 +31905,7 @@
       melpaBuild {
         pname = "live-py-mode";
         ename = "live-py-mode";
-        version = "2.25.0";
+        version = "2.25.1";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
@@ -31398,12 +31955,12 @@
       melpaBuild {
         pname = "load-relative";
         ename = "load-relative";
-        version = "1.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-load-relative";
-          rev = "15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d";
-          sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy";
+          rev = "5055bfd80644e306aef4e7a7e3e9e5d765b691a4";
+          sha256 = "1w2xvnihk607vnmlmqz7zsjksd3mscjx2igdadxsfz398bjwl0qd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
@@ -31611,12 +32168,12 @@
       melpaBuild {
         pname = "lsp-java";
         ename = "lsp-java";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "17a1ec97e30b0690c5f79bc8223f23b7e7dfe577";
-          sha256 = "11gpd3yy2018s6m3s3pzkhknhgbs7cf38jsg6ma5lidmygjivpjc";
+          rev = "527e7b7abc11b51516b9bb52051201c2cdcd4a39";
+          sha256 = "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java";
@@ -31782,12 +32339,12 @@
       melpaBuild {
         pname = "lv";
         ename = "lv";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "a07b92a8755dfb064701210b634e2dc4839552ac";
-          sha256 = "11k0ifmr90vdinibhyqqyqrmpxbn9c5pjpzhr4p66wv6249s540w";
+          rev = "5c5b9ca3262594c92f8f73c98db5ed0f1efd0319";
+          sha256 = "0dvh4sg1s76jy41vsy6dh3a4b8vr5msldnyssmqzdqwrsw64hl6r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5114349617617673d5055fe28cb8f8c86cf41f83/recipes/lv";
@@ -31979,8 +32536,8 @@
           sha256 = "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
-          sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9f963950d69a944443d9b6a1658799f7860d0f93/recipes/magit";
+          sha256 = "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1";
           name = "recipe";
         };
         packageRequires = [
@@ -32339,12 +32896,12 @@
       melpaBuild {
         pname = "magit-todos";
         ename = "magit-todos";
-        version = "1.1.7";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "42dde9c5df2e0d59b30faf866e0a9e9a75cd4be0";
-          sha256 = "0qagdxpik64n4rw9scy451ws5sw00v64ri9g2dcw7b66bx2c6c6w";
+          rev = "61dc0edae2dd55b11b675e7b27bbd7019d8d80a3";
+          sha256 = "17a18gszbypz82bj36xbfyykc4s9rz83vwmpxvlf65svhd51c0nh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
@@ -32909,8 +33466,8 @@
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "math-symbol-lists";
-          rev = "e15ec26a010b4f38111bc150c51ecb1a319f6bdb";
-          sha256 = "11jk0xdlc8zk2way1d85n2khmydzzvpjhh8bbjbdsv8d1z3j9yfh";
+          rev = "499986959356f7a905fd4f2a1609c17d7ff067c3";
+          sha256 = "1h6fwj2w77gm4wafqll5bd6r8xafh6f4a0piqmgjvcwxy2sxrk0q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
@@ -33122,12 +33679,12 @@
       melpaBuild {
         pname = "meghanada";
         ename = "meghanada";
-        version = "1.0.13";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "5f792cfe77b77aced5e70a118aba159f6e59234a";
-          sha256 = "0scj5wdd9xhpfj5cvjib8x9hzfkylb5h484ndch0vc1l79nlb650";
+          rev = "81a2a5da2b645701bed6eb09d606b3968f1df2ca";
+          sha256 = "0lns4w1n31nvpv14x7kcdq1m3k1isdqmdnkdav854hg154fibxqa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -33227,12 +33784,12 @@
       melpaBuild {
         pname = "merlin";
         ename = "merlin";
-        version = "3.2.2";
+        version = "3.3.0";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "merlin";
-          rev = "8bcd99c8e5de984f04966674dcbb1c40c5d89045";
-          sha256 = "1dd9mj8z6xpbvvgp489nxsscj8hcar4mx920d61cyxnxgz1phq5p";
+          rev = "800c793870c7ff3b00a6817ab16b03628c6495eb";
+          sha256 = "0yx92lybw685ay5qd8jpdxwfdjmhhbrpkpi94gysq9bmh0kqhixr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9338298a79b7f2d654df90b0f553aeed1428de13/recipes/merlin";
@@ -33382,12 +33939,12 @@
       melpaBuild {
         pname = "mgmtconfig-mode";
         ename = "mgmtconfig-mode";
-        version = "0.0.18";
+        version = "0.0.19";
         src = fetchFromGitHub {
           owner = "purpleidea";
           repo = "mgmt";
-          rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f";
-          sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80";
+          rev = "07f542b4d753fe2f182b5e139450217a633491f8";
+          sha256 = "0nbj3fh3wsl9065mad04c7avc2pq4lqrdng1xkwdng6l361f2wak";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode";
@@ -33408,12 +33965,12 @@
       melpaBuild {
         pname = "mhc";
         ename = "mhc";
-        version = "1.2.1";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570";
-          sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2";
+          rev = "88b5f938e57c28e9e2db202770f952fc0ecba945";
+          sha256 = "13d31wz7wyh777isimxlkdimj3vbl54bh0f00p15a8xlrs2pn7f3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -33768,12 +34325,12 @@
       melpaBuild {
         pname = "mocha-snippets";
         ename = "mocha-snippets";
-        version = "1.0.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "cowboyd";
           repo = "mocha-snippets.el";
-          rev = "e054137bd78f0d236e983874da1f345d30a71816";
-          sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
+          rev = "361a3809f755577406e109b9e44d473dfa7c08e0";
+          sha256 = "0xcybq0cwd0c33bi1jf7h098a4anc4gkj3m1c97gc8mz9x4fjksy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
@@ -33992,6 +34549,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    monky = callPackage ({ fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "monky";
+        ename = "monky";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "monky";
+          rev = "099f1af9d3f6f6143f5e98a9b844f965a011a120";
+          sha256 = "1fgn7al4zwz2k5wb5dy3byqg9lsrjk9fra341mxh5ma2pfwxjgps";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
+          sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/monky";
+          license = lib.licenses.free;
+        };
+      }) {};
     monokai-theme = callPackage ({ fetchFromGitHub
                                  , fetchurl
                                  , lib
@@ -34042,6 +34624,58 @@
           license = lib.licenses.free;
         };
       }) {};
+    mood-line = callPackage ({ emacs
+                             , fetchFromGitLab
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "mood-line";
+        ename = "mood-line";
+        version = "1.1.2";
+        src = fetchFromGitLab {
+          owner = "jessieh";
+          repo = "mood-line";
+          rev = "3560d8aafd8c856a218ff8fab5a30e1aa0db25b6";
+          sha256 = "08qh8x0gd7byvfp03jpkd95h70djh8vrwpm451932zwf66j7fnay";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b10524f105943648ecf52f007f363b7b5534865e/recipes/mood-line";
+          sha256 = "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mood-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mood-one-theme = callPackage ({ emacs
+                                  , fetchFromGitLab
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "mood-one-theme";
+        ename = "mood-one-theme";
+        version = "1.0.3";
+        src = fetchFromGitLab {
+          owner = "jessieh";
+          repo = "mood-one-theme";
+          rev = "47fc825547664c3e3eb8f47f1a9cf74b23efc2c6";
+          sha256 = "17zz3nc3r2cm4w99frzqxnh768vnmzs71p9zz9bj03wc222n1kv6";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/44fbe8c54e4052e6c38849a12425db8f7c04fcc1/recipes/mood-one-theme";
+          sha256 = "1ar3vsc0d838m2k54f4v8a4mc0g21qa9rmgr2wb763vb7vpcznmi";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mood-one-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     moody = callPackage ({ emacs
                          , fetchFromGitHub
                          , fetchurl
@@ -34308,12 +34942,12 @@
       melpaBuild {
         pname = "mpdel";
         ename = "mpdel";
-        version = "0.6.0";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "mpdel";
           repo = "mpdel";
-          rev = "a1e05828e3bc03679530b4cfff1306706171cb78";
-          sha256 = "1avfhkklhkkazy1b0ymcmc0walrs29ak36vbvaxs480r5s16dkjd";
+          rev = "a2da2f2fe2357641909514da788f7c6cbe5801f4";
+          sha256 = "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel";
@@ -34421,12 +35055,12 @@
       melpaBuild {
         pname = "msvc";
         ename = "msvc";
-        version = "1.3.7";
+        version = "1.4.1";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
-          sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
+          rev = "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06";
+          sha256 = "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -35202,6 +35836,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    ng2-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , typescript-mode }:
+      melpaBuild {
+        pname = "ng2-mode";
+        ename = "ng2-mode";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "ng2-mode";
+          rev = "57e6e4e388624853bc3b79bf5b17d2663ce26fa5";
+          sha256 = "08dm8clw3xm0c3xcbl3q4dm9n7cxhpldnwxjaxs1glc5l21qdg4q";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
+          sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r";
+          name = "recipe";
+        };
+        packageRequires = [ typescript-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ng2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     nginx-mode = callPackage ({ fetchFromGitHub
                               , fetchurl
                               , lib
@@ -35361,6 +36021,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    nix-haskell-mode = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , flycheck
+                                    , haskell-mode
+                                    , lib
+                                    , melpaBuild
+                                    , nix-mode }:
+      melpaBuild {
+        pname = "nix-haskell-mode";
+        ename = "nix-haskell-mode";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "matthewbauer";
+          repo = "nix-haskell-mode";
+          rev = "1622924f0f6668f9b42f135323087ba94b1bf252";
+          sha256 = "09x4b939y0w4irnkvpxhn1jkzy4id9vhfkl5b9f14jjdny2d6l3a";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aeb879e2e8b017d3e1ccdc8d19f17d09b2ad5f1b/recipes/nix-haskell-mode";
+          sha256 = "1rygqmq01p27gbda6hgnzisng7xqf63x462a3x31ym67ivxsyqz3";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck haskell-mode nix-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/nix-haskell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     nix-mode = callPackage ({ emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -35450,12 +36139,12 @@
       melpaBuild {
         pname = "no-littering";
         ename = "no-littering";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1";
-          sha256 = "0r45bz68d3bx1bnnp28gkyw9rsnly5dy2b9h1b2gjn1hpfs7clci";
+          rev = "99ae007ead688689b5b25a9482f98ec67663bb61";
+          sha256 = "0sg4qh9a6k1m24qamsf7ldpghjcawbdgh114gy08jnw478nf05kv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -35603,11 +36292,11 @@
       melpaBuild {
         pname = "notmuch";
         ename = "notmuch";
-        version = "0.28.3";
+        version = "0.29";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "3c752b855f900f5251df9997514b4d27d9f38e83";
-          sha256 = "07k5bsifxlsy6caqgk467cfgqw3mgfb5cqb80nc5v4fcjfh0wwcv";
+          rev = "9300defd64acf68b8e6fa6fbd89b8050168bb63d";
+          sha256 = "09myljmmrcr4f6a93zwi8k39nndw2fmpj3g2jk2bl3ddql8x0gvl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
@@ -36403,32 +37092,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    olivetti = callPackage ({ emacs
-                            , fetchFromGitHub
-                            , fetchurl
-                            , lib
-                            , melpaBuild }:
-      melpaBuild {
-        pname = "olivetti";
-        ename = "olivetti";
-        version = "1.6.1";
-        src = fetchFromGitHub {
-          owner = "rnkn";
-          repo = "olivetti";
-          rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1";
-          sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
-          sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
-          name = "recipe";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/olivetti";
-          license = lib.licenses.free;
-        };
-      }) {};
     omni-kill = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
@@ -37044,12 +37707,12 @@
       melpaBuild {
         pname = "org-clock-csv";
         ename = "org-clock-csv";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "org-clock-csv";
-          rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
-          sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
+          rev = "e2fbaa1ad1a1be40fceecde603a600b292b76acc";
+          sha256 = "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -37091,6 +37754,7 @@
         };
       }) {};
     org-d20 = callPackage ({ dash
+                           , emacs
                            , fetchgit
                            , fetchurl
                            , lib
@@ -37100,18 +37764,18 @@
       melpaBuild {
         pname = "org-d20";
         ename = "org-d20";
-        version = "0.2";
+        version = "0.3";
         src = fetchgit {
           url = "https://git.spwhitton.name/org-d20";
-          rev = "a88a3bb5e43940c2965edd8de27ecf7a2065d86b";
-          sha256 = "08s05hpyg52qhvf487cy8x6p2ln8mkiw49kmcavmkmpss2zsqdpn";
+          rev = "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61";
+          sha256 = "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20";
           sha256 = "158n900ifb1mfckd0gjmb9gpzibh8a2x56flbn2r035gcdbb7wc5";
           name = "recipe";
         };
-        packageRequires = [ dash s seq ];
+        packageRequires = [ dash emacs s seq ];
         meta = {
           homepage = "https://melpa.org/#/org-d20";
           license = lib.licenses.free;
@@ -37562,12 +38226,12 @@
       melpaBuild {
         pname = "org-mime";
         ename = "org-mime";
-        version = "0.1.5";
+        version = "0.1.6";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986";
-          sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm";
+          rev = "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c";
+          sha256 = "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -37588,12 +38252,12 @@
       melpaBuild {
         pname = "org-mru-clock";
         ename = "org-mru-clock";
-        version = "0.2.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "org-mru-clock";
-          rev = "0e2dcb7799fb82bbe55c8aa9930192871e8b6109";
-          sha256 = "08z6jc7qhj7zmzf1sag1n4nqh77k1dis2ijc6s2pzqlaxm3rhxyw";
+          rev = "1547191254f6fc58b62864d0224356e72bd7d933";
+          sha256 = "0j3gscmf8i05ixj31ipdc88kbb7zqs5sdhbd3ipqpahakmg6axhh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -37942,12 +38606,12 @@
       melpaBuild {
         pname = "org-re-reveal";
         ename = "org-re-reveal";
-        version = "1.0.3";
+        version = "1.1.5";
         src = fetchFromGitLab {
           owner = "oer";
           repo = "org-re-reveal";
-          rev = "50cc6574c77f12d423f6cd096d8f76feb3673abc";
-          sha256 = "1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8";
+          rev = "9d4a1bee112db8007c0e0a1fcb6be725f787a79a";
+          sha256 = "1pq3ynp441j1vhac0cz98r2riqw2187vdwc33hz92924kly66m9h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal";
@@ -37960,35 +38624,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-readme = callPackage ({ fetchFromGitHub
-                              , fetchurl
-                              , header2
-                              , http-post-simple
-                              , lib
-                              , lib-requires
-                              , melpaBuild
-                              , yaoddmuse }:
-      melpaBuild {
-        pname = "org-readme";
-        ename = "org-readme";
-        version = "20130322.926";
-        src = fetchFromGitHub {
-          owner = "mattfidler";
-          repo = "org-readme";
-          rev = "15054e42351b5ec6b629c55760a578516e035355";
-          sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/317318e6071b174e0ec6302ea4f526976d837db4/recipes/org-readme";
-          sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
-          name = "recipe";
-        };
-        packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ];
-        meta = {
-          homepage = "https://melpa.org/#/org-readme";
-          license = lib.licenses.free;
-        };
-      }) {};
     org-recent-headings = callPackage ({ dash
                                        , emacs
                                        , fetchFromGitHub
@@ -38604,6 +39239,7 @@
     org-wild-notifier = callPackage ({ alert
                                      , async
                                      , dash
+                                     , dash-functional
                                      , emacs
                                      , fetchFromGitHub
                                      , fetchurl
@@ -38612,19 +39248,19 @@
       melpaBuild {
         pname = "org-wild-notifier";
         ename = "org-wild-notifier";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "akhramov";
           repo = "org-wild-notifier.el";
-          rev = "65054365e4b279cef97acc6d20235c4ca422cf04";
-          sha256 = "1h6nb1g075anbqw0a5pdfy5194hldhngvdx20naf5y2nznqj7dn7";
+          rev = "6e194d0f0a21b7d2b09ebdef5ffcd5ffe3633339";
+          sha256 = "0vh8hhb0d5y3bgp0i9msk5c6rpn1mzj9bzqmbk6xwl4qr07hgnxx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
           sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
           name = "recipe";
         };
-        packageRequires = [ alert async dash emacs ];
+        packageRequires = [ alert async dash dash-functional emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-wild-notifier";
           license = lib.licenses.free;
@@ -39403,12 +40039,12 @@
       melpaBuild {
         pname = "ox-wk";
         ename = "ox-wk";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "w-vi";
           repo = "ox-wk.el";
-          rev = "9fc37e7e2f789b0ba07cb117ea1e1dcd14a2fd83";
-          sha256 = "00wsx21nmnvci2wfvxaci1kdxplavi2a4dw8ahvl7ncr3b60219f";
+          rev = "3da2213be1874d9d3e8a9337b09003d9c102b943";
+          sha256 = "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0947993df2d9bee493c2c25760f1ac5bcc1136ac/recipes/ox-wk";
@@ -39853,12 +40489,12 @@
       melpaBuild {
         pname = "paradox";
         ename = "paradox";
-        version = "2.5.3";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "3d918ad74448eb4715be8ac25406e20be552017a";
-          sha256 = "1hmkizglppky16k6v1ahxq1awcn8k2x82yrgdvsgkl29qg9s3fkl";
+          rev = "d24fe4a329a939ffa1983886d77a6937e05149e4";
+          sha256 = "1v78nmqyx60ki64wql7faq6ihv2qbk72sb19cy6hnypi546d81yp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -39871,6 +40507,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    parchment-theme = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "parchment-theme";
+        ename = "parchment-theme";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "ajgrf";
+          repo = "parchment";
+          rev = "7d48ae9b39c37eeef7ab5bf7ee049d2edf0411a6";
+          sha256 = "071k34i48dsmlgpi8mpdff1fgcnz29dj2ci52c1i3alp9yc7s67a";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2302f512053b22e5abbd6a654cf94e4d5c7f5ca/recipes/parchment-theme";
+          sha256 = "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/parchment-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     paredit = callPackage ({ fetchgit
                            , fetchurl
                            , lib
@@ -40775,12 +41437,12 @@
       melpaBuild {
         pname = "pfuture";
         ename = "pfuture";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "pfuture";
-          rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d";
-          sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d";
+          rev = "263227534e8bb98aedce18698c34db9fd4d6500b";
+          sha256 = "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -40961,12 +41623,12 @@
       melpaBuild {
         pname = "php-mode";
         ename = "php-mode";
-        version = "1.21.1";
+        version = "1.21.4";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "php-mode";
-          rev = "bcde734c37ca36e6c2a925038760247b09ca8825";
-          sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540";
+          rev = "a8ee6ce7c1c319b2b641865ebd599cc36d2dc10e";
+          sha256 = "1gqawn8bg9374swxb4bd2z015v16yjr96am1vwsbmgks3lhiw8ja";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode";
@@ -41078,8 +41740,8 @@
           sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
-          sha256 = "0j3xb3h6fqgk0nv5mlfz7lgfkcy0z04an9qy8nq5y473hdj87qzm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/43808f57146a395b92ed498803fa948a33e5f3c2/recipes/phpstan";
+          sha256 = "1nx9d4mhxhvbgrxawkpkw03b75bg1xpli1x83g2bhs8ar8lypjik";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -41088,6 +41750,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    phpt-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , php-mode
+                             , polymode }:
+      melpaBuild {
+        pname = "phpt-mode";
+        ename = "phpt-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "emacs-php";
+          repo = "phpt-mode";
+          rev = "310579e5db57c344460f74239bd1a8fc0d6ddf33";
+          sha256 = "1zgnnzad0sr5qh665i3shcf18y121di8za99girkzgzjcv309r35";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/59a0e7aabf45c98b1ecf9db49f6420a6e051733b/recipes/phpt-mode";
+          sha256 = "1isq3l6qhya5vafmcqbda7r0irdmgvmlmdg98n7h8yck5imi78yf";
+          name = "recipe";
+        };
+        packageRequires = [ emacs php-mode polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/phpt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     phpunit = callPackage ({ cl-lib ? null
                            , emacs
                            , f
@@ -41382,12 +42072,12 @@
       melpaBuild {
         pname = "plantuml-mode";
         ename = "plantuml-mode";
-        version = "1.2.9";
+        version = "1.2.10";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "2b84a2df523904c180a3556c851f59beb0e070d7";
-          sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv";
+          rev = "92c490d3fc07b4cfa8c5263c15a4bbc16d10da9e";
+          sha256 = "1xmhgc49jyxj7wwlzhpjrdh4nynxjf3dlwg77hgzdracgldq8sra";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
@@ -41685,6 +42375,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    poe-lootfilter-mode = callPackage ({ emacs
+                                       , fetchFromGitHub
+                                       , fetchurl
+                                       , lib
+                                       , melpaBuild }:
+      melpaBuild {
+        pname = "poe-lootfilter-mode";
+        ename = "poe-lootfilter-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "jdodds";
+          repo = "poe-lootfilter-mode";
+          rev = "5ef06684cb2b17b090ee1f303c2b789fa71bc106";
+          sha256 = "1lxfbsixvr0rjcck4h4v000yb0iscvk9fwyw322y2cv2hvgwvkdw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/006f39eaf8a87822fe8becab1da2822ff6fc2beb/recipes/poe-lootfilter-mode";
+          sha256 = "0iw3a2lf0mnv3lamphy458nfyjjm1yvln1syfad49av3karca05z";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/poe-lootfilter-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     point-pos = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
@@ -41721,12 +42437,12 @@
       melpaBuild {
         pname = "poly-R";
         ename = "poly-R";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-R";
-          rev = "876e1324ce3bc2b6e3b84e03d08d4b5cd06018c6";
-          sha256 = "0xjlrdwp7vhk05lq9hkbm8gqda5valxc6siiydrwmpa79n8dbqxd";
+          rev = "0443c89b4d2bc2ed235a0c017109c2dbd342aa02";
+          sha256 = "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R";
@@ -41777,12 +42493,12 @@
       melpaBuild {
         pname = "poly-erb";
         ename = "poly-erb";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-erb";
-          rev = "aa8a40a1bb1035144b1cbc053d87305f70a442a7";
-          sha256 = "0zsvywh9xs9wb6x70b7j3cpavbx7846p772qlqd141y2lcp1jss9";
+          rev = "304204f415b9e46ee36b64531b7d170540828335";
+          sha256 = "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb";
@@ -41805,12 +42521,12 @@
       melpaBuild {
         pname = "poly-markdown";
         ename = "poly-markdown";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-markdown";
-          rev = "bf41bd2f30066573f562c674d38b9e42a43ed016";
-          sha256 = "0w2xy1cksik332qs1i26imxiyd89vbfy3ff7di4b3l14cxz6ybra";
+          rev = "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc";
+          sha256 = "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown";
@@ -41832,12 +42548,12 @@
       melpaBuild {
         pname = "poly-noweb";
         ename = "poly-noweb";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-noweb";
-          rev = "f27f09184573c579bfcd164ba995e8b5bfb84954";
-          sha256 = "096a2bm1i2ngyv4gdy0gz8bnwmgr50b4chvryxg2fh840p07540f";
+          rev = "4e65cb22d6bca901021205257f867f868989c665";
+          sha256 = "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb";
@@ -41859,12 +42575,12 @@
       melpaBuild {
         pname = "poly-org";
         ename = "poly-org";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-org";
-          rev = "2465f1d252940f13555252ef7b8e4d02ee3956ce";
-          sha256 = "1xw6h7qcva4529vs8v13gsw5zdcgc1sky7i3vbhcchxkm3d4ffdb";
+          rev = "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f";
+          sha256 = "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org";
@@ -41886,12 +42602,12 @@
       melpaBuild {
         pname = "poly-rst";
         ename = "poly-rst";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-rst";
-          rev = "68f5e9ee448f4da33d2acab4874d8c9e91190d16";
-          sha256 = "14wgfncwsnb4xs2qcr04d0my7dndjkq79q5gr6bjf74vys6a37ra";
+          rev = "1a7d38e1c1d35cf64e4dad408db486a8e1931e61";
+          sha256 = "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst";
@@ -41941,12 +42657,12 @@
       melpaBuild {
         pname = "poly-slim";
         ename = "poly-slim";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "poly-slim";
-          rev = "2216d7edf315ab8df1e01c2a826041bcdb8bcd01";
-          sha256 = "0wcfacd5wpi52glfz4snxh8ghff2qlv8d1jwj890297ikmk7mn1g";
+          rev = "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d";
+          sha256 = "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim";
@@ -41967,12 +42683,12 @@
       melpaBuild {
         pname = "polymode";
         ename = "polymode";
-        version = "0.1.5";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "polymode";
           repo = "polymode";
-          rev = "06c4329fdf765b4f9072e20906c8737a19e6646b";
-          sha256 = "0wwphs54jx48a3ca6x1qaz56j3j9bg4mv8g2akkffrzbdcb8sbc7";
+          rev = "82a0c3d71cc02e32a347033b3f42afeac4e43f66";
+          sha256 = "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode";
@@ -41994,12 +42710,12 @@
       melpaBuild {
         pname = "pomidor";
         ename = "pomidor";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "3f9186e4dc8fe8bf06b8f2ac9c68ecd8aafb4a65";
-          sha256 = "19bz3pg3s265wpcwb458i84138z170rgd1qybn6vrll2brvwsf8b";
+          rev = "590e64d316d9210bd00cb4eb39d2f07ddc16809a";
+          sha256 = "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -42230,12 +42946,12 @@
       melpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "0.4.3";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "posframe";
-          rev = "96dbc49f4f434c0aea59242fbcee663c1533ec05";
-          sha256 = "0i5xd7x33zmshhkzpsbpcpc8lgvv5vinnl1a07bnp8r1sp4yahm0";
+          rev = "fc90a1a558200e5c3688c65add9afdea695a2c10";
+          sha256 = "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
@@ -42359,12 +43075,12 @@
       melpaBuild {
         pname = "prescient";
         ename = "prescient";
-        version = "2.2.2";
+        version = "3.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e";
-          sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0";
+          rev = "ae414dde56f3430867faf41c04e4c3df75f9c960";
+          sha256 = "1cdjvlwlvxxazz7hlxgvdp0pznvj1gzqa2r6k4im0cpdrnnng6j6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
@@ -42927,7 +43643,7 @@
       melpaBuild {
         pname = "protobuf-mode";
         ename = "protobuf-mode";
-        version = "3.7.1";
+        version = "3.8.0";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
@@ -43093,12 +43809,12 @@
       melpaBuild {
         pname = "pubmed";
         ename = "pubmed";
-        version = "0.1";
+        version = "0.2.1";
         src = fetchFromGitLab {
           owner = "fvdbeek";
           repo = "emacs-pubmed";
-          rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc";
-          sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5";
+          rev = "67fbb6e8834feda85e8301adc5c17d9e38395d6a";
+          sha256 = "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed";
@@ -43920,12 +44636,12 @@
       melpaBuild {
         pname = "quiz";
         ename = "quiz";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "quiz.el";
-          rev = "69629937eaf994a51dad39c26355e1a56b9dcb95";
-          sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj";
+          rev = "570bf53926d89282cdb9653bd5aa8fe968f92bbd";
+          sha256 = "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
@@ -44284,12 +45000,12 @@
       melpaBuild {
         pname = "rdf-prefix";
         ename = "rdf-prefix";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
-          sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
+          rev = "6daf675d96aa4a0bc78adc93560b791a77651b22";
+          sha256 = "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -44365,12 +45081,12 @@
       melpaBuild {
         pname = "realgud";
         ename = "realgud";
-        version = "1.4.5";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "realgud";
           repo = "realgud";
-          rev = "09431a4561921bece36a6083b6e27ac4dc82432d";
-          sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0";
+          rev = "2d37b7d5a799363c7e8a69362d42d8a65b85f5cb";
+          sha256 = "0xnick9016wxrgi8v0lycvxhyz8l2k4nfvdpjc5yq476vwrjfzbz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud";
@@ -44389,6 +45105,63 @@
           license = lib.licenses.free;
         };
       }) {};
+    realgud-lldb = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , load-relative
+                                , melpaBuild
+                                , realgud }:
+      melpaBuild {
+        pname = "realgud-lldb";
+        ename = "realgud-lldb";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-lldb";
+          rev = "f2f77d6ddfa42430ead400eaf81c605c3a04dead";
+          sha256 = "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e7e40b575cc22fa7b4773cf617862495e93565e4/recipes/realgud-lldb";
+          sha256 = "1l43h14a42cpgjcmbhk9vkk87z4ap9rdz7jrz8id666qxbza5xzg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-lldb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-trepan-ni = callPackage ({ cl-lib ? null
+                                     , emacs
+                                     , fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , load-relative
+                                     , melpaBuild
+                                     , realgud }:
+      melpaBuild {
+        pname = "realgud-trepan-ni";
+        ename = "realgud-trepan-ni";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "realgud";
+          repo = "realgud-trepan-ni";
+          rev = "ce008862ea33de0a9e6c06099b9ddff8f620f2e4";
+          sha256 = "14sd9d0jzr0iiy4hzssabp08wifbnb4hh6xs5b2v8ch348kcwpwv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2464e03d11cd660c3c9c760e16b90911151cf184/recipes/realgud-trepan-ni";
+          sha256 = "1p7sn1swmdyyzaaa5xza70md4pl2p15swyh7y3fbmpp35nabv9zi";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs load-relative realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-trepan-ni";
+          license = lib.licenses.free;
+        };
+      }) {};
     reason-mode = callPackage ({ emacs
                                , fetchFromGitHub
                                , fetchurl
@@ -44817,12 +45590,12 @@
       melpaBuild {
         pname = "repl-toggle";
         ename = "repl-toggle";
-        version = "0.5.0";
+        version = "0.6.1";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "934f59478a5c5577795f9507e945d564be368510";
-          sha256 = "13pgfqijfp0ad9h1rpcf0blppq3jv31wdgvpjndgi213vwrkk79j";
+          rev = "a36caac7649fbffbe30f7b06541c9efd723563fc";
+          sha256 = "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/repl-toggle";
@@ -45154,6 +45927,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    rfc-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , helm
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "rfc-mode";
+        ename = "rfc-mode";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "galdor";
+          repo = "rfc-mode";
+          rev = "5cdf7172e307c0e23bb5342c61263d4439292ede";
+          sha256 = "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a61d769cf7c61619a594337fe8a12ccc6a6fd6e/recipes/rfc-mode";
+          sha256 = "0z7krcfdyr8hblz8dc7apqlpn6sj2zwrjw4wh86js8vf7fiv8svy";
+          name = "recipe";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/rfc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rg = callPackage ({ cl-lib ? null
                       , emacs
                       , fetchFromGitHub
@@ -45217,12 +46017,12 @@
       melpaBuild {
         pname = "rich-minority";
         ename = "rich-minority";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "rich-minority";
-          rev = "333e4669f76a0fb68b433117d377711e418a525e";
-          sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
+          rev = "d33d2e357c8eb0b38624dbc51e8b953b08b0cc98";
+          sha256 = "1kn7c9qr9ykj68iqffzzmjsr6aazwac8cxb7j960sjb282rq0yyj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -45245,12 +46045,12 @@
       melpaBuild {
         pname = "right-click-context";
         ename = "right-click-context";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "right-click-context";
-          rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965";
-          sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj";
+          rev = "db92245cc494c295afa7c23ef1e1d9f76c20a27e";
+          sha256 = "109l1qj3k87iz3g89j9xf5gdrflr63lagp1qz7cz1p1ji4lycb4k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context";
@@ -45379,12 +46179,12 @@
       melpaBuild {
         pname = "robe";
         ename = "robe";
-        version = "0.8.1";
+        version = "0.8.2";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b";
-          sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq";
+          rev = "1908afd42ce05fc8b8bbf3f38301680264b68d19";
+          sha256 = "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -46454,6 +47254,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    seml-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , htmlize
+                             , lib
+                             , melpaBuild
+                             , simple-httpd }:
+      melpaBuild {
+        pname = "seml-mode";
+        ename = "seml-mode";
+        version = "1.5.0";
+        src = fetchFromGitHub {
+          owner = "conao3";
+          repo = "seml-mode.el";
+          rev = "f62f7a9f5e18ef8f370444a1fce710770227b0f5";
+          sha256 = "037p2kiwkkbk921ik15jalcci0p87q3my9mxzyh6i0mnc6qsh4zf";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/01f8b8d877ba3164bf20f7f0e56ea564b88f493e/recipes/seml-mode";
+          sha256 = "0fmfnglxm57mhynzdsgs14qaxsw3nf83qbz3adknv63qymbfhgbw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs htmlize simple-httpd ];
+        meta = {
+          homepage = "https://melpa.org/#/seml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     servant = callPackage ({ ansi
                            , commander
                            , dash
@@ -47079,6 +47907,37 @@
           license = lib.licenses.free;
         };
       }) {};
+    shroud = callPackage ({ bui
+                          , dash
+                          , dash-functional
+                          , emacs
+                          , epg ? null
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
+        pname = "shroud";
+        ename = "shroud";
+        version = "1.15.1";
+        src = fetchFromGitHub {
+          owner = "o-nly";
+          repo = "emacs-shroud";
+          rev = "a7706ee48ef8dc67e6240377c61946c73a7fae3a";
+          sha256 = "0wvm4lxqcc1p8v7rpqal3bnqgnpk1gs7v18i83f6cvi5d88jkgdg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e4334a47a173e9cfb1e803d5781317da27702d7/recipes/shroud";
+          sha256 = "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg";
+          name = "recipe";
+        };
+        packageRequires = [ bui dash dash-functional emacs epg s ];
+        meta = {
+          homepage = "https://melpa.org/#/shroud";
+          license = lib.licenses.free;
+        };
+      }) {};
     shut-up = callPackage ({ cl-lib ? null
                            , emacs
                            , fetchFromGitHub
@@ -47114,12 +47973,12 @@
       melpaBuild {
         pname = "shx";
         ename = "shx";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57";
-          sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2";
+          rev = "6b53896ad2d80f22454ae8b09dbaa7c352e4e37f";
+          sha256 = "1ps4by78ly7incc4s8767wbmcqfw9him3xdaif5akzg4qqymcayb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -47133,23 +47992,22 @@
         };
       }) {};
     side-notes = callPackage ({ emacs
-                              , fetchFromGitHub
+                              , fetchgit
                               , fetchurl
                               , lib
                               , melpaBuild }:
       melpaBuild {
         pname = "side-notes";
         ename = "side-notes";
-        version = "0.1.1";
-        src = fetchFromGitHub {
-          owner = "rnkn";
-          repo = "side-notes";
-          rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa";
-          sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr";
+        version = "0.2.0";
+        src = fetchgit {
+          url = "https://git.sr.ht/~pwr/side-notes";
+          rev = "2319ee180a4a67175b9e95322cd30b3ac70a9bdf";
+          sha256 = "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes";
-          sha256 = "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9829ece8343a2a4309b5f7f5e324f0a1145e1e83/recipes/side-notes";
+          sha256 = "1adan5v04awjxahmn2ndqj8fns5hkk4am5jnhic9y036qdcpd9mv";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -47507,12 +48365,12 @@
       melpaBuild {
         pname = "slime";
         ename = "slime";
-        version = "2.23";
+        version = "2.24";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "56e32da66840e3d03947da2fdf9730824cfc870a";
-          sha256 = "05pgcf3sd4dwl40kfw00s3si8rz8rk9pis81jlxdi5w6qzmlg7v1";
+          rev = "c1f15e2bd02fabe7bb468b05fe311cd9a932f14f";
+          sha256 = "0w7j835p9riyd6n4znj3x255lwsrmy0lj51hpc7bhk0vdz2cv2qm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime";
@@ -47667,12 +48525,12 @@
       melpaBuild {
         pname = "smart-mode-line";
         ename = "smart-mode-line";
-        version = "2.12.0";
+        version = "2.13";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "9a81b51cd37fc5b6d47abfbb2b32f98f36a0fcfc";
-          sha256 = "055w1pcr96bfgbmig6ll2sgcisw82rf9dh4n8dhnsl75p32g1rcn";
+          rev = "9a6d821e0c78361ab35c6e403fc582b76558a1a7";
+          sha256 = "164b697xm1rwcggv37dymhf3npbyh2bs59z8b6m5x35lb4c3lf8b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -47695,7 +48553,7 @@
       melpaBuild {
         pname = "smart-mode-line-powerline-theme";
         ename = "smart-mode-line-powerline-theme";
-        version = "2.12.0";
+        version = "2.13";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
@@ -48139,12 +48997,12 @@
       melpaBuild {
         pname = "solaire-mode";
         ename = "solaire-mode";
-        version = "1.0.7";
+        version = "1.0.9";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "d4e0babefc1d6bf157dcd1fe4da5758036c9d8ca";
-          sha256 = "1s50nfmzn7ngpkg3v34j7zpjaap0jly1l7c17svhhv074wnjrcm0";
+          rev = "fffdcc46f3956f415496342de7e24488b6e751c5";
+          sha256 = "011m4r7s6i9lgjymh7jgq5jwwrpz4vmpvp3c8d4ix96v5hi04kzg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -48157,7 +49015,9 @@
           license = lib.licenses.free;
         };
       }) {};
-    solarized-theme = callPackage ({ dash
+    solarized-theme = callPackage ({ cl-lib ? null
+                                   , dash
+                                   , emacs
                                    , fetchFromGitHub
                                    , fetchurl
                                    , lib
@@ -48165,19 +49025,19 @@
       melpaBuild {
         pname = "solarized-theme";
         ename = "solarized-theme";
-        version = "1.2.2";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "210dbef0186f87048d50face41d1d374d6154b3a";
-          sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
+          rev = "c42a932e5c467c1ce12c42276d35bfb8f666e96d";
+          sha256 = "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "recipe";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ cl-lib dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/solarized-theme";
           license = lib.licenses.free;
@@ -48981,12 +49841,12 @@
       melpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "3.0";
+        version = "3.1";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "5b263c17a0709bb7944983fd2ae50bf022c2d412";
-          sha256 = "1z6dbq0fhynmanhzhpwgsf4bx6dkgqfajp6bz3gj5x2wspn866ks";
+          rev = "8c26f61fe5ee2a65aeedc944bf23c66d159ef933";
+          sha256 = "0zi8rlj4hmmhr4vcpa9666ddhqwdz7cnmhh80wrw21z9lsj8yccs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -49580,12 +50440,12 @@
       melpaBuild {
         pname = "swift-mode";
         ename = "swift-mode";
-        version = "7.1.0";
+        version = "8.0.1";
         src = fetchFromGitHub {
           owner = "swift-emacs";
           repo = "swift-mode";
-          rev = "cde97e20a8c80075920f0e01ec76de1816aed114";
-          sha256 = "1igk1d585f4bj7pw2ikfh843sfp0k80ibjkwvsjjpx272lz57qqk";
+          rev = "86f8f62294aa5a6d44fa872278d75a4a41f403d4";
+          sha256 = "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode";
@@ -50101,12 +50961,12 @@
       melpaBuild {
         pname = "tablist";
         ename = "tablist";
-        version = "0.70";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "tablist";
-          rev = "ef38312867bc0268b1584dd890b1c420bb77ec11";
-          sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
+          rev = "f6b495d09494784163c3e6ba75b771b71fe226a8";
+          sha256 = "0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist";
@@ -50705,6 +51565,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    texfrag = callPackage ({ auctex
+                           , emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "texfrag";
+        ename = "texfrag";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "TobiasZawada";
+          repo = "texfrag";
+          rev = "270a8a4b5dadddc5b226d9a9c6c7868ea6bfe86f";
+          sha256 = "18ahbksxg1i3gvsayx2mhkjd1p75c60x5f8d9a3abm4h50gs5mvf";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag";
+          sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x";
+          name = "recipe";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/texfrag";
+          license = lib.licenses.free;
+        };
+      }) {};
     textmate = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -50807,6 +51694,7 @@
         };
       }) {};
     theme-looper = callPackage ({ cl-lib ? null
+                                , emacs
                                 , fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -50814,19 +51702,19 @@
       melpaBuild {
         pname = "theme-looper";
         ename = "theme-looper";
-        version = "2.2.0";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "theme-looper";
-          rev = "4eea8ec048f1d6f6d875bf25690337ccc3ddf3dc";
-          sha256 = "0lwkilvwx87xw1xx384pyz26agxd3rj11dabvb8bb4paw6c8wwr6";
+          rev = "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1";
+          sha256 = "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
           sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/theme-looper";
           license = lib.licenses.free;
@@ -50866,7 +51754,7 @@
       melpaBuild {
         pname = "thrift";
         ename = "thrift";
-        version = "2019.3.18.0";
+        version = "2019.6.10.0";
         src = fetchFromGitHub {
           owner = "facebook";
           repo = "fbthrift";
@@ -50919,12 +51807,12 @@
       melpaBuild {
         pname = "tidal";
         ename = "tidal";
-        version = "1.0.10";
+        version = "1.0.13";
         src = fetchFromGitHub {
           owner = "tidalcycles";
           repo = "Tidal";
-          rev = "8605aacc1207ff822dfac4673332a337ac4f1cc2";
-          sha256 = "103cy8iiv373yswfsjz0rr4zp3vm2l3vwyb65hvcm7w0x30bhi9r";
+          rev = "a6eed4908c8b78f0c98b9cb8cd290814afd1252b";
+          sha256 = "1hwcc713vrx5ypcxsidwp25mvcg24bk8fqy7k04w7np4hhc6szql";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
@@ -51084,12 +51972,12 @@
       melpaBuild {
         pname = "torus";
         ename = "torus";
-        version = "1.10";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "chimay";
           repo = "torus";
-          rev = "b6de553eb55cfd9c0b6dce800951bcd8aef5e70c";
-          sha256 = "144azr3m8aj77fgvz4qnjzzhpxwz28lqjzh2k49z736iaax394gd";
+          rev = "222d5b155dd544cb158b2f84be8ad304b0c69df1";
+          sha256 = "164mip0cibs3c8c4khnbzs8f2pmj57ng5q7hspzv7wk8nvc6d39i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efc3b538861084cc13ff067a9258e55dc006b70d/recipes/torus";
@@ -52415,7 +53303,7 @@
       melpaBuild {
         pname = "utop";
         ename = "utop";
-        version = "2.3.0";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
@@ -52522,12 +53410,12 @@
       melpaBuild {
         pname = "vc-hgcmd";
         ename = "vc-hgcmd";
-        version = "1.5.1";
+        version = "1.6.8";
         src = fetchFromGitHub {
           owner = "muffinmad";
           repo = "emacs-vc-hgcmd";
-          rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a";
-          sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil";
+          rev = "5edf2b9ebbe68a05e1d9ad119e239154577953bf";
+          sha256 = "1yswz1mhdpp52zsyzryyr1psi9pnm1x4ri4i24vbmsxvj9vzhkmp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd";
@@ -52812,25 +53700,25 @@
                               , fetchurl
                               , ggtags
                               , helm
+                              , helm-rg
                               , lib
-                              , melpaBuild
-                              , outshine }:
+                              , melpaBuild }:
       melpaBuild {
         pname = "vhdl-tools";
         ename = "vhdl-tools";
-        version = "5.9";
+        version = "6.0";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "4e9df06c3519be22f1f713d18c80d325a5b0c3d2";
-          sha256 = "0n6mmbg8g3ip3dkbc4kxqxsd4p1h7jry25n1cqvzm24x1adwlcfm";
+          rev = "054b75353905d867b4c5b53258bc3180ce48c767";
+          sha256 = "0q5d0938h31snl8i3r0c81w88qk99i25c65xsjdvn0hs8g2lpwir";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "recipe";
         };
-        packageRequires = [ emacs ggtags helm outshine ];
+        packageRequires = [ emacs ggtags helm helm-rg ];
         meta = {
           homepage = "https://melpa.org/#/vhdl-tools";
           license = lib.licenses.free;
@@ -52976,12 +53864,12 @@
       melpaBuild {
         pname = "visual-regexp";
         ename = "visual-regexp";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
-          sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
+          rev = "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca";
+          sha256 = "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -53416,12 +54304,12 @@
       melpaBuild {
         pname = "web-mode-edit-element";
         ename = "web-mode-edit-element";
-        version = "2.2";
+        version = "2.3";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
           repo = "web-mode-edit-element";
-          rev = "30f0f697212a85a9b881549fc272fa7c96d3e703";
-          sha256 = "1qnk4skzj6b47h8c2yg05hc7iv8y4102izlfc490307y264rv051";
+          rev = "ad5d7e4dc2420bdd00ce65d9adffbd38a5904afa";
+          sha256 = "143xh6xc7qd88hjjmcs9fd2zlgxl0hhgx5fplhbi9zxd2ihhz0dg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/web-mode-edit-element";
@@ -53723,6 +54611,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    which-key-posframe = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild
+                                      , posframe
+                                      , which-key }:
+      melpaBuild {
+        pname = "which-key-posframe";
+        ename = "which-key-posframe";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "yanghaoxie";
+          repo = "which-key-posframe";
+          rev = "75e73e187da78d823a5dc01c21e09e808e4fb938";
+          sha256 = "1ay6qnil7xmml95yiax191fs85mpjkpr0r9314zlf0mf7ip9hvpy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/56ab10dc99ea4f5b207f9874124aff414d859a17/recipes/which-key-posframe";
+          sha256 = "1vpdni3ascz2zw6k1xrnw2vqnq8p30mc7d8v81qdbjb58q27l8ll";
+          name = "recipe";
+        };
+        packageRequires = [ emacs posframe which-key ];
+        meta = {
+          homepage = "https://melpa.org/#/which-key-posframe";
+          license = lib.licenses.free;
+        };
+      }) {};
     whitaker = callPackage ({ dash
                             , fetchFromGitHub
                             , fetchurl
@@ -53782,12 +54698,12 @@
       melpaBuild {
         pname = "whizzml-mode";
         ename = "whizzml-mode";
-        version = "0.3.0";
+        version = "0.31.4";
         src = fetchFromGitHub {
           owner = "whizzml";
           repo = "whizzml-mode";
-          rev = "eca56d0fd51c5f41ef3e84e363f66d717ea5b160";
-          sha256 = "0rli8jc9fig32dx7icvmwmmdzkvar12323xy25vh296xzcyjrgba";
+          rev = "cb476ed0d6be52e0b8c38f5b643cbbfceda1b4ca";
+          sha256 = "1iklmzqb7200xniygd3gj3pa8d18z3pnabslsvd0k4qqvyvwnlxw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -54117,12 +55033,12 @@
       melpaBuild {
         pname = "with-editor";
         ename = "with-editor";
-        version = "2.8.1";
+        version = "2.8.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "9dd9f176d96abc60365369de6d08c26c414ef1f3";
-          sha256 = "16a71mld7knf5ppv4szlkfdq44cqi36jqmscn0fssffhg33xh8cs";
+          rev = "66bec91c859f305445b766394eb25248c1172426";
+          sha256 = "1z2h9casyw1b93ikq2mf9xixyvbl90zddf0s66lqfiyj2y376pq3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -54350,6 +55266,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    workgroups2 = callPackage ({ anaphora
+                               , cl-lib ? null
+                               , dash
+                               , f
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "workgroups2";
+        ename = "workgroups2";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "pashinin";
+          repo = "workgroups2";
+          rev = "928d509157ec8a4a2e343b6115dff034c3243a7a";
+          sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4f9cfb740cce05a6805d9a047e4c1380305da4df/recipes/workgroups2";
+          sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
+          name = "recipe";
+        };
+        packageRequires = [ anaphora cl-lib dash f ];
+        meta = {
+          homepage = "https://melpa.org/#/workgroups2";
+          license = lib.licenses.free;
+        };
+      }) {};
     wrap-region = callPackage ({ dash
                                , fetchFromGitHub
                                , fetchurl
@@ -54717,12 +55662,12 @@
       melpaBuild {
         pname = "xquery-tool";
         ename = "xquery-tool";
-        version = "0.1.10";
+        version = "0.1.11";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "b81b5862e8541aca5231840eb176afad7ab55cf3";
-          sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm";
+          rev = "dc939a6d779e83fa06c4486e53dbeb3846c38c02";
+          sha256 = "10rp8wbvbab2z3rcyfsb2jxyj3fphq9g25wmai8c610z4s8rldlq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool";
@@ -54950,12 +55895,12 @@
       melpaBuild {
         pname = "yang-mode";
         ename = "yang-mode";
-        version = "0.9.8";
+        version = "0.9.9";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "340aec635e359609b22f7e94df15af1af2b070f6";
-          sha256 = "0795z6s71vlb709n5lpx2f9adfjndafg1h5860zvy1qc4m1054rz";
+          rev = "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded";
+          sha256 = "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -55128,12 +56073,12 @@
       melpaBuild {
         pname = "yasnippet-snippets";
         ename = "yasnippet-snippets";
-        version = "0.10";
+        version = "0.11";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "827908d7cdc6e7c1504175b4d49f899f0e9ba945";
-          sha256 = "017avn7i3650rnl7lppn8k465ni0xy8v3r750f00gm9hxkzrig0z";
+          rev = "69cc1c19c7d67780d9f0f910462b818e8c0a570e";
+          sha256 = "1j71vr52hndgqj00qsh4p2b5j0s9jcs174slk1p0745a5xac77p0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets";
@@ -55302,12 +56247,12 @@
       melpaBuild {
         pname = "yoshi-theme";
         ename = "yoshi-theme";
-        version = "6.1.0";
+        version = "6.2.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "b140d3adce4e8e7ff7b0daaa6684bd7065e4819b";
-          sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s";
+          rev = "70365870ff823b954aa85972217d8f116c45d939";
+          sha256 = "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -55464,12 +56409,12 @@
       melpaBuild {
         pname = "zmq";
         ename = "zmq";
-        version = "0.10.3";
+        version = "0.10.9";
         src = fetchFromGitHub {
           owner = "dzop";
           repo = "emacs-zmq";
-          rev = "12661cbc1acee8506d88b4853214a8a3716db240";
-          sha256 = "1rnddd67wm2g7qm06qhn8h3dakhv5lcf2dqhdhf0ian1lw5z0yvw";
+          rev = "eb96b39696229424efc2a5ffdaf59c55f1ae931d";
+          sha256 = "1ddaf8n1gndkyb46ivchychgyc5cqd5hf56325z3rf412xi4zrk1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq";
@@ -55544,12 +56489,12 @@
       melpaBuild {
         pname = "zoom";
         ename = "zoom";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "cyrus-and";
           repo = "zoom";
-          rev = "85deb722abb89f1758a24969680fc13b51344cb2";
-          sha256 = "1a7dlfi1w0rh6iphvflip3798xg7sac916qwjmqzz4inw9wdh3ga";
+          rev = "578295532fb1c4ad2a2e95894e65cce02f812b54";
+          sha256 = "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
@@ -55665,6 +56610,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    zoutline = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "zoutline";
+        ename = "zoutline";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "zoutline";
+          rev = "63756846f8540b6faf89d885438186e4fe1c7d8a";
+          sha256 = "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
+          sha256 = "1yyww84b58ymbx0w1gkgd0csr0cwlghdmnxk0jbzwc45g9g42k1m";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/zoutline";
+          license = lib.licenses.free;
+        };
+      }) {};
     zygospore = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
diff --git a/nixpkgs/pkgs/applications/editors/quilter/default.nix b/nixpkgs/pkgs/applications/editors/quilter/default.nix
index b22b04bac655..c27a85d260b6 100644
--- a/nixpkgs/pkgs/applications/editors/quilter/default.nix
+++ b/nixpkgs/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "1.8.4";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "14qbkkz1l4zj6kwds5d82swnh3ynj6diyvjl0pafgp5i1i27j4rh";
+    sha256 = "1sjk8n0y9039xs47zw9a4l4vd36vkm30gf6x3fzaib81hnh1fx7v";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 46615df2b418..902ff6c389dc 100644
--- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -12,14 +12,14 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    "i686-linux" = "1485maq7rrvi742w0zs5nnaqy2s7w4hhm0fi4n69vafncia8zyic";
-    "x86_64-linux" = "082725c7yzih13d4khvwz34ijwdg6yxmsxhjmpn2pqlfsg43hxsh";
-    "x86_64-darwin" = "1mvj63sbdcw227bi4idqcwqxds60g64spvdi2bxh5sk6g5q5df90";
+    "i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4";
+    "x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09";
+    "x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp";
   }.${system};
 in
   callPackage ./generic.nix rec {
 
-    version = "1.35.0";
+    version = "1.35.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
index 7058c00602cc..4d4316e43f72 100644
--- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
+++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
@@ -12,17 +12,17 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    "i686-linux" = "1vr3mblg5223k56yqi9fqwa7yg8qi4r3nkw6ssf87gs8jwfxa47l";
-    "x86_64-linux" = "1vqq365zw44ll22i06bxxviyywv1v2f71c2mricrz3faz25c3lvm";
-    "x86_64-darwin" = "0pa5cz8kq45q375b74kaa8qn1h0r1mp9amh5gsprg3hx89xzvhxi";
+    "i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23";
+    "x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg";
+    "x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0";
   }.${system};
 in
   callPackage ./generic.nix rec {
 
-    version = "1.34.0";
+    version = "1.35.1";
     pname = "vscodium";
 
-    executableName = "vscodium";
+    executableName = "codium";
     longName = "VSCodium";
     shortName = "Codium";
 
diff --git a/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix
index af6eaa2904ae..f7d5f099f84c 100644
--- a/nixpkgs/pkgs/applications/graphics/fondo/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fondo";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "calo001";
     repo = pname;
     rev = version;
-    sha256 = "0mh3s2726zf3va6nj7kj2nbmq5q65xrbnsllss3sqf8a838zqfn6";
+    sha256 = "1xflkqzdbyvdjybarvb13vw6p8f2xjlvpr155yaxgjjzjcr1j86y";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix
index 298b03cf4302..92fc74242a24 100644
--- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix
@@ -38,6 +38,10 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
       --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
   '';
+
+  postFixup = ''
+    mv $out/share/doc $out
+  '';
     
   meta = with stdenv.lib; {
     description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
diff --git a/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/default.nix
index 657a9dd27e50..a2a6fe3c14f7 100644
--- a/nixpkgs/pkgs/applications/graphics/gimp/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gimp/default.nix
@@ -9,11 +9,11 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   pname = "gimp";
-  version = "2.10.10";
+  version = "2.10.12";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
+    sha256 = "0wdcr8d2ink4swn5r4v13bsiya6s3xm4ya97sdbhs4l40y7bb03x";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
diff --git a/nixpkgs/pkgs/applications/misc/cbatticon/default.nix b/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
index f4ba30080f71..44612644359c 100644
--- a/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cbatticon/default.nix
@@ -1,32 +1,31 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify }:
 
 stdenv.mkDerivation rec {
-
-  name = "cbatticon-${version}";
-  version = "1.6.8";
+  pname = "cbatticon";
+  version = "1.6.9";
 
   src = fetchFromGitHub {
     owner = "valr";
-    repo = "cbatticon";
+    repo = pname;
     rev = version;
-    sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6";
+    sha256 = "0kw09d678sd3m18fmi4380sl4a2m5lkfmq0kps16cdmq7z80rvaf";
   };
 
+  nativeBuildInputs = [ pkgconfig gettext ];
+
+  buildInputs =  [ glib gtk3 libnotify ];
+
   patchPhase = ''
     sed -i -e 's/ -Wno-format//g' Makefile
   '';
 
-  makeFlags = "PREFIX=$(out)";
-
-  nativeBuildInputs = [ pkgconfig gettext ];
-
-  buildInputs =  [ glib gtk3 libnotify ];
+  makeFlags = "PREFIX=${placeholder "out"}";
 
   meta = with stdenv.lib; {
     description = "Lightweight and fast battery icon that sits in the system tray";
     homepage = https://github.com/valr/cbatticon;
     license = licenses.gpl2;
-    maintainers = [ maintainers.domenkozar ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.domenkozar ];
   };
 }
diff --git a/nixpkgs/pkgs/applications/misc/cura/default.nix b/nixpkgs/pkgs/applications/misc/cura/default.nix
index 958b0d4844bb..290801ea5781 100644
--- a/nixpkgs/pkgs/applications/misc/cura/default.nix
+++ b/nixpkgs/pkgs/applications/misc/cura/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }:
 
 mkDerivation rec {
   name = "cura-${version}";
@@ -21,7 +21,7 @@ mkDerivation rec {
   buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
   propagatedBuildInputs = with python3.pkgs; [
     libsavitar numpy-stl pyserial requests uranium zeroconf
-  ];
+  ] ++ plugins;
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
   cmakeFlags = [
@@ -37,6 +37,10 @@ mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/cura/resources/materials
     cp ${materials}/*.fdm_material $out/share/cura/resources/materials/
+    mkdir -p $out/lib/cura/plugins
+    for plugin in ${toString plugins}; do
+      ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins
+    done
   '';
 
   postFixup = ''
diff --git a/nixpkgs/pkgs/applications/misc/cura/plugins.nix b/nixpkgs/pkgs/applications/misc/cura/plugins.nix
new file mode 100644
index 000000000000..a5a196a78100
--- /dev/null
+++ b/nixpkgs/pkgs/applications/misc/cura/plugins.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, python3Packages }:
+
+let
+
+  self = {
+
+    octoprint = stdenv.mkDerivation rec {
+      pname = "Cura-OctoPrintPlugin";
+      version = "3.5.5";
+
+      src = fetchFromGitHub {
+        owner = "fieldOfView";
+        repo = pname;
+        rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a";
+        sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x";
+      };
+
+      nativeBuildInputs = [ cmake ];
+
+      propagatedBuildInputs = with python3Packages; [
+        netifaces
+      ];
+
+      meta = with stdenv.lib; {
+        description = "Enables printing directly to OctoPrint and monitoring the process";
+        homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ gebner ];
+      };
+    };
+
+  };
+
+in self
diff --git a/nixpkgs/pkgs/applications/misc/jgmenu/default.nix b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
index b868808ec3dc..6ba0bed78476 100644
--- a/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
+++ b/nixpkgs/pkgs/applications/misc/jgmenu/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg }:
+{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, pango, librsvg, libxml2, menu-cache, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "jgmenu-${version}";
-  version = "1.1";
+  pname = "jgmenu";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
-    repo = "jgmenu";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "0hnxzy5mm5z6r9gaimfsf7kbpr23khck2fhh3j8bk2lkp53420fz";
+    sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
   };
 
   nativeBuildInputs = [
     pkgconfig
+    makeWrapper
     python3Packages.wrapPython
   ];
 
@@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
     libxml2
     menu-cache
     xorg.libXinerama
+    xorg.libXrandr
+    python3Packages.python
   ];
 
-  makeFlags = [ "prefix=$(out)" ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
   postFixup = ''
     wrapPythonProgramsIn "$out/lib/jgmenu"
+    for f in $out/bin/jgmenu{,_run}; do
+      wrapProgram $f --prefix PATH : $out/bin
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
new file mode 100644
index 000000000000..cc6f63c0960b
--- /dev/null
+++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
+, boost, curl, expat, glew, libpng, tbb, wxGTK30
+, gtest, nlopt, xorg, makeDesktopItem
+}:
+let
+  nloptVersion = if lib.hasAttr "version" nlopt
+                 then lib.getAttr "version" nlopt
+                 else "2.4";
+in
+stdenv.mkDerivation rec {
+  name = "prusa-slicer-${version}";
+  version = "2.0.0";
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkgconfig
+  ];
+
+  # We could add Eigen, but it doesn't currently compile with the version in
+  # nixpkgs.
+  buildInputs = [
+    boost
+    curl
+    expat
+    glew
+    libpng
+    tbb
+    wxGTK30
+    xorg.libX11
+  ] ++ checkInputs;
+
+  checkInputs = [ gtest ];
+
+  # The build system uses custom logic - defined in
+  # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
+  # for finding the nlopt library, which doesn't pick up the package in the nix store.
+  # We need to set the path via the NLOPT environment variable instead.
+  NLOPT = "${nlopt}";
+
+  prePatch = ''
+    # In nix ioctls.h isn't available from the standard kernel-headers package
+    # on other distributions. As the copy in glibc seems to be identical to the
+    # one in the kernel, we use that one instead.
+    sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp
+  '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) ''
+    # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
+    # now seems to be integrated into the main lib.
+    sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake
+  '';
+
+  src = fetchFromGitHub {
+    owner = "prusa3d";
+    repo = "PrusaSlicer";
+    sha256 = "135wn2sza2f2kvbja1haxil5kx1b74lc1i7dsa35i1y3phabykhz";
+    rev = "version_${version}";
+  };
+
+  cmakeFlags = [
+    "-DSLIC3R_FHS=1"
+    "-DSLIC3R_WX_STABLE=1"  # necessary when compiling against wxGTK 3.0
+  ];
+
+  postInstall = ''
+    mkdir -p "$out/share/pixmaps/"
+    ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
+    mkdir -p "$out/share/applications"
+    cp "$desktopItem"/share/applications/* "$out/share/applications/"
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "PrusaSlicer";
+    exec = "prusa-slicer";
+    icon = "PrusaSlicer";
+    comment = "G-code generator for 3D printers";
+    desktopName = "PrusaSlicer";
+    genericName = "3D printer tool";
+    categories = "Application;Development;";
+  };
+
+  meta = with stdenv.lib; {
+    description = "G-code generator for 3D printer";
+    homepage = https://github.com/prusa3d/PrusaSlicer;
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ tweber ];
+  };
+}
diff --git a/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix b/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix
deleted file mode 100644
index 1f0a3a71be8b..000000000000
--- a/nixpkgs/pkgs/applications/misc/slic3r/prusa3d.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
-  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
-  glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }:
-let
-  AlienWxWidgets = perlPackages.buildPerlPackage rec {
-    name = "Alien-wxWidgets-0.69";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
-      sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr";
-    };
-    propagatedBuildInputs = [
-      pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild
-      gtk2 gtk3 wxGTK30
-    ];
-  };
-
-  Wx = perlPackages.Wx.overrideAttrs (oldAttrs: {
-    propagatedBuildInputs = [
-      perlPackages.ExtUtilsXSpp
-      AlienWxWidgets
-    ];
-  });
-
-  WxGLCanvas = perlPackages.buildPerlPackage rec {
-    name = "Wx-GLCanvas-0.09";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz";
-      sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka";
-    };
-    propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ];
-    doCheck = false;
-  };
-in
-stdenv.mkDerivation rec {
-  name = "slic3r-prusa-edition-${version}";
-  version = "1.41.3";
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    curl
-    eigen
-    glew
-    pcre
-    perl
-    tbb
-    which
-    Wx
-    WxGLCanvas
-    xorg.libXdmcp
-    xorg.libpthreadstubs
-  ] ++ checkInputs ++ (with perlPackages; [
-    boost
-    ClassXSAccessor
-    EncodeLocale
-    ExtUtilsMakeMaker
-    ExtUtilsTypemapsDefault
-    ExtUtilsXSpp
-    GrowlGNTP
-    ImportInto
-    IOStringy
-    locallib
-    LWP
-    MathClipper
-    MathConvexHullMonotoneChain
-    MathGeometryVoronoi
-    MathPlanePath
-    ModuleBuildWithXSpp
-    Moo
-    NetDBus
-    OpenGL
-    XMLSAX
-  ]);
-
-  checkInputs = [ gtest ];
-
-  # The build system uses custom logic - defined in
-  # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
-  # for finding the nlopt library, which doesn't pick up the package in the nix store.
-  # We need to set the path via the NLOPT environment variable instead.
-  NLOPT = "${nlopt}";
-
-  prePatch = ''
-    # In nix ioctls.h isn't available from the standard kernel-headers package
-    # on other distributions. As the copy in glibc seems to be identical to the
-    # one in the kernel, we use that one instead.
-    sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
-
-    # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build
-    # system, so we have to override them. Setting them as environment variables
-    # doesn't work though, so substituting the paths directly in CMakeLists.txt
-    # seems to be the easiest way.
-    sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
-    sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
-  '' + lib.optionalString (lib.versionOlder "2.5" nlopt.version) ''
-    # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
-    # now seems to be integrated into the main lib.
-    sed -i 's|nlopt_cxx|nlopt|g' xs/src/libnest2d/cmake_modules/FindNLopt.cmake
-  '';
-
-  postInstall = ''
-    echo 'postInstall'
-    wrapProgram "$out/bin/slic3r-prusa3d" \
-    --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB"
-
-    # it seems we need to copy the icons...
-    mkdir -p $out/bin/var
-    cp -r ../resources/icons/* $out/bin/var/
-    cp -r ../resources $out/bin/
-
-
-    mkdir -p "$out/share/pixmaps/"
-    ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png"
-    mkdir -p "$out/share/applications"
-    cp "$desktopItem"/share/applications/* "$out/share/applications/"
-  '';
-
-  src = fetchFromGitHub {
-    owner = "prusa3d";
-    repo = "Slic3r";
-    sha256 = "145dfsv610c5p0sngab9z7lzbk5383pq9l26mrrpf1wxdlxgljpl";
-    rev = "version_${version}";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "slic3r-Prusa-Edition";
-    exec = "slic3r-prusa3d";
-    icon = "slic3r-prusa";
-    comment = "G-code generator for 3D printers";
-    desktopName = "Slic3r Prusa Edition";
-    genericName = "3D printer tool";
-    categories = "Application;Development;";
-  };
-
-  meta = with stdenv.lib; {
-    description = "G-code generator for 3D printer";
-    homepage = https://github.com/prusa3d/Slic3r;
-    license = licenses.agpl3;
-    maintainers = with maintainers; [ tweber ];
-    broken = stdenv.hostPlatform.isAarch64;
-  };
-}
diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix
index 78ae194f32df..13e4ed81a592 100644
--- a/nixpkgs/pkgs/applications/misc/wtf/default.nix
+++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.10.3";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ffpydxlc2c9rpr6rnlqk3ca8xc4hjl2107wzcxzx9id1hw8fb40";
+    sha256 = "1b671jhf3xaaisgpiad5apmvwkp40qr2hm4n21m0ya7k5ckps09z";
   };
 
   modSha256 = "0as736nnx7ci4w9gdp27g55g6dny9bh1fryz3g89gxm2sa2nlb9l";
diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index de2159849b75..85785d285db7 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -14,6 +14,7 @@
 , glib
 , gnome2
 , gnome3
+, gsettings-desktop-schemas
 , gtk3
 , libuuid
 , libX11
@@ -37,114 +38,118 @@
 , wrapGAppsHook
 }:
 
-let rpath = lib.makeLibraryPath [
-    alsaLib
-    at-spi2-atk
-    at-spi2-core
-    atk
-    cairo
-    cups
-    dbus
-    expat
-    fontconfig
-    freetype
-    gdk_pixbuf
-    glib
-    gnome2.GConf
-    gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
-    libuuid
-    nspr
-    nss
-    pango
-    udev
-    xdg_utils
-    xorg.libxcb
-    zlib
+let
+
+rpath = lib.makeLibraryPath [
+  alsaLib
+  at-spi2-atk
+  at-spi2-core
+  atk
+  cairo
+  cups
+  dbus
+  expat
+  fontconfig
+  freetype
+  gdk_pixbuf
+  glib
+  gnome2.GConf
+  gtk3
+  libX11
+  libXScrnSaver
+  libXcomposite
+  libXcursor
+  libXdamage
+  libXext
+  libXfixes
+  libXi
+  libXrandr
+  libXrender
+  libXtst
+  libuuid
+  nspr
+  nss
+  pango
+  udev
+  xdg_utils
+  xorg.libxcb
+  zlib
 ];
 
+in
 
-in stdenv.mkDerivation rec {
-    pname = "brave";
-    version = "0.61.50";
+stdenv.mkDerivation rec {
+  pname = "brave";
+  version = "0.65.118";
 
-    src = fetchurl {
-        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        sha256 = "1lbajxnxqkd422rckfjm65pwwzl66v7anq4jrzxi29d5x7abl3c1";
-    };
+  src = fetchurl {
+    url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
+    sha256 = "13bihzf4yfgn01nrw780swhmcdh8gq71jqilhbi04jn1h1pbm3wg";
+  };
 
-    dontConfigure = true;
-    dontBuild = true;
-    dontPatchELF = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontPatchELF = true;
 
-    nativeBuildInputs = [ dpkg wrapGAppsHook ];
+  nativeBuildInputs = [ dpkg wrapGAppsHook ];
 
-    buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
+  buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
 
-    unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
+  unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
 
-    installPhase = ''
-        mkdir -p $out $out/bin
+  installPhase = ''
+      mkdir -p $out $out/bin
 
-        cp -R usr/share $out
-        cp -R opt/ $out/opt
+      cp -R usr/share $out
+      cp -R opt/ $out/opt
 
-        export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
+      export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser
 
-        # Fix path to bash in $BINARYWRAPPER
-        substituteInPlace $BINARYWRAPPER \
-            --replace /bin/bash ${stdenv.shell}
+      # Fix path to bash in $BINARYWRAPPER
+      substituteInPlace $BINARYWRAPPER \
+          --replace /bin/bash ${stdenv.shell}
 
-        ln -sf $BINARYWRAPPER $out/bin/brave
+      ln -sf $BINARYWRAPPER $out/bin/brave
 
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath "${rpath}" $out/opt/brave.com/brave/brave
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${rpath}" $out/opt/brave.com/brave/brave
 
-        # Fix paths
-        substituteInPlace $out/share/applications/brave-browser.desktop \
-            --replace /usr/bin/brave-browser $out/bin/brave
-        substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
-            --replace /opt/brave.com $out/opt/brave.com
-        substituteInPlace $out/share/menu/brave-browser.menu \
-            --replace /opt/brave.com $out/opt/brave.com
-        substituteInPlace $out/opt/brave.com/brave/default-app-block \
-            --replace /opt/brave.com $out/opt/brave.com
+      # Fix paths
+      substituteInPlace $out/share/applications/brave-browser.desktop \
+          --replace /usr/bin/brave-browser $out/bin/brave
+      substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
+          --replace /opt/brave.com $out/opt/brave.com
+      substituteInPlace $out/share/menu/brave-browser.menu \
+          --replace /opt/brave.com $out/opt/brave.com
+      substituteInPlace $out/opt/brave.com/brave/default-app-block \
+          --replace /opt/brave.com $out/opt/brave.com
 
-        # Correct icons location
-        icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256")
+      # Correct icons location
+      icon_sizes=("16" "22" "24" "32" "48" "64" "128" "256")
 
-        for icon in ''${icon_sizes[*]}
-        do
-            mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
-            ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
-        done
+      for icon in ''${icon_sizes[*]}
+      do
+          mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps
+          ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png
+      done
 
-        # Replace xdg-settings and xdg-mime
-        ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
-        ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
-    '';
+      # Replace xdg-settings and xdg-mime
+      ln -sf ${xdg_utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings
+      ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
+  '';
 
-    meta = with stdenv.lib; {
-        homepage = "https://brave.com/";
-        description = "Privacy-oriented browser for Desktop and Laptop computers";
-        longDescription = ''
-          Brave browser blocks the ads and trackers that slow you down,
-          chew up your bandwidth, and invade your privacy. Brave lets you
-          contribute to your favorite creators automatically.
-        '';
-        license = licenses.mpl20;
-        maintainers = [ maintainers.uskudnik ];
-        platforms = [ "x86_64-linux" ];
-    };
+  meta = with stdenv.lib; {
+    homepage = "https://brave.com/";
+    description = "Privacy-oriented browser for Desktop and Laptop computers";
+    changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md";
+    longDescription = ''
+      Brave browser blocks the ads and trackers that slow you down,
+      chew up your bandwidth, and invade your privacy. Brave lets you
+      contribute to your favorite creators automatically.
+    '';
+    license = licenses.mpl20;
+    maintainers = [ maintainers.uskudnik ];
+    platforms = [ "x86_64-linux" ];
+  };
 }
diff --git a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
index 430642d83497..0797eea6f3b5 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
 
 let
-  version = "1.5.0";
+  version = "1.5.2";
 
   # TODO: must build the extension instead of downloading it. But since it's
   # literally an asset that is indifferent regardless of the platform, this
   # might be just enough.
   webext = fetchurl {
     url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
-    sha256 = "063m6rcdyf2zcrswkm56k8h3w15124bw5iykklzm60q5jk4ywn3f";
+    sha256 = "0b9aycyif0hfhfkivlnvinr13r9h4qyxx768286966p67napbd63";
   };
 
 in buildGoPackage rec {
@@ -23,7 +23,7 @@ in buildGoPackage rec {
     owner = "browsh-org";
     repo = "browsh";
     rev = "v${version}";
-    sha256 = "14addyb1zdk1b9mizfxdagyzlkd9nf5gawnbrs44j5a3ggnl14ln";
+    sha256 = "1z78kgxrbi2jy20rbq6kx5mjk4gpg58w4rb3flp42l9p7bhdbr2h";
   };
 
   buildInputs = [ go-bindata ];
diff --git a/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix b/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix
index e0eb6600c9be..fae04b4d6a58 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix
@@ -4,26 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/NYTimes/gziphandler";
-      rev =  "5032c8878b9dd46cfe8c625c0d9b9f258a560ee8";
-      sha256 = "1avn8xb78xmmc61fjycpc81yrkfi42fna8zgzdqba6v7g8gq8a3x";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hpcloud/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hpcloud/tail";
-      rev =  "a1dbeea552b7c8df4b542c66073e393de198a800";
-      sha256 = "0nssmn8j0yavs8099gwb69qpd1k9yd2z28bii6i4y61v0grb6bc2";
+      rev =  "dd0439581c7657cb652dfe5c71d7d48baf39541d";
+      sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy";
     };
   }
   {
@@ -40,8 +22,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gdamore/encoding";
-      rev =  "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
-      sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
+      rev =  "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
+      sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
     };
   }
   {
@@ -49,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gdamore/tcell";
-      rev =  "de7e78efa4a71b3f36c7154989c529dbdf9ae623";
-      sha256 = "1ly3gqkziw01cb7h64k0wc4myzfcsr9hl7xznxd8k2yqzqvmhljz";
+      rev =  "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a";
+      sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag";
     };
   }
   {
@@ -76,8 +58,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev =  "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
-      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+      rev =  "8cb6e5b959231cc1119e43259c4a608f9c51a241";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hpcloud/tail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hpcloud/tail";
+      rev =  "a30252cb686a21eb2d0b98132633053ec2f7f1e5";
+      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
     };
   }
   {
@@ -85,8 +76,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lucasb-eyer/go-colorful";
-      rev =  "c7842319cf3ac2eff253e8b3ebe15fcc56b6414a";
-      sha256 = "00v2x6qchhi6vv09w29kcyr9i0kq4n4daaj3vk1c4nfj2z7xx5hc";
+      rev =  "30298f24079860c4dee452fdef6519b362a4a026";
+      sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2";
     };
   }
   {
@@ -94,8 +85,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
-      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+      rev =  "de8848e004dd33dc07a2947b3d76f618a7fc7ef1";
+      sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb";
     };
   }
   {
@@ -103,8 +94,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
-      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+      rev =  "3ee7d812e62a0804a7d0a324e0249ca2db3476d3";
+      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
     };
   }
   {
@@ -121,8 +112,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/onsi/ginkgo";
-      rev =  "3774a09d95489ccaa16032e0770d08ea77ba6184";
-      sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
+      rev =  "eea6ad008b96acdaa524f5b409513bf062b500ad";
+      sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33";
     };
   }
   {
@@ -130,8 +121,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/onsi/gomega";
-      rev =  "b6ea1ea48f981d0f615a154a45eabb9dd466556d";
-      sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja";
+      rev =  "90e289841c1ed79b7a598a7cd9959750cb5e89e2";
+      sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
     };
   }
   {
@@ -139,8 +130,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev =  "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
-      sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+      rev =  "728039f679cbcd4f6a54e080d2219a4c4928c546";
+      sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6";
     };
   }
   {
@@ -148,17 +139,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev =  "816c9085562cd7ee03e7f8188a1cfd942858cded";
-      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+      rev =  "ba968bfe8b2f7e042a574c888954fccecfa385b4";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
     };
   }
   {
@@ -175,8 +157,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev =  "787d034dfe70e44075ccc060d346146ef53270ad";
-      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+      rev =  "588a75ec4f32903aa5e39a2619ba6a4631e28424";
+      sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9";
     };
   }
   {
@@ -193,8 +175,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev =  "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
-      sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+      rev =  "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1";
+      sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
     };
   }
   {
@@ -211,17 +193,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev =  "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
-      sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
-      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+      rev =  "b5bf975e5823809fb22c7644d008757f78a4259e";
+      sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19";
     };
   }
   {
@@ -229,8 +202,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ulule/limiter";
-      rev =  "af07f8759cbc68c744a15ffbfdabf35f7aff5e3b";
-      sha256 = "1c68vz9r0442lkj206l6k03nssxx3ys8ddg7d2p2brdanfbprzrq";
+      rev =  "38b2a440be905c8be884fd5e114dc893a64e5d81";
+      sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5";
     };
   }
   {
@@ -238,8 +211,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev =  "a0f8a16cb08c06df97cbdf9c47f4731ba548c33c";
-      sha256 = "1pnvrhi2minkn9mfa9p70b5jnixx8il5yqp08ad1w7kl34c21ma2";
+      rev =  "461777fb6f67e8cb9d70cda16573678d085a74cf";
+      sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2";
     };
   }
   {
@@ -247,8 +220,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
-      sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
+      rev =  "93c9922d18aeb82498a065f07aec7ad7fa60dfb7";
+      sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx";
     };
   }
   {
@@ -256,8 +229,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev =  "0605a8320aceb4207a5fb3521281e17ec2075476";
-      sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
+      rev =  "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/tomb.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-tomb/tomb";
+      rev =  "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
+      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
     };
   }
   {
@@ -265,8 +256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-yaml/yaml";
-      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      rev =  "51d6538a90f86fe93ac480b35f37b2be17fef232";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
     };
   }
 ]
diff --git a/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix
new file mode 100644
index 000000000000..e7bec997119e
--- /dev/null
+++ b/nixpkgs/pkgs/applications/networking/browsers/captive-browser/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "captive-browser";
+  version = "2019-04-16";
+  goPackagePath = name;
+
+  src = fetchFromGitHub {
+    owner  = "FiloSottile";
+    repo   = "captive-browser";
+    rev    = "08450562e58bf9564ee98ad64ef7b2800e53338f";
+    sha256 = "17icgjg7h0xm8g4yy38qjhsvlz9pmlmj9kydz01y2nyl0v02i648";
+  };
+
+  meta = with lib; {
+    description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
+    homepage = https://blog.filippo.io/captive-browser;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ volth ];
+  };
+}
diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
index 0715a01a9512..f6eb283f76ad 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -100,11 +100,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "32.0.0.192";
+    version = "32.0.0.207";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "14nydiqjvr7hc4dmn900p7j7rp6prwyaf6xnki2ssbq6h1ni2lg1";
+      sha256 = "09bbrlnw343ygcibyjfa27r8gjdg1dcxx85d3v4v93wfi29nl789";
       stripRoot = false;
     };
 
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 72bb9ba3f67b..dc2667875d51 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "68.0b8";
+  version = "68.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ach/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ach/firefox-68.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "06c8e5a0f2a03bc49668f36e42a6ae5e76632a4061028667a3b5938d242ced6fc30470fd8120b00ff7ba03f9cf1b9a5da309d6b389d115081f28cc6437b93cb9";
+      sha512 = "df73108fdbb4a76db51af0ed1a1b52761bd87c09ae8f2c967da6e9360ae093423ec4675eee07e86ed77c097611fb9574d9520178cf861bdbfd7827158c0d75e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/af/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/af/firefox-68.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "4b8f1a0f246d6999b3739b5ca3029d5187404809aae8b51c5858c1726d4d905b4a305909a61b594c02cf9244ac81712160cd21c236f4f6f04e6c30dc78bdcea8";
+      sha512 = "e8b14c86b6606f9f3781e3e9af662f05f656b66dfa842893aa94476075a977a9f2ad6df2be6b123008d06ee1f603a78c78b770f044f434d1672980d74d032bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/an/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/an/firefox-68.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "50c27d837e4a5d8d9c49e0d9a94af7e3796d3578a56bedf57286c0206b8d75895d3fae73ec9b04b013f44cee7eb51fcc036f96a09db3d2f163d8ccc97202d63b";
+      sha512 = "b22158d36abaa03d0b9fd6f49b35b9b206a17d0ac4e1cfd0b98be5e29a98fe2b6ee1f7890ead252bac5de6b01a95904a6344c0157bf419450c308ee12fac9ca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ar/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ar/firefox-68.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "79ef4c08f4623b6e48262c0a7f705fe4dbd861c5592956cbe3441ef64d9450e90cfaabc743a74549914868f793bf026a93fcdf2fe4da20887b0a6ae0815964a7";
+      sha512 = "16cab70bd7979d73d45c1ee79877404573a4c01f90542d5261d19bc32bf4a519282c64eba66387febda0676f4cf7ad1666b6ea6dbc0f2dcb4a2f77ce80f81cb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ast/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ast/firefox-68.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c46c83f371e60a6c00285e027b636c0bdf350e6a73a3bc7e848c4d55579052db06effcaf705115c55980d2ef10a06b396d0687b33c1d8311f2afa632d3af0169";
+      sha512 = "0b645ffee377b8e21b7770e10a711a14c789e3ce2083998b5ed68a66cb0e0df6c1d31f498e11c1f623040d75751907267fb2ba56ddcefdde16c6904fea6fe16d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/az/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/az/firefox-68.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "b58b0126ea6a3a5cb1061ec61134e9e3fb9f9017b2ecabd76406f9b32267842c942affde81fb228c13bcc928225f9781fe329de243bb8a47d22f0e69f336c2ca";
+      sha512 = "cdd1f013ad56204dd7dcc1b29004ed0eb3f708cbb14e502a74501f7f0ec468b24cfe23bbd427615e3e23927e1a8744f462702310a956dc657f3366e2f953fbfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/be/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/be/firefox-68.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "58cd67957b2cfd8ac9f734520806333275f98e8985db0570ac6f82c86616ee62c5b7f927ca9daeef6828b5595e2552b7de419b05e53c37d2f25e8f4f7ab1afc1";
+      sha512 = "a9420c70f42ee2dce971c5fbc8f7528e1eeed49e8ce316ded3f30bb17b7590ae6d67542e1b458eb48024d30da46a0e111ecbdba4f56a8962c789aa31fd78a018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bg/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bg/firefox-68.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "3299ce2ca4d855b473df74eb17f4566a645ae3afffc54046c6f461f35406c9bd607ce02c8ca580448aa2040abcf518c3c1bc7e3bdc9ab9ffae0e83bad686ed55";
+      sha512 = "ebaa7e029d25cca97361bffb3fdb0fa4a70404133513aa633954131ff7df887f736933e5e8626464929dc6513c0a1ae1b8ba042a9c83735ccb866a28391bf901";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bn/firefox-68.0b9.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "2489f10143a4a9e2a5aeea4311ff541d020d062a1d908442a09b03c0428398d66637c0c3a6f38058f3004eef27d1855d8f05e73f8764051fdb5e1ff0ff1c3e38";
+      sha512 = "e1a4b9f6decb2f6f53e438c32812115e31de5d3e81f45ad454cce6cb93ae299488f0a6924895ee94adc4b463dd22c2f3848a886a1e21625d9a1e53a205ec11b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/br/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/br/firefox-68.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "16364820caadf94decd4093dc034e08021c1b38f6c7bae44dc663b6aa1284c06ee84e96d6dbe051d28e15e51200d7d13cf1f85f7620aaf87c050c13bd1ebfebf";
+      sha512 = "6ae811863d794a67d021ca7e8d4c907cd0999c2a0e98a034456554b40e421415649560809bd7b89c4573dd5d5ce7b4bcc0c75fd61519eaa6ebc213ff8711e9a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/bs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/bs/firefox-68.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "31fd92dbc3e1a2bf24b0ddf1f12eec6962d83f06cb5b454354405dd4edd41f2b2aa92ee6a65a5048a567b880c0481e2a95f0fdc02c9b4e78815dfb6370e62f06";
+      sha512 = "cb05b67d3815e2dd049c0cda8f99f498e6bbe2c532456842c999bab6b664eb4b9bd125f8cf89e27b0a69cd9ad607b488020c9756c3bf792801cf8195aab70bd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ca/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ca/firefox-68.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "cfe1405fc01a4ef3def627a9ce15c118732245c933bf1b1968b234a616cf01441f1f39d123f5ae881ec496f3cbf68e3647e9dcca2c5569658c00001a4ba5e0ee";
+      sha512 = "fac4c721be14ed75bcf20018cd94e251e5fdb406720a4a142ac9b8432eb7c986da5ba071bcc49d728c516428c0778413d2bfdc7ed97e6b9dbb4bfd4b895e0954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cak/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cak/firefox-68.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "7d0b9ddbfb313af00f41349a3fb9494a9f4a0ff42d2fdcca48e50b5ea135f7b2de04a9808b03d8446691e1276f0b4b48b07c660b57aee5726e01d918515e8f2c";
+      sha512 = "cee135e11617f7e3aeba01e95c7cfbe9f6b5cb77f6e67d852a8f9e891ca0fabbdd184817651d26eec23f2ec373b34ab27e214955d19055117f5b9f0cb1c00987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cs/firefox-68.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c78ca303a30db3ef2cce9f67f480bf7f82b962951596ecd1be9f6e775fa2e35f3e00294528754a65ab3e34d2f5cacde27e4d0e4c666f25ce1d7edabd2d1237db";
+      sha512 = "658f6d707289c97bd30a8fa63ca4a4e58572817145ad61ce8d6c73e03b932970a4878b09d04dc30035ebaabb7a583aa1fcf42de055319aed2f54e4d69db5496b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/cy/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/cy/firefox-68.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "207e7ac1d163b6044b93b43df53426acdf7f93876c1a7178023f4cc3eebc28314744ad340f24c10ea5ec3e4e547c03d89d72bf51a97bdb30798d0fad2b1debcd";
+      sha512 = "b59b3bb442fe54e7dda94c6a36eed6c08760499a9b596bd4dc5ffb904247505f6f8ae5a3df448937b2616cc55a9a0ea478d9a3b4fe71c883cb66ab40fd0ebadc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/da/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/da/firefox-68.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "52a24800645f4f3a6dbea7768c81b8d903624bb0ba305c934dfb4f7b2d0e133202cf8d00ff3bd8d86593266f4c776780b8bf96a32a9f9b188a89a99656c2e16a";
+      sha512 = "c6d8eb94e478f40dd7d70456c3b4967d6e27189d33deb3b5a13459073008aa10bd8d02daf8ce19a6cc6c6438efbf32d837df88236d4e449b1b4bfd8a193a4673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/de/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/de/firefox-68.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "16ef3d62fc94b1f69f4275b1cec6ebaf96a4764a4f14434ee803e89d2a1d753dbaa1030cc8fdec4bf7cf97ade43bbb398cf8a73f686cf092e051a88d29a26698";
+      sha512 = "5a4a90d2ef8df0d1a80d45a1cc7c0d1d61ed1cf6a09e9ebc3ac351f28894dde36ce09ec6db16112a67aa81dd5e7fd135a0ae816597383ad312c9ad8e6c368103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/dsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/dsb/firefox-68.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9a2bb845e0dc9223015f1e801f0cd8c852335c362adea982d11e43ce152b9225c348b72ac884c3154df1975aa4a9826053cf2193dd2322a99081a2ddfc20f16b";
+      sha512 = "e23e81af0edac3b2c1aa11691ac8c4f298304e4025f3364d07c5cc39f799b5492ae3104c186448c1afab88a47ac595987ca0e4bd8995c880fe29a23e94374222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/el/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/el/firefox-68.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "55bfa870b2cb82417382a6b49087fff483f12a29eddb900b2b218837ba7d7644dcba1e643131de2936a12c6040b451bad0a24316f30f48659ae34fc21c24161d";
+      sha512 = "6d7b1a45fd2fa48344364cccd5269da20f8262403f17d1432f3fbb96508323002a6595ab8e855f3bc1aa43340b0c97ebd03bf97b97e2c27a0fbbd4d128cb5dbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-CA/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-CA/firefox-68.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "830a8c96c3798d9839da2d3f3655cc98a8bd370043070c3102c95a7948c97171e789b0ff00e53692417331fda975431e17926b525ea4ecf71ffb8332ea775011";
+      sha512 = "c34c82923b377cf82af9b026db4f5b25d15b0d463c731c4fa6097e87f4e083a7f9d5f39346597ddd1cf5a4eacae27e10542536b7530d3269e535500a73889fca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-GB/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-GB/firefox-68.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3a9f08ea5ac2af4369b95c0d5265ad9fdabcdaee27505666c294d24ee7b4585035e963e64efa484d9f9acbae6748fc116fc29a24df983500dbe6daaa2f7443c3";
+      sha512 = "94776788b735598ed2e6e7a3c3dcea619b8a551ce20a5c3023bd993bb9aa67c9533f6799dd4e1fdab942b7f73367cca409cc00f4147ea1fa615684993469b6f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/en-US/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/en-US/firefox-68.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "0fcacc478df604851115f0b93944be2884012bbf548551f19dd1b797e211b37b4d6a2a854b3c4461f1d95f4c01f8b090d7e0a338c472ad886d1cfd88d58ef9c6";
+      sha512 = "7481953347ee583799478ac519684562bd62bb2d1df751b15124cbb80615461d94303b1630ffdcd518488692df311d81bea87a5dd45e2ef9bbe11b2962a44b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/eo/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/eo/firefox-68.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "856f36618af3092dfa69c56653fd76850ad93e46a9b9d1267ba02b89456c5c090181d4a34068c685d6a793dd974046123fec19556f20e7af5e5059a82e23d685";
+      sha512 = "06030f7232cf1d60b89bebdc4a85822801c63d2cd7d634f28b70dbea7b30feb2424c9ac69ac3558c716210e4187e1bd5df23ab53026abde920a36c952b0fd07e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-AR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-AR/firefox-68.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ec3cfe95fa549b405ca72c6baec9926e157f81cd2f4e258f7b852f5ba9a756744b4b095533ddc62f6d3864e68ddeb33d79aeb26fa5be23b6eca6eece3aa925fb";
+      sha512 = "613686da771efd3fdb75976c6f83ada29541b3263d1552d71fd042ee19a7ca4db97e0cdc763203930bc011b2ed2810665dadef69214d823b8a80510c0c03cba0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-CL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-CL/firefox-68.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "179954ac2f10fceeb0ef11c295f392e84ec7fefbfe239f762f061a8e4c3b29ecd7305ec45b5a85670aea249d42dddc1ba93831c6cd37505a5123e122bfaa8e51";
+      sha512 = "df95d50431f14509fd47f8d47b85a1b4c5936776d07dfd83ff95d0c49627cc498732c42e9e7b965508bfec21f0878134c31d7f34b50d67a7eeadd553b9d47036";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-ES/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-ES/firefox-68.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1c94ea2b6319acc4f75387516ea2a2519472dafd776b561f4d8f9e61a843b8d8ed9fa760aabc49f46aebc5792a50d976ceaf07dab4a20d06d915e712bca1db3c";
+      sha512 = "e9e3b11d10b39c8f05eb57637dad5c0cfbc93c35c634235e75d8ddafd580cead289164f5bb96bc7ca6fcfe083b8bf8e30538269806774bb46284203125b5c8c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/es-MX/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/es-MX/firefox-68.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "b575b813a97023cf35b2c5baa857cf69885fda717ac2be8299534600b1e581e98538584d8122912e412432416cdb30e23ca7ed1cf486b6e6d79c6b67fa429f20";
+      sha512 = "ab9f06e621c70f78f01b4f224dfcbe4c38c54a2bf59dcc581803b0b9f434ad4c1dcc0dc3f282209aa7781879b72939be24f0c782dd833df8d0c653e53dea5020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/et/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/et/firefox-68.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "564a0a0ea565511e457163f512615ff8bfe0199152b211171efeb9db7c6216c020a208bd551482624d0654c16a834d30148d4d415c63eac6bfab23a0df3f5561";
+      sha512 = "2f31d7adc53f8af0f59a190695b870b1ef79b49a85691ca75d72ad647e78084daa6f574b3904d97086ba5be6ca4c4012d6d4d9cb351762f253362a444e3ee955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/eu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/eu/firefox-68.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "949b25e654339de64dd69744dda7108e2e305c411bf066d0e2d446e07789ae7498f8191befd4b73a0f08bf6180c375368b7a063faf67c7bc912cba4cd971d8fa";
+      sha512 = "44280ad85c07d66b8cd2714449d71ef694c95a00fed2fd78cfd92fcb5aaaa9ddd3a30ec4b51822cee3629e7462d0adc0b7e69218b748d2cc125ab04fd0e5baae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fa/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fa/firefox-68.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "7b2e80b6e5eaf997da4fd13404d1af9c1c74c69568e36880e9bfafee2469b79da805f84d975152d82beed8bc9a254979487f747c249285ca001e80274ae652c1";
+      sha512 = "a5a5e235e5e781b7e233d34666703158fa73b9a8dafac8b8a3e708f72d3b0e01257a7e6bcf4e20edf089f38f390750874f55d459c37b2af0585159547ee268e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ff/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ff/firefox-68.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "abe877ceb86793c9ddf638b16d8770a090381cf508f6b38d4e27350fbfdc540b9a5d26adcf1b298d42191720616d4910b26546960278968fcd4645837a526702";
+      sha512 = "6bc60da6264420682b03175a33eebb7f73a73688193f71e256fb2ced60290ffa833545ba0b93d35101b9e75cf8ebd831c8c6d0815364e9a727152b8c60c07ea2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fi/firefox-68.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b9de5eeef9d9f154e91db934be1ed429f86ac7ee3c9d0bcf9e1671079d93d6ef1d3ef2ee94224f705e450174a30535def5141d8d4dd524a6568d69e49090e545";
+      sha512 = "6a38cdada92b805da4a4dc5399ee34c88ffa16019deafb6a728ccfffc947a5bcbcafdb8a1ea7fa5bf6d59a97c26e8736c14fdcf2eb8a67ed5d19f9a2e8cfebf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fr/firefox-68.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "3a53a841e6e9f2792b321b3cf63d80a1817c480f2d45ae57b45d1cc9fcfa1209c21b2aeec125043ebcdb798051c5bbab54381d5aa8c1f7ef3327d94e0fe860bf";
+      sha512 = "255ec2e094d77e35fee6c677d4c9500fb9b7c2a895161d0b4ac44355a96b83c1883e4f3e18a66fec2e25ad4a2b1bfc0e7edf5c25df9313d0cb1130088095ac17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/fy-NL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/fy-NL/firefox-68.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "63de96536bf4c6ce362c50f1085f88489781891c91d2e9b52e2290a74c996d15fcb5dccba90fc243cafa8010705f42d82cfc872fed11a2b6eb6b165e9b4b8478";
+      sha512 = "68e1305c40680183d380bc64c8c5885ed6c55c2730444c91784d8f309b849549b1ce8dab253af4fccecb2b2d90efc2c962409dbd5f55acb463b4eac0a5b93944";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ga-IE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ga-IE/firefox-68.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a178b11b281b3dcb7d05e5bb05b9bd6389920ad65f2c1fcce43d00266bc541426a7f7fd0eba9fdf35beca76dd331a329fafaf1957ea95f91e9b9cd596ef0a5d2";
+      sha512 = "5bcb557bb6edb8d67e4127f8cb35962eab12bfb2398a1402937c8a40599c80102b6913086c44550c567b9544fd6c5969f3d53c8ae31604be09d34c8ba3df4ba9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gd/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gd/firefox-68.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a8bfe0ee393e0eba37e8192eddeb52925300711db40ee175d2070a15c5cdc4c2f15d767d4c5f842328338b0b7a9548d8298a92f7dd0ee774366a76f44ceb7b44";
+      sha512 = "6faa53dff9915e9c1faaae5608bcca84756328cc02ce51483148b533e91da6ff23cc0129cf87fdd2d030e345926aad0627ef4a7c7877a6de6e5ed152ef30fb2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gl/firefox-68.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "7cc5c2e42a9f6caa013bf37274a9b01d5dd290d1fd61f50746561cc5da8531d814539daadfb0a91d3ae1a841c35d7f3f30fe4c6c2faeef66507a5bdcc2ba97df";
+      sha512 = "688d0c962db7fea727d55b9b4f95dfc87c99a5121929ed97aa1edf7e016052c5e837b5f24ba29f348b8f2233cbe412e388be8a4e5bcc0ba21e265ac1c0edbf72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gn/firefox-68.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "804662b510c318beba2d1ffa8edfca896fe61572e49a40bb28e67da260f029578d6be090966b2a25792eee0eaecdb6f102f376b6ec15bf8d77c19b9761041b37";
+      sha512 = "18980ce3e8f2c28848190ffcfcb43b14a18ae26b3e460cc09bca8543a30db2193f7c53fc248b01b5a72e5d766e361ed3aa0e14a7fc841c477cba9739b7ab8b0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/gu-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/gu-IN/firefox-68.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8eae00a3d45c1e9940fa88927ed19b76ccbc777509e8f504261993ecbe81bc9bba56f9ff40104418ff76bf13c146a7dc9e9e9f1e8716695eb12858ba9cbb0f9d";
+      sha512 = "15e99322624770d4fe507668209aecc08a0d09ea36cdaf430e1d8f1ca56e7b7cd52ec2398559b027602777d72bbed7e14d9836e846e8f5197d4933ac50d43a99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/he/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/he/firefox-68.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5d6176888681e2b497dd8c18131b5168c901ab482d06caaefc02c587364f42db71e589c7a5fce602e82b004a8d9cacd90d98c586970fe0f16a0276b8948c64aa";
+      sha512 = "30e72f59e36c8e8200ae42236075009084a4a8cc9f9d5864c0a5a8ed65ef59ac2796b09942dc8f3c434cb726330ab02100b06e4559ad5397dd0447b056c97420";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hi-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hi-IN/firefox-68.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "d01c44e5afef9a8b21de9e516786e925b80106293e70491ed89178f29dd5fda6ba714ffd66984773564e72f833a17bea401709b7629c39f7b08c592e3237666a";
+      sha512 = "ffb663f794b6af790de17323ce6c3ec602cd612c445b0d679693bb57cd02e4d2a2dbad16947787a5d1e3f3da135a97214a4a94e6a5bcb9afd6605bbee8c5f930";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hr/firefox-68.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "9471e87d59530210744c34b59b02ac759b8ef32af8297f8eb3b929fdeb7f945acfc26a9a31ed15d04afd917e99313886c195c2512b6280cb6cbf93eb95eff127";
+      sha512 = "0ac4e1896dd368cc3a878bf6736f77f40ebc1b3bed53e02b50d278fab3f0e390256bc29806e784381b2850f9245b1894cc7273dfd4913499fd8eeefe53d9ada4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hsb/firefox-68.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "1be7f6e9571b2fa3ddee50f04c7a333bdde2d7a7929dba71e59c7d5e424322362462a250d8b943fd4e527cc936292a2f0fedcf5771a304052e8dd42315983031";
+      sha512 = "f000f5be62d0bd8e9bd82758ba2c3185f4d1e2ff38c4168b3b6303d6d6ab24823e191ab9e8a4993bc3f6dbe040c5d9003c906388274c4850a747b271a08de5aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hu/firefox-68.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "4c80225617250d635b6a9abc9bb91f5b16f78af60fce50dde935a54897e3ad72d1058e1bfdbe227d6aa7349c2c0e5f6d7cbad27e39dc9c164b328c92d4432b71";
+      sha512 = "dea967180d3b2293a72b669c93a8f0d07bbd19892ad61c204d0655a14c6be5979ae0c377729075d955e46bedbee4567e8ee4269aaf54b898967b520d3f2cab19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/hy-AM/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/hy-AM/firefox-68.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "a7cdf6c1562bce999356cd3db733d30bdbba9f6b4f525f135ff0f747d86101ea30ac1ac550ddf725fc60267090559f6be7d6d5df052b31601755d723d01e0ffb";
+      sha512 = "df04da6cb71aace824554e26918b8975aa1f6195108e0c19eb9f8d9c384fdc0f4776c08bbfb57a1e3e8bbc90a95fc59c072467b04b3d4d9c84b3dfa4a80557ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ia/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ia/firefox-68.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "f37a4a069672a466a40ac236b9c9eef5a73e54ac54cf404cbc08cb8764710c46b2468eeef434459d1ee1a9a0b0e67abde3e5d6bb919bef05f87b574e6b92d6a5";
+      sha512 = "32f1852dd33df7edf1a863b2c2c7140b60482adfd9be7b00b2525a1def6b4d26b8b83a90c435131b4ed8638827dd31abe6ea94558f43ce0d9e54bf69f822a89d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/id/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/id/firefox-68.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "011488c75a24d658e4b2929452eef3a4d013580a6fc2ee5ddb126a2010e3587c5c4adc436d9e7a61aac74a1b9dc3dfdc35d31feba0147a30f3d4170a03522d57";
+      sha512 = "5638d0c13d043b41314299ef5cf4fca7248f94e5b4b257dd598e862d0023ee91b4832804f65a0d0df09633e9db0820afe0292053c95b9bc82352ce7b177cab78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/is/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/is/firefox-68.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3fc90cfa53c9591f67810b2ce8ae21ab59a5247a8856f979fad4b304b6027152f7368a1d394b4a25661a501a750adb511459eefdc59de916a39dd66c2f930d5d";
+      sha512 = "6090782f2260d3e2f0f05f9283d6415f0784d2ebb80579f0307fc75e8b5879de4a8fa739e988d7211d907283a21ff0694b2b97983a446cc4097fc63a8b360c1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/it/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/it/firefox-68.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "41344bb9b820975f146375faafe6c60d5c6cd0062af528ae7de668857faf46e7273cff587bbe66b238072a5b95bc767a94a780482fcc7c6356c3264107a1f6d4";
+      sha512 = "5e610d647f49bc8b3cbb22df354878208b6bebb359222f8043c6b1680505bbd8155405e35c1baaabf2d0285bf331ade587462c727389022b7ea9cea807577759";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ja/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ja/firefox-68.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f062c700544d97a292f0421f79192d84a6c03891733391eec5177a9c3d09acfc9f115bc551fa16c11135a1d1291643fde3469ea09eb96a67e5f44011bd595e31";
+      sha512 = "0f8767601132ab5da83f715de1860e1f7104478f08d35f2644fd9ca616af7fc80ac16899b26938b542e054afefb2992528d4a88caf38f3b45ff5ce0ffe0aa543";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ka/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ka/firefox-68.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4887e0fa87082d74984bb9d3628c8fe1c4db5656315bedc5dbb08a81f2377b66d14ecaf274d30836449f05c0493afdc89932c9c24547747299c16700b90f65d9";
+      sha512 = "7dae712b9de8ce60f1bee578435e9101e71e56c3c4225b85c99c45500d609aa7ba85fe1f5edf10ac48c67572d5bddb78605261142bbd99938aaf9c88c2067afe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kab/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kab/firefox-68.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "afc3ddb5bc4ee5a38dcb3fc646a9f163029fc97f45c24ee1de611d1f480c1d54527f70fd080e94b33f2ca9ff2a46d66af1afb596085eaa956ab3ab5103bfc16a";
+      sha512 = "5a125194703b6f650420f90dbc887a85ec82f5c637d8479379576ea03c429f8ab1efa5221f5557bec6c6737a910a64a05a6c42a761bde0cf1bd28548262707c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kk/firefox-68.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "f85248876ae08edff3a972c18180947a05634fd76486d675e4812810b694ff5bc0df48c64be2472be87fc88890bf2a7207a3e519202ace6f6767b302bfe00a64";
+      sha512 = "f73e37f2a6e295d1ba48527f250f7dac246e81e80653fc009915a2f584a37773ce299f335d658273463ad2548ce291ac6910ad26c4ff5ad9d473306544fab441";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/km/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/km/firefox-68.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "d459c737dd2ef575836fa4fc8a7bca721df63d09f5178defeeb9d44d1b995120d8b11b94036370f7f88d35f02ecee641f69ea62332759f39230ddf1adcae6479";
+      sha512 = "040d453226e64c9dae7ac1b0855ba85455791fce8a29b4166b5f7c41ff5e6b40b32e7640de8067156519694b0f152d4fbd5a64bcd452c3175af832fd3386e976";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/kn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/kn/firefox-68.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "ab6a4afbd1063d7ba8fe59941ad56b557dd32c541d6437f11eb0398c54c416bf04d6b23d49ffab9284ca5a17e632f799d6225242ad789373ed1de9b78f2cc5b9";
+      sha512 = "4e0ab2b27fd289d62807340086b9defde966d790c864d53375416b9b52c3b5d52c04e468882a64401727c7564068938c3515e0d6947b4e762c136673337b5a7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ko/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ko/firefox-68.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4ee0aab2daf89fe01028d7f4177c5bbffd76946eed87597a7108b233993e7e7a8c255136c71b8053680776a6f0c0333708180a06d1cfed906f9393a385414453";
+      sha512 = "3dfc09f75e1d5c1aa089093df46ab45307bf30913b522540380d6ec67ab0e85d41a515bd1978ceb3f9b999433d3210f8727417db3eb77167aee2b2dad4a41adf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lij/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lij/firefox-68.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a40597b6c3d9a377d044deb75e4164ef87725767c4180987637b77eedfb0d73df6580fb7103be5433fa42665ccd8357c4b4fe1de3bc07a91c18792099f0e8423";
+      sha512 = "d5944ce7bb07ab8cbdd59480adc61e1e41c953369b62237c8b432aa312391172073474ad15d7ffb81b6aa972910361a174cb264dc84e20211bdbb8d43203bdb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lt/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lt/firefox-68.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1bf376c0b2f5a5ea2fd0b4a19601bd74aecc2767c637d1a1689e3b340a571898033b8a7ffa3745480aebaadfa32842aca7d221d7a4cd003d1f90d41b5d5303fd";
+      sha512 = "98cb09766fdc49a5e214f843ea8e20090dbc28e993b70c9ead9b35a62c12f46d4c5ad1b41e2c78e31e0ab26b95c4897eb2677c22551dabf62dfe44b98eb855a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/lv/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/lv/firefox-68.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "56825350bf4ca1ad02cf25da3c9bd8c7716e658e4983389eb9cb4536f03c88b9f2fca9193bba2b8d74fd1694cbae0c7ded6f31be39fd1534103b3e7e21fc8953";
+      sha512 = "c775a085e1a157c7818a19bf28cd7dc9fed0ee0e90a647791d4b614e75526f1e85c24d62bd24087039cec96632a57670cfa8673aa02143f08eb1ac2d54815235";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/mk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/mk/firefox-68.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "f4b45ab2c515e55e91679b4825e1d390acc5b1cafb684a08cb8dba1b1374ee36a957f2ea7bb893fd230e3499a6289f8dbb6fbff458adf01ce612ed80778ee4ab";
+      sha512 = "a420e148a9621f5e2c77cdd533fada13dbc41191edfaa76df06072f86bfafe3dd5222349888e90e99c016f8b1c27b4446f79464e9a8ac6aefd3790b1d868e31e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/mr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/mr/firefox-68.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "ae499107862a82e952c9f47cddf681a82f7401202878dbf0427b9927b58c860e2ade50699608257db6f11c73a8f1e9eb6a8e2ff41091c36d2a6c6affef99190c";
+      sha512 = "1efbc8bb43b39410d54c038917ad0aca59b4412d69bf780228769b61c4940addb4ad053acb0488b16e4780eb7407206ba0414b73ba6cb150404b4c43de017c5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ms/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ms/firefox-68.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "0cfc3643ace04e2385b283c1f87d088af9a3c8fe723f0c5ab056157889a85107da3e06fd47715c9c1f08e5ae62a9cd54454f24c6b2b6f90526a04c4d1d43cc6a";
+      sha512 = "ad3f12f1c8cbede24a3b453e0b1e911af94065ed016feaef43ae2a3a695779a6ab0b911a252a0f1bac92c395170d300037b70c1d81f16a2e3a343903f1418196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/my/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/my/firefox-68.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "fb524f42b9ee62149ad58752d5db56e4f4c1ecec3ed38de0a4199984dc3fa01825543878d2aeed0bc1687c7e38753335cb0181d0b4393f3c959aada9672f8bb6";
+      sha512 = "d55c381e42a3b777bf1cd50fbeb91c7ff3064358cc0473e99bc4d6b5bf84d12d1486909c98c465fb09ebcb2ab1772f96cf91d831b5b6db829e5958269577920d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nb-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nb-NO/firefox-68.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "ae94d48a053232f77bd64dca2f0e1dd2ff73a06d52283a740053d5f80c95cbd3d875d9cb9839709c4991b4a04639bacf00b8d922afab5cee8cd53abafb0716b2";
+      sha512 = "65c93302e7ee4653de2335543a4ae7dcf1256db9a8b9f8724ce40795bb9eb142986b069501402a227219fc528e2cceedf8517a6cc9f2d23a0655857e6f1e2d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ne-NP/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ne-NP/firefox-68.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "a0357540495b0df6cdffd90094c6af478325e8362338c9aa7b15799c831d5c67a9ac323d4eef52c72e78c7ad1ea3d865b10125f4d11b80bf1c67f5fd79487e2f";
+      sha512 = "d633ab92a81a0c2b4e1bede8ed2410d986a153dfe92e789cfad082e9d8377ca6f53a9e9281e184e3aa61b6448cbea5f7cc70ccf9eef22360a144294291ec5eac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nl/firefox-68.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2a743259facb0d41758cf0f1f5f9d923e00cdcbe408b719428c9ba7b1733fe273eba364f382563741f2b1729335abd9074ac21b15e32a7b4ff79122c4701e47c";
+      sha512 = "1f724532a29b642a62b9da7f5608a9d5f204dd8c3fcafe03830d3807fd03bfd2cad2e6804d093e398baea7b897b15d90bc07aa61082497fb2e6252a2d29bf768";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/nn-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/nn-NO/firefox-68.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "88479f2c42720df29323ab015d8ffc7d6e3bc36dd945686d36249565bb4f15593cfcaaa10bd3b7d978335ffc6633d3180476f307ed9c34deae97e7683cb9c284";
+      sha512 = "476b07426dc4c3a1198b5e91003425fb48683e5328b4e992777189fb91a3fb786886fe9cead5dbc6d84065194c9f763f11bd290467b83c10ae5e556fbeb53103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/oc/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/oc/firefox-68.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "8c7c1942f8048d29bf84dfacc550292ae3777a534654f35804d008c72854186cf4fe599c38f08b99d115fefaaf70269e6f3e5fa9f47a28a207f9f644d985388c";
+      sha512 = "c0adbd812cdae67c1d7e4148cc433d8584105a317d476c8be7a9d43e0736cba3d68862c216c166f1ab287894ee9b0d2de027d9494f95831025ab9c3d72d79625";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pa-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pa-IN/firefox-68.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "e0ab87d1fa907b0d8813a3afdc12148356df6b346324a360d58e51b97267a9dca57c6fe3ac4b2c7ad1788f0ec1947910ce6774ffdaf23aa73f369dd6a4f4d322";
+      sha512 = "289144154fa28b45218b8dd414edc1cb38c33f5e1f64edf12e35f7aee69792d2293f13590565bd47619a65baf336d3c85bc52d8db8ff39c812131d86dfee25f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pl/firefox-68.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "57fcec3e775ce31098a8ef00460c9a6dc0960d9555fd0cd8c2ae0bbbf5e4c8c2b76acaebfb61152011a0ccb2d9216fde2d76d87abfbc0a358c50f422d11b64ac";
+      sha512 = "93c139ed562458107dde717a91edb07cad626ebdbd71cd5271a678dd412dfd8ce7b1a6a278918a0d4cbee870f2a5fc1e4480175a1ab8e810e3552c095bca5da0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pt-BR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pt-BR/firefox-68.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "73919689c12e60af0bf3104e1e92ce90743e30425a8fe9f6c83070341f539abc32641d7eb2377618ad132db20fe1b73d7d55f4b9d2b04a3dbfdb531926b178af";
+      sha512 = "4707c1a07b6ab7c75c5524351ca42885d7aa27888d2441e8132687b9988c1a5cf4cce27b3c19473e2d021d5b5da2e49430e1fc4c5df6f6434b2cf4f1a251f229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/pt-PT/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/pt-PT/firefox-68.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "93b7b910759b23659826dae54ec3643752033f5e5da58b71b9a66672cffce3544cd57008df1bde98f63709cbe4fd621cfc3bc60347e15f54bca669a01d039adb";
+      sha512 = "1bee206416b37ca9f6c93de2eb07c87a08042fc25ca166146c7a16cb1d366d7abcc48eecfa9f585226d64a9cfea305883e73ed3e9013d4f4b846556ddc156ab3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/rm/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/rm/firefox-68.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b56a4ea102941533d2d203f55052a6eb35c1ec66d636b22c2c2d64c1374ee71d11398e96fe9d3470f91561c4a61ac2c31b1b4e656abfa79277bb272b494fe47e";
+      sha512 = "e492d5f38a4e3d6ca7bfff591d451fbfe9b81c85b7705d09e6bf5a3aa24b09bb0a534d672f7a4bb62084cc0b94385c18b4171277d24220f1e9df613520951175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ro/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ro/firefox-68.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "a0659d15929435652297d34e2b6ff86340ec9e9df99200f472bf7fd3fdcea12b2a69f478cd1f724f79da8bb5d7f81a48d56db5240beb6b2ae78b8800bd29e6a6";
+      sha512 = "e281777695db85113a1dc24f7b65779bd2ff80480220e5e56bc2ce1daf2e749b5b03bc24ef3adcfbc0ee3cfae96736641d6deac74fb6f10630402c9bd4b57eff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ru/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ru/firefox-68.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5e0104073c37702a94bc29c7fa192215bf1fe8bf188696ac41c42fb6d7caaaa37d46e3359422b64aebaf8218ae4d0723ca0dfdc0734cddd384698d761075cb7a";
+      sha512 = "48eea1bed9a3d8a9d3c01ad2d3b87451b85fbbc928c45b6bfac6a473577f15800130e306851b1a74857657619ac1236be08fe6d0b2b1bae7bb8349bec989a6dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/si/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/si/firefox-68.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2285f9ba6644efd48f7c3f7b9d17ef30f85c5fd12cdb20bce679a0e59c0490e69d9685cf4eed3f900030bd94299a0c5e3a5f7102d4023fda3989868455a82c18";
+      sha512 = "ef1041d268aed226b4202ca38b8b29ef73bd61424891a4653414e2fc5910d0a97af4064839a15a7437cc8ab0ec17badfce25a5556fd024af9665399a918b3b03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sk/firefox-68.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6c14bc2ff9f2f49eac9c0febfcfc06533c6848091d7cbc51386edd6613d89a13ff7d2af837766036d38bb9846340939fe60eccd2dcfd1a11684fdbb5f4f07aeb";
+      sha512 = "7b7dbb185c3a981ca4656a1d04e65f123101d0163ff9d3374d158c808b311883ac188da9a445e069b78aa48b41824493258daaa8fe192fc2f7e984cd01ef61fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sl/firefox-68.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "f3ecf2aa20172715bdabf125169d45b76505fcb1c6c462fafe5a33e2921b76c99eeb8d25dd6865552d713a6a9606c6905644933cfe22914d7d8e24ae1f1bea83";
+      sha512 = "ca18d8394b7282e6e5baa2a045d0bbf9cfe4f867732bc1931522704dcc0b52e3a0069e109f1cf7eb845bf20d4a9770adf45bad39886c2993b8cd9794507a7331";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/son/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/son/firefox-68.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "9de313efdc40fbef8b0f1a8ae8fa23e443e35969e6c73c1d4aa1609309a08750460c790b652fae40763e2350c3b3d076bc930ef2a65bb7bd6eb4fcc49882fff2";
+      sha512 = "8994e82a941015e587445f0eff7e0e4c95997d62de1ad975ed477f19632becfe6c23d6cf9c2d3caccc1893bf6d9a7c03c79e517c3276d08bba3011a76fad6021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sq/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sq/firefox-68.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "2b83af879b57bc46db9017b68490c7915454c5d3ef228a30bdbcaf0f2bc2abcdeb281e1cc5a1aa314dfc2248de34078d3aa87bb917694f8a47e4d0db8612deed";
+      sha512 = "5498f49c5a7bd1a6ca0802e085226935254d26add2baf869cbd6eb2b29409f297c4317455fbb758e6c5913e5e02a3bcb80e8202de40611d03072c57584813ff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sr/firefox-68.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e6ab6cf695d4043f3b24e25de31f3cbe764cc5bec7ee098687e21db7d838e25c154a64286b8c74612f90129854b8faa7a92376fa6f764ac8a103860114832c46";
+      sha512 = "0737b59c7fd2da230d32e908b86381a643f8269475558469138d37f1ef6f268f62614ed2bc30da9b99759de312bc4c5f9c526c51052c43d0f644e7f8f0c7fd0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/sv-SE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/sv-SE/firefox-68.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "6bc3d76feb2131526127417ec34b271893883585416fb635a5074db3ecf1deabace0d5863cddf4b01707ff7ec8785d2a4b6d150b773bcfa9c71a7cd104cfa752";
+      sha512 = "2b8676aacba6cb20fa7a0e301c422def657ee0fe5273c68043a4d28ce9d30ad6e8bfa86c8654d32548951feb19cd431e3d7b8ae02aa69a441dc314df35dca6d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ta/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ta/firefox-68.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "4fe69c34a501226b873e94dd20bf7616c3fbd75ea2d8037ce3cff1416aeb0ed8cd693d59c8ea56a94a7fd0524ac2c37557add5fe668202bd29f8e4ec9da901a0";
+      sha512 = "9f0df1a9d01e9e9d23bbc119ee43cb107b8741f20cf2cace3d28fbebf91fa79472ffe5e7cd95f0352e03533de1e5f7685a5917686fc0dbf09f747884661318d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/te/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/te/firefox-68.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "5c7e4f680eb3ab0af1d97b6e7c078b6e0b644807ef146db4ced4c622ff3e1895fb4adc5299d7421a51fab955ec68a9fd67dcf67e9a9f858b3974230ff80a189e";
+      sha512 = "140875d2fcdf4476e079b02d593f79b9cf572ffceadae0360cc897898caf04c6c54ed75cdb867fb5f7d29add1b6598edf82c5e4f2e74bc3ab65560c0be7b3c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/th/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/th/firefox-68.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "5c5b39892fd0e0e8973e0cd86d8289a5f22ac80f58e07996874609b66cf9d6e3f2356b2674297e315c13dcc38e18175e3d9ecbac8fba8c5c4f53c50886b20b26";
+      sha512 = "74493d853775c3ba74ab20127a2dfb00d1a9db42499a19053877629682ca325e475acf0f17b36aaf957798dcccab01be56e6ef0884e44ba51ac78f3e177ef50c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/tr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/tr/firefox-68.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "adb3d92e18a68be352f725bfb49799cfe9604ce5327a6538e1c5437d74026b62c361d7a02c2f48c90c303e11717c4a3e85fd3439fc07e820739ff74d609ba716";
+      sha512 = "7879a1d24bf3e4ef3d4cf083f56d3174fcd163107ba487dbdb67067f5d35956ca81b365592b1207783b577c7dbf4c4e95fc8507c5139afc7e1837625dd837a74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/uk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/uk/firefox-68.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4cddc2366848a1b2ed44b25adad32ee8463aa2c92513381cdf8e6b651e91aea69c831b76f8feb65e1a8fb667146f4df5ab96b19d5201ad945b1d9ca1e83af281";
+      sha512 = "462f9c0fa7824049f2a20741c409b43eaf6bdeebf3d93f95ece81c2b61f2db82bbb6b52eb254fcf240384d096c755af679a2cdacab9cd7352b75fc43cc8dc116";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/ur/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/ur/firefox-68.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "5dfcf472fa7e69e4d203ed0c8cb925088128339b8ec93206950f4fd85c1e12137acc9ff9ed38436498fce030ead629103dc3a6c323925a99539dc2c1cb4df19a";
+      sha512 = "aa0aa8a6a7c2d8a39fcfe73cf74bbb4f49a09d423a3a559ebf89c33d2951e54f136fa17eb2ea9ca3a4069c26e4f02ac9b5b75244a096bc32afc8cc850f5ba5d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/uz/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/uz/firefox-68.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "665e5c495839f6c6dd4e6963b99c6c9b26fd8adfc2812e92131b101efcfecc6602d206dec78ce84232fb39fb80e1835bc4e3f9912f1eadd3111ad74196dfa9aa";
+      sha512 = "98b599c8c8394e4727e3bfa1714f643f035b693a7bf9b34b2e8b2adf7494dcf6ac299f876ad100dd7bf6e79c948a2bf1bcf2ae369069d8ade5c24b7970521184";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/vi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/vi/firefox-68.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3df68165b9abf690391839e42fa078f3a20c18e927a74ed77a1e1fcf85eec972b79de1a55de0ccbc4b64ca0cea69ca433361121054db045529c167a6e0d1e7cc";
+      sha512 = "ff0ad802bed47d1326f16b53af2a7ebee563f27300d9d733c6181492770a4ee7bf42e26adb3270c88280286152e04d1ebcd62143ddf8d650a15ee32977c4a76d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/xh/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/xh/firefox-68.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "7d033919912aa4606edac5ac2820e25db4fc30f89432f50238dc7c2cc3f0c0b64835c58c1bf89379056b665a8ee550d61c44e1c9e699f9629eb4ffe3a641cab2";
+      sha512 = "213f8bff2555bd50a9ca93d70baf158e638d480f25fac426919b8de33b8050626310200c6d9d56653775f8ab767314327e907af0532eb41bc07da80b9b9e6668";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/zh-CN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/zh-CN/firefox-68.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "9d8069443213785ac5f15bc3d88e42930fdfb8f03d30efeff0275c8e9b644e8aa3eaae9b8461d436cf7ca4b327b1dfd8448f54e40936bcf8ec0b2050c04efdb6";
+      sha512 = "c4fd8680abf0364af72618a9fd8bd1015bc344b8a154e0f6d862a94eb47333a068827f45b4647e47195f04949b5d87117645f8f53a6536ba75ce0f09f3525bfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-x86_64/zh-TW/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-x86_64/zh-TW/firefox-68.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c3ef4251dac739a1ce58f931fcfcf7495dfb9519b8a555e67dc2c0715f086f9c5282876c492b7be2d4f69ea7032b170d4e7343df6712189151d7fe9f1bb76805";
+      sha512 = "13a00fa5ac56c29b18f01ee1dbe694bc4c1ff3f747416cc407efcd7414580e054f775f8cc434866005b7c99e78bc3efcbdb053440d91226bf429d6e035f121bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ach/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ach/firefox-68.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "cff393d5e8366538242748afca41282ef343a608ef618c49196cebcd96ec9c6042674cdbb11ac9716476c23fc30d807d7ee35346196e47b9c53f7433ea283ba2";
+      sha512 = "8f5ecb1e94e32d8c8e7cde3e6a0953c4f349e006e6e05b6f2c4e037fc4bc10903c9fea83d1c6cb11469b873d8465c41851b6fd62b433efc753d6f6b85cd47e97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/af/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/af/firefox-68.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f2a219218cef294ec8feeb7e909afffb9bf9572ddb575eb560d6456dfdd96fe66a9c81062a4fdb5a648875f2d216aef1497023962bd56944782b5c680add4626";
+      sha512 = "28802d77b1f96ebdad0a1a43d41c781492d06c5da35706134487e9dccd182cc049c4026d250dbfd27d5365d2470d49278fdda1cc2f68d2f58f57280f766b107e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/an/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/an/firefox-68.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "d80d4f81ce244bb279627d8c9e01296cdfd8bf07d730c98b642d6e36f2d79563fcf9b7255d6054423d1b6d6ccd844f8cbf926b3afe86cb1fc836624ff0804938";
+      sha512 = "a156f7ff3e777bd7ba8f8e771c1cd425ee0ee6d87916515725d89ffe467676d39f1a1abfd63d6a909884f9312938666c00b603db45b39faccc829f43778fb674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ar/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ar/firefox-68.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "bf97fea04ee4d205dd8fef325502cd02d3ea39023c783a8403cc9831293faa74cd29ac866b048aee3508f35c52e3fc85f66fdaaea393a2c186e3cb38949eb2e3";
+      sha512 = "d5e0388fcc8875469b52eb08325d7de3c4c4f488e489754985e8fc45505ce74df9445f65b745c13f65c3b30f3e9b33f9b5269ab410377bfb0c990e774689d7a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ast/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ast/firefox-68.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f27f9cf4ae3fa6724763236f0f1ae75c53716ab5f7b897824e4b4a388f58062e526041e94b6e83a0cb33987ee3dc38150b28b44f663ad45914f33124ce9a2429";
+      sha512 = "b1a9b8dbea64039c5c18c1556d2f6945da0015796141ca2ffd5720994afc9249c7a08bd52cec5360474f44c861d04e92fa5cc71c2793b31304c013a9a0b06969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/az/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/az/firefox-68.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "0f29138a236a46f84417e9f201de99bbc0c640287e0467aa36d5f284d81f3dcd3e4210cba7822592fe4a5a9744d58e1ac057901b18f2d4d06088167670a13444";
+      sha512 = "6699ed8513c9716993ac7c735e854bbea06d13947c678bd2da9c0731dfb4078072003fba38ac1d6712659120a02583c6cdd2936397da269676ba9460dad41c2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/be/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/be/firefox-68.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b3b73e6f7e6a5c2246fc3dc64a4df71ceff750de75d7bbae1fc6e2034fc1aafcc7f79597ff2d69e5896b7b9b0fc7e92c579a5830ba79dafbe73de04ab19b7a0d";
+      sha512 = "8d824df67c6ec22687ed264cd1fe26f1613d97b368afcd363dbe23d64becec331d5114596a039cf44fe2b1c86a1da98c6d04f29782d02e4f553c8b78f3eedb65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bg/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bg/firefox-68.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8a03f1fbc96590502e82618b9e16d81b2c6b8e098ebda1ee96ef090a3335c6f8255735a007a77a3512f16230e8b0273dacd361b3701c918fb2c55197ed4e5878";
+      sha512 = "8a5a23926cca8d137449628a173ff82fed9aff46af0ef391b21c8ec7a4d50bef17b75b7e953545e719368a55c6fdebd450b0f2b883a03b4029a7f62b493bc923";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bn/firefox-68.0b9.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "c428c576224bea950f849c89694590ab1e499a549e026f3f5eef6851b1ac7a29a66e7fdcf20146a5a5c68b4bd75e078c51b2fd0e6a1e3ba57d59fc9adceee668";
+      sha512 = "03786e446e13c1d18390096100862d24331fddd61e4ff02cfa1e0054c9af46290e7a2b87a1d0f560d831b115fb2d978e065efa9993297092176126db19e2eaaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/br/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/br/firefox-68.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "2cefcb4316c7760358a2ed63716bedc7524a3001a1ede248d919a6a296adddda0e355692fa0a8b0a1815b5727b26599a0d7224637811e007b69e399639f6e8bb";
+      sha512 = "e3f68503fffa90b0b0624dbd7eab93087aae255c582f98bd0067766086023f0cf942df5e6fcf09bccb08cecac84e0c3bcf27ab348e6aa69fb1322b80f84394c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/bs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/bs/firefox-68.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fd8a88cb4838e9469cf5a228bc3c6c760d26960ce881fdbd4c620afbadf9611ecc48d1654aa0194a01544723b18640dc21692c5e38eef2b8b4a95a6fade68e4d";
+      sha512 = "b0d3f53075b8d54c0f830b856b829e1116b7220b04ba81298066c61ee7fc857563632ccb9868f6c45eb792b1c25a5faf4dcef42168069cc3896bf09aca51c67f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ca/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ca/firefox-68.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d59e5be66eab8a8cf95ef0b66f8cf1243490882f79e405b532a3a02042e92c9e14735afe2556baec706d41d2df3c5a1ca4dd76522f2a7140b594b2594be0ccf6";
+      sha512 = "39f73d2ad0aaea5c73ca030e282ca055709e3b749ac73265edab74267608e05111aea50d83ff30a0755060a5ba89b21df3306af0e30682288ea25c8b6356991c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cak/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cak/firefox-68.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "b0192812d3885d8a5458ac36fddf45e2cd85a647152c18ff3b7b016550559fcdef8be1fb2110f2e264f2f021d7cfc1ecd0578945bc75e6e3df128d24a29836c1";
+      sha512 = "78803a383cd12ab32cb530605e222504b68e3837581ac527e1d4453594716448f5ccbcdd741aadc9a0a136e70e3c558a956a78745e685edf309880d126848e6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cs/firefox-68.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "a826de514833c7994dbad6e06289993ee9a6e573d25d3c7e4f04359682f244cb0280038f9955ab9a4205c02f3ba95d64d5e578f67f181ef50ce3681301244196";
+      sha512 = "c0877f67fdf41455c6987d84817691fb7ef67ae32d98c8ef096d272e687413b0d562a87ada9f681cdb6f191c6f01fa54d2e6ebce85a3eede2f675a74dd64f5f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/cy/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/cy/firefox-68.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2d9f861790e691ddeb48f314fc1a7e19f7f90c2c372c141577e1c53d067050bd92ed1083eaeeafa93e0922589d99eb5ffe5ba9bde0c7bbd8ef7121c6cc983df1";
+      sha512 = "8320876a40f57d49fb0e0febcbd7bee5d1f2cc877365c375aa783d3669d1a644bde2adbaf9884650937191c9fe60ab8026025c1c7b8cca897f51128352e3fb13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/da/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/da/firefox-68.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e5d2fb251ab3ba93ac228f0fc91ee48bd49266a665c0ff2ce418dc2ef6fa5654d4ec02109ed1366cd7bfabb4f83bc2e5d86555ed45349d1d8348b5e405e3d992";
+      sha512 = "ffe6e96998d5eb0850468eb53f139821bf3df063d6b83e6ae9606e1bc0afa51e47442408165264a82445682ee168e0dfbdc898e85e3e0e404cd104f9960731ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/de/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/de/firefox-68.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "cb25084c123f4c5b08edd56ec56b9ed5dd4bfeddd25b806cc598db00bc16d7b53ffb67c1afa070e48ea49b617d6af9e1654140f9e3ec8902e13fb2e9f99f6276";
+      sha512 = "65e02adc49ad706228d1ab9179710c8252e3f0e93377b0576c1d906f3af0fc645501d5af9b9a15633438b3732451dcabebea9bcefc7149032e591bbc1d693945";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/dsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/dsb/firefox-68.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e070237a61737430f5e5ff989fd5ea9fdbd007c37e5de8ebc71984670a08f2edd57d07aa5222b9a7b5a7c3054f19591325b1a933c469eb398e540fd0a4aaa7a5";
+      sha512 = "6249b3a5ea2719e4386f50c69dda91d60197aeb4da961298a6b1ba0fd77f372be7cb190f754e1ebc3d8cbf57cf6088bac555e618e3507d26cbba29483f979661";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/el/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/el/firefox-68.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "16801d2d995d3f69929e94e460bfab21263f0972448a408f4aa49d86a23ea1d791ed71b2c8ba2a40c67bc774c62c0396605c8c9e46d60b016ece5c703746eef5";
+      sha512 = "ac31fe53c0430ef0781394c4f98a6919efb097e26a86150080e6e6ac0f0da699f1fd0f69f7126585b90ce923b96e69e4a094b14cab054118c9d5a9c23340a358";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-CA/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-CA/firefox-68.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "32aef09b428e8f6cd6975d1e693f01e0e32fe397916f93893000d41d76b2c2c3f57b2b4b532db866a125e33ddef98d7e1c112ad093cb41fb2572e764fcc162f9";
+      sha512 = "fea075da36e43f5cc4044ff2e19d4e80d9f421d6db14f6d3bd1dbc467a05eabd3411336da624084505a68c08c76e2014ecbaf418b9f2a7d723ef552b3527786a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-GB/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-GB/firefox-68.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "740c17ff67231ea74a54c25f8314ed072910a7b2f82ab1e93dacbd9f1e2b50145beaae4dd711425ef3249acdd907050500dde4ce18b6f4cafb5a172438cc1ae3";
+      sha512 = "c498128aa2a07637f7fc63ab2fc91a8929c8adf85b05666a3335623c4c92b324397bffb15130a6c4970fbc4bd1b49094c67df244b1d8e3cedcd8385deabd0119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/en-US/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/en-US/firefox-68.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "ab3cddebb79a0719cbd6c67288e41d1c1f053a2f8f0b4513b0f86e1bc2f34f8f4b495c9d799ae34b9328807152972dcb30f5823a0277ec7ca0911526b798a722";
+      sha512 = "82b0d1a5b476df15cf236977ccf996291cc56ed92a3c1df74687e4dbdce5e51dbb9f777396b9b527300def5d1c6dfbcdc887483b37fea8d8712d721b0d2a9262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/eo/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/eo/firefox-68.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "772732e9e7328fa2ab94e2fa8dd4a4ac0e52919ec28d99f48ceed2a4f45b4624101f07a0e3e11d62ca89f77b4c3b560b2c4168f0a07958e4f6dbba3274113250";
+      sha512 = "d991f1de158e2f2a71f3a229d5d40a0cdb49d83e684bd498203c20fe26131ffa3251dbd9612c67fa79cb005ad18008d53bfac93c39a2f31dbfe428b5fc00dfde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-AR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-AR/firefox-68.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4cf16e35ac2a55dbe1228325042030c811573907dc4c715519ea50cba6d5a8399ae44a2cd8a1fb9185f670319c438062b254132c659d929f6c4bf4805d216f0e";
+      sha512 = "4afb13be13cad4bcaba2bf17b5b6ead1019831876669d78976c5456d75d7cb9134b43532bfea610b209f621868f944015915a772f6c37e6eff5c835eec5a8a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-CL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-CL/firefox-68.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "4561335c5d127f1b975810997bb9bfedaca3006c0fc5d2cf8f352eb14fdd1b18b48316c70db7de9d727af19f0c850b49c0b99d09d5af98815ccb98603bca2fd5";
+      sha512 = "fe00d798bae2a9694630505516f89a017566dd91628f3f2e10bd51583e49d61ea530a9ce9ff35afde97fc7b6a4275ba56c56a82d63b826718136bc818346834d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-ES/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-ES/firefox-68.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "2fdb9eb226e1b49c88b75972fa18ed34f6781caa514e77d5d3bf223c8033d7fa28b9c5f17537ce138e0acec2f65627b4016b81f2ff03f28d50d22db039aa1d66";
+      sha512 = "0864878dab5d33b87a2d3741a883618a06bd9d01a28996ec9de43afff9626c8c7567692df6de4e6d4f9b20629a72e9b44fdb68a4c76f1cbcdf124853a7d0068c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/es-MX/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/es-MX/firefox-68.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "e29372e636f5f92a4d2da4fa564c08d4ce6ddac6648bd483bfb73e8c72658c29072ed20ddc3dc601030f82338d3f303adcda2a8f8275635407ee62cc359a29f2";
+      sha512 = "1a6befff49fd7f2c8b597d1b250aa26b1b5df8a42a1151b585f2d061b2c83f259bba8f64351cfb3418db8382bb2e54316cbd7f425e6f944a11f893180a3549f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/et/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/et/firefox-68.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "ab21ccf8c3c87aeec1e5db25df1fc57efaa9a5f5e8894a7d160de930937891551cf1eca40327ea4589c07f99d1448dc459b8b5eca1e19dfdf4177f8a009d27fd";
+      sha512 = "1bebfbc554a5ba09b9cab9a3d38912ba9e3af4509509bb775874517b866afe7f64668adab4294a720f87f94ce85010a37113e9cae8fd39015388852107445ed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/eu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/eu/firefox-68.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "099cf0bb33b02fa37eecf88777cda3dc28569e3db1d1389986f3dd98ead1f88aa9f07f8e3d6439612bdb8d8fa99d9ecacd5ba601e1d11e34f345930ebac2b269";
+      sha512 = "79254e988ef54a873e7c92d206c51bf06c64e3dead09220e298da5a0dc23cc70a32db3e02050445bff8865344ae3b71f6ea5d30d8e5518a39af74bbfaaae6dd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fa/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fa/firefox-68.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "7f75a4ff14d73e50f11eff4e9f51aeadc830643647491e371c79ca5eafcbcb10d19e62c7a4cba2f7dd9ffbeacd433291e52d964effe84000b2ebca867655ae7d";
+      sha512 = "38bff1a4e28df792505aaadbbc2e25cb14d120a271a4f677fb3e949578add7db2dc482e7fc5871571cb7d11dae855e40045bac9cd4ba3892e4411944a0347c07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ff/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ff/firefox-68.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "71644372a1e6221dbf204f7e9c6d6a1039c6a6c36c5729aa61040efdfc2cf195f43f6cdf2b746df7f7160844684f8ff050c50bac3e1da2f374a6fd17960f491f";
+      sha512 = "64c4bbbcfaa0fdbda86f4d787aa6665cf06dcf5886d208b854fc6e11882aed28b49f8dc5b79df384b46890b56065d027e8c7450a07604a63e18f1e28df348e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fi/firefox-68.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4133543c18e24b1228b451e5ee10e5cb18c358ad686d4d71557cd1dcd8832dcf306b84ae93b4532ea44239f9a4eaa7979c759da6a725282aa802bfec38c43fb9";
+      sha512 = "dbf2e460301230b06f3410f447357a43132e68b45d61a1f515bbd0411cbc9e8d8ba8e0f91282d182c50d9be4da1ae472b5168df1782cebcd5ded346adef229ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fr/firefox-68.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "cf341427226f9d61b772a0e6e12188d72ba3a9bb55806b4a0a2428bce2e4532f2e5e80adcb1bfa9a54419e34e2f5e302c2970a044bf90612648065932cab1884";
+      sha512 = "9d99e8320d392c8510a1d54a0d9e51826720b3e5e45bca1fcc1317c7a0f0834e584cfd1f331c32b3c300b17049fc3bdbaad93793cca2f32f9e8b5c4064839301";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/fy-NL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/fy-NL/firefox-68.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "139cdb5341f488151302db265206cac7ddd0de37a4768fbfe90d2f7192916522f89b9481225fe679ea00529b22298a779811423fce3b3b897f2cecfef1ca2dd1";
+      sha512 = "52ee88138f63edea1a35353d9ac5e695c41f142f0f6b0f22911f34666a39320f725455a3174568417c3330281213483dc4ce38ca2cd0676d40a650f02e3396c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ga-IE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ga-IE/firefox-68.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "444b8ec27563da7e29c0210b811e3faeaee0e13b6402abd3644ccd26be991819677ef68f451cc34a4df7d53de19851d958f0daa2cc8e2e5113f46ab1601f06aa";
+      sha512 = "047025fa1dd1e6bdc6c0edd86e6a301ab05c9ccfda9af836000b3a9af89a0a64332e97a896d3a7d459b8ae99491415864872a4c5d570f484613580665c55f84c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gd/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gd/firefox-68.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "b95b84737789706e0d6abb2524c254e29c0bb715c9c93be9bd2834d581536510a0d6ee59c0a3e1f5b85bff269c565d771fd38616860628bb85315523a4af59b1";
+      sha512 = "ebf2e04b8dd8e573bfb8f90963a53935dcaa72fe8474aa3b3b30bbbadbdaa73daae2976f71e84274bcd4f533740469b6d6f1c7c85f939a64bf2b83a7ccaf27dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gl/firefox-68.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "583d8e2636a4cdf6c8ddd8f0bb272eed25d5bcad567e6a237f22f5de7b49911b5b1f70fe8c579aa742b817aade9ce8abd2250c1066e44e8e79b68cb07f571731";
+      sha512 = "34156e0003c8abd5a27f0ceb5f299c4105c0f0c525b149653c0495084dd824371a420362a72973a7ba04dc0519c252946dd67dcbc7b71a916c2d641499fdcb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gn/firefox-68.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1bba75cb9d8744be86198bef44ea281c9c03e7bdf002e98e7a667855ce49e0508f4b602c9536afef6e5a6a0de3f03dfd293996f1fcf772546bb6c531320c3507";
+      sha512 = "fd3b6611ea45039908f487f35674b5141cb1e9bc7e9fdbd4ce30e686cc92680df000515694e349b7c9b790240c16300b1dc7f7cdda186ee89b28d7f5a86ec8cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/gu-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/gu-IN/firefox-68.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "7b9752ccb8e328bcb7203535622964d0234b6fda8192523ff92ad52d0d2e5b7f82fe201532fddbc504731d463b8dd8d5a92d8ba397110efb9585cb46ff3d3c6d";
+      sha512 = "97c1dc9621236a3cda7be4d049bdce0347b57d7f09ade3a0f109e1dc20a9ce230b20f1437bb348080b070261df82480ded0adcf5a7c96fa360b6adf5ed509b75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/he/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/he/firefox-68.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f2e67179b689c93b7304b5aa57570f9c90ee2ef94f4176ec0601a2fe13c4e88defe1acd22077c3297a4f1466042f5e083e86c7e7494368f5c392cdb9882ee178";
+      sha512 = "90404f5545ba91a53acf17b1af10ba4d20d3d6d4f8baa0a54dd0f5ce05ed8be010c5655fc525d3aee51044bd8750524aeec0e5e656c9391b88bd728cf3bb4b81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hi-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hi-IN/firefox-68.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6b674e31a29606884bc671d0499afe7de1f3765bff220321c0b43420aa6fd7a8583cad26d43b2951514c80157d484b831c16c477a6c38ea3d72c32d3483dbce9";
+      sha512 = "de0fa4a0fa7bb21704fca689b525ac5123a4245f34d3c34d55d43a27df8f822a713208499ac7e4152d0cb6ff25be38bf8cf77527bec6b5048434ad7b4546f98d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hr/firefox-68.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "aea53d6f5a8c2c9b33b02f7babe91754157df0f5cafa68a23bd7a45c59f722e7aa8c864c98593dafabe8d1a2ab762596464608d6c9bf84e89bc5aa2c5d82404e";
+      sha512 = "5c0ee0e6f4d109d4b2863cd62f227a59e1fa51bea89274172aaa851a24aa495e7c1b7e0a1b53cf9245e29cc007f87f891f0636f784ce3fc363d018bcc63dfff2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hsb/firefox-68.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f06592b872ad858ab08ab97d17369527ac98b98c1b69ea22514b3f005ef044cf89de15c3414b5d571d66b0a8a7ff25f757d3652b26f436d61df15ecf715a97f4";
+      sha512 = "038dfdf1ea27da2816f953c44a7fa6f9be49aeb9ce5ab6415b26694f690043b319b34db5a2b6a23a96954cc608bb836d975daec498fa2eba3b1a9ef3c1b3e815";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hu/firefox-68.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "991a91ae369d6fe263a9be8183ffd46b903d9e4323c7448705f53a2c5476231f739a48194bfaec6ba0a371982e3fcebd69454ce1e780ca9d862f74fbf70fac27";
+      sha512 = "cfadba2ae2906ec15b9de3e9093501821c93166b4497ea2882d6ce3a119a26a30c13f18b5dadd4374ff4fa60498a92bb8e6e8f9400e0f69cd066a3f61ce3f3c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/hy-AM/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/hy-AM/firefox-68.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8af6470eaaa4dd4f27b80999ddc69b780bb623d53e25d735a7a421a4b103aecd437f124e0edd3f093884103c040b3f5d558eb7a7694fd781bc9449ba305791d6";
+      sha512 = "15de97ac83de3a07dc3d4811b85428c8129bbafb75de3481d0b5cabaa7ded72fa320106bb1fee1d2b340387b28f6f6f382c4472ab8e21a9b4d4a00b2a3f156e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ia/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ia/firefox-68.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a0db5adcc961fa2560110c85b5f1b2007e337fb48fc77a2cfc7d3162196874e7f54726a4b7a73d9a18629e1bf1cd3aa8f9a2b72fa70849fc002919bf2b45f8e1";
+      sha512 = "42a3590cb5c3b170092480cd9279361b63839cdd9a9f31a128f6de554ac90506712ea621854e05b0a522bb3de8fe6f8af68a871c311a0db641cd0fc173e7350a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/id/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/id/firefox-68.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "bcb01c355f5fe696343be7c0feaf6f905e0ea16480479c29933fa1217450231108fad8d4c160b8b2e2ba5ec0f89731dfe490689972c31e9ce6ba7d20b3709f42";
+      sha512 = "eb41b89d97444876e3238a2c1aec2eae8022bcd83aea3bdd8773ed3eb38fc1ebee85013b2f9cbaaeb0a319f9842bc5a1ec534d2d4b9cd3a9145d5767ad7f24bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/is/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/is/firefox-68.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f8f224099f184b9d91958af48b19ec62cbe8112f2f0ae124e814415c072958cfb27b183bcc43a1454563248072f20704215c6b7fcdf13feb05633029120f7d04";
+      sha512 = "99bfd07cfcba4b76c54efc256adb260e102e6c4b62c2b62ec3efa36f5c92b114d7ac95564e97e4fd28d62b5e4921f71e569fda33681265ad7ef7ab0618541d1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/it/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/it/firefox-68.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "1ac2ebb1f30326af7dbfbebb99e1f3032c1fa5527b87235de074e864518b0783a99c5ac25e36581bfe3f6d0af870011948bfd8a0f544c1169dae71c658f2a9ff";
+      sha512 = "117ee557f507ef027a0223dedaf4659ef4381643d99a1a5b9a8a03f91225f470596e2c40fd6a4652965d7dca4e6792f785f77b7aa9e597e9b21590edf03dd523";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ja/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ja/firefox-68.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f816a50425cb56fa452f7a08b966f66215883f328340e7798ee12572171de942d89777fd51f9693101fea63588b4afae39cedacdd24f0896c0c0d65e43392869";
+      sha512 = "fa2b3fcf371ee697f086dcb271c95dd75c4a185936ecfb5f13541710e1a9c0c1abb973fc080468fadaad156b98e03f412ad3515b0820b1f682ca7fe22b95e438";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ka/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ka/firefox-68.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c18a750bd5c798dd4d39adb55d5830cfc9c298cf91060ce599dba1e4faa9c5e8cf33ec80b7880781e9b5f06682c820185aa5ae0509a5e2d5a98ca44b0ce728b4";
+      sha512 = "18f675b9f74e1bb9805ff3dd56bb3b7286ec7e4c1a19e9acddf67588b1de0461d4f145d9796a0cf52e65b1eb6ef2358c8adad8500a155fd1f3416ff9d9db54dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kab/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kab/firefox-68.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "b77c51883302f7b51c3df07ce6972091ed91f7b8da2c7c425bc451120a0576c1283aae82b3501ae366a5a29577205e5e7bd3b43eab2660082283d9b8a25d2e67";
+      sha512 = "fc9f8691785a03911ff0eaecb2c9d87c39a60729c39beaf91dae9d080d9399f385f1f855075834440c24c0820e0c3ba57dffe4a687d30d330cc3d09e4394866c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kk/firefox-68.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "710299d859af8d8b9d377be480c319ef2076b2bfbd15ae03585c4dbd20f04634820b0599beffe97525058605aec4b5e8389e1ad2114430cff4336cdc726f8b91";
+      sha512 = "1ca13da19f4b3e198ad8d6770cd9a6aa4f50e45bf676baae2fd2afc6b9289e5f67b3c0348225f6b949951d9b5ef1499040bdd637c3ead02a1e125526c9fef1dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/km/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/km/firefox-68.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ded26bbce4b0dbdc289bda5d1eb3e6b1360ecde1805c2c2cf50135309d3c860604fa26ff4d08904d3d552ae3f229e9066b056ec000149cc5295dc396ff6c8835";
+      sha512 = "b4c043d8301d2d7667a64253efcc89b88c863c74a84d909ccbdd8cfe82e18f616b006c7e416c7b24d9f61729cbdde0b32d82914b43a21203d6c962236e33d333";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/kn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/kn/firefox-68.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "cbb6e6a1259701d55704b998d8205c18f6672693314a1b664b5e06e517cc9ebbb8d87648319b2006eaf6ac8df7c1b835f36d367ac44f810c5c395e0eb286699b";
+      sha512 = "65f4f50e8a73e880fbe0e92ef9beb710c471d81683eea4e1a257b38e786b56a12ace18ea5b8a7745dac69400ab16dc3ba61801b4167bcfb0b4f3d1ada401d7d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ko/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ko/firefox-68.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2740b64af2209f11d8c881ffda964dd65dee6c3fc6717e7d3f77a5adcdec1d1b80f6316c759e67c1a39cf7b9bfbeee7204980b68aeeb1330aafbe4d64c79dad8";
+      sha512 = "90e7fcd383e9a2d247633f16521cbbe2b4bed2d7c8de1a4ccf38345051f308d79c598706195ca2b94b6f3b4b9ca3658d1aac83811d53ba41db4b32baab529729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lij/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lij/firefox-68.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "79a746eea67827ddf11604b1db446055d99d22129525739984167e4a6dc3b9f185b2b546445ace62f898a908436edd13843203a836c53a4ef6bc4d5eba42a74b";
+      sha512 = "5ce99b8b8f55c7ebf8dd454cf2f6d0a00b18807a4913dda5668f0b0d798d029b7cb7780faef4c3d38c19b453c042bcf47877cb82ece4362c654ecc5d824d9a6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lt/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lt/firefox-68.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f2330520bc35d7b3dd25d6dc3c47a020fb40bf94a68c1ef18f29959cb105f7f25165b23a1be24e2eeaca48d282e0f5f1f825fba82b8ceaf5eb2796e2ffe4e2ad";
+      sha512 = "5b84949b706e16231b5d84a5ffd21b8ac593971be0e40c63beb16ac2ed8a829e2b7be76bd1756b3425154204da3d5234a6a88722c55d76e137ab8def056b608f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/lv/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/lv/firefox-68.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b3434869fb6a048238f8020a4df7675d34551f497e0e8136027a4cb3560f7b11044d05887c0cde73f3aa628747e5f155dab8f65a54191b8f5023392b41f5170f";
+      sha512 = "14044d49d4a1791590413d34f02e4ca8e3c9db31d130e9931c35cdc078d9022d61509ed977664ad7244de9f38eefd43d4dced98c147b9ba6a2a5641d0e20d540";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/mk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/mk/firefox-68.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "9a8d628a77c7a5b1bc59f6ac899428919c458ff8ef31ab4e20535b6f95f51e29cf0bb80f4f4f215e14e0a9a0588d8ff95ef2438b999eb85128192edf785ec020";
+      sha512 = "b5495d71bde507518f8f2019a5319eb60c6403d124c786150dd7634a2b55364ed5c8fe302440769c597a920641f2bb73809c5a2f3935700dd4495154723ca115";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/mr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/mr/firefox-68.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "bf04eab76e98dc38e64ddab2a96159dfbc075099daa32fd30819dcf2a3dec89800daf7851b79b42b68d1e3afa21d897045005c0141825cbeec15b1144b019305";
+      sha512 = "1d1a24a1144b97d585675a4ccf3ab177b3d894ad93d2479882660675f3f5932565f7335805e9ca23bb13b5ab247b7a7cb1fd4fdaeb3e116edf397d40638f198f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ms/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ms/firefox-68.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "8520247dc681e366ec1606cff5f92171ae72923f39f82a7043df894a5d2b12efb4d55bc478ba483608588fc6a85dbd8820f8b98d3eacc3fdf2dd618044eccfaf";
+      sha512 = "d1f3f57a3123db5550026c110457905da78ec6610448492a00277742f6b904b14348d1b64ced9c5e78385a29330507299a9ff05cdd9d20e5e3fdcd55b8c8057f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/my/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/my/firefox-68.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "d16dda4f9ca287cbb63d4b8c3977761c8143253b21bef22a68e55be68f3ae69eb2be5967f1598e684591387cee8d2b82d5cc0e39f8d992122206617089fbac2f";
+      sha512 = "ee8e7f4b0c9e359641c6ac56510238bf25565b0d4a1f4528705f44694dc6723b9cc75c168dca471f9c8b7ac3915ebd7e14c59807f1bb13b21a2c787a203df908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nb-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nb-NO/firefox-68.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "8175e80dc3e9c707fa93d99631bae43c8537e599fb7c650da418eaaa6a783001b33c0c2701168bc035347361464327b2f767fa25fbe2e1c9b8e2fe6ef3dc628a";
+      sha512 = "d8b6627e5c246dae9381f7ea587b5c3760fd860a09deb466951b7cc3f20961f5cf501b36cdb3dd4b07ee1bbead156c5535aa9cb7a7c96114a111eabc06cd540b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ne-NP/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ne-NP/firefox-68.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "7c615df50615e7ef97cc199bc4a2f55d5cbd29054c09cae598c267d039e5d5417ccfab8c84bf38c7767b0ebe089a88029bcfe863d84bfcc05cdb75c410dc0fd3";
+      sha512 = "cdfd0cc204d53987f339318d8a47655714d5d0db906aaa3974071aec18a3c5e531ed4adb78bd73c6798d63fcebabada667a88af02bf7818b065767cc5c911ed4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nl/firefox-68.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a69e665fc6d0c050c3373677d878d1a51d46d3ab9d8247b48b42ebef80abb845fe074968a0f0ca6c063c12c05c4317a296bbcf366866ea00de5ecf6e7ca95aca";
+      sha512 = "1effc06a8ede091cadd2729b93efbdd8758cf1f72f102baa653d5a4f1e69691ea56f5074f41adfc4074ab61b2abc6a293786016b063a1de94342f8bf4ef24921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/nn-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/nn-NO/firefox-68.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c7ea309a51a79928ecc6c01b11021b3f34eac5e65326d7c14547c02e0b832ea03db06b8688d0aa3f2879390de9e1169c0b480a904e5dbe73b9ee30113f3a2daf";
+      sha512 = "e6dc000897f3387c478166c2ab80d65c642864f4828880868d2aa12416f465a5dd1c0df0c92edacc80fd72926409a14a2399304a95d628301c99a9a7885d4370";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/oc/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/oc/firefox-68.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "b7085f9abae25960cc78ed7cff1937306c0619834632e50749c1f1ce98adc837842c765188a5f5fbbe8fc48c6d6ff7e47310b966d7620a5ddc822abcbd2ad74a";
+      sha512 = "1c2e6ae5327491fcdc6e89d1d26f718c5d61be648943a7bd5cedc2b092f5493054b4e084743c98aebf497eb80e7e3c35999f6fe7086963b02d98ef62fa2703b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pa-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pa-IN/firefox-68.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "1062e4d148be93c1f0755bf0eb94a4c4350afb4963cb56000057984a4d130a93bebc3a29609f97705717f0ac2ba7517a0bd4a0c7bdf28126e81d1fc8cc27aa66";
+      sha512 = "f82d815f779c889fdeb79dff22451a593ffd82620d22744b4e011ebe984723efe15e1ed4ce7773b6b078a5db046c4ce8cddc2b108a0e6f474bb6f3be67abed6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pl/firefox-68.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "961f5006a62e6679f8634f6b7b0969dbf6cc3c93cb06dfb409391d44afc61dd4b61bf335c8c8c6fb6779cfa11d4eeb245bf7b3a824a0c530724732c46990005f";
+      sha512 = "6d43bdef7da53b6ff357dec2344fcb05e42344ff5edb736dc923f2daaebf047f26cdcb3eba29991c9a21b9749cd71c3d13c17b5b47e2a0ac1be929d606adca8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pt-BR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pt-BR/firefox-68.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "23d243ed643b1df13d8118ee1adcf592427bbf82224e78253f85071a26e9a15aa53bdd35cd9f162aa68a31b4be0827c6b15da92e375af46ef048c6d14510760d";
+      sha512 = "ce5cec8ac89b8da75a3a303230912a8d12e73315112d95d62a19b341331e168b19e4b8b60d7d13654613d91c761f3be65e7150d64f7dca4daf4ab529dd4c9242";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/pt-PT/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/pt-PT/firefox-68.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "c3cb3dcb61d91a35934345c11210de0fd5a3e270102087f1fe2a6a747644a07035f7d2de42792d6d80576f79574532de9e8fb346efb4bf4d164d04ef66f3e1b4";
+      sha512 = "6e92a191a90d16fc6a643ea373c919476876885a4102af1e1da9abbb46401a690239b1e5ed1a159b22c4d7e9c14de5ae84d12c2851a0eaf7bcdad60cb5707ce0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/rm/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/rm/firefox-68.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "060a965c3a8930e75aa081c80f8523e49db2ad4a3390bd27e484cd531ea2834ff17185d911e31ff9ee8b19900167215622c814865c7abe5b2c1cfeaffa5cf043";
+      sha512 = "863064f8b0b16c7efad8afd6f6aa76a88c62af68e0c55f0840836aba590cb4d90df96653d0171fa6466ce7f0fd1540d8967611739afb620b98c98ff82b8db30f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ro/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ro/firefox-68.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "321da5790250aa284475831730bdb329697a55522c5cf6f98596f5bab853a1b370d2fbb1d65ae0eda8c0b9224fb6c550c5e66d10f503d1a0e5a4684a53c87c95";
+      sha512 = "a362fc1c7766da3cddf2624fe2a04f89e62bb90f3ac8c5b87626919672e947085f47bf46e5511e6b35aaff1f7a42139a4b768ccbfaea6b873e897d5eb332358f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ru/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ru/firefox-68.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "82953c4f75e94dd730781a27ffb9d9aa9d1fd885755cf787d4633a85f23e5c705925dfea813af4612ec02fe492f091ff3178a7eb07de0c0839d82e16b98cbe9b";
+      sha512 = "7b1a51923d647d6eeb4d4438053fde8a1978865f931d2cb200696445631669c046fd345d68f3127dd3c3088cf3583bd1c1a289651b2b69fbf68ccbadb774a00d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/si/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/si/firefox-68.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c8d230e31e339403e43d1a2a7220f819dbfb3c69c685a6d7258761569c8196f4a6eac7071175e703a8f40de806a6da0baa0024e82b46ae69b8af4c1dd518cf65";
+      sha512 = "f7369ff74cc099fcd0e4bd9fca724f61d07a4e32258a1ca4bca4e266b34a11a26c6b5b0dfc9eb71f65b45c8daa164443207bef80beb8772d5b404bb490173e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sk/firefox-68.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "22ac3d135d322b4465fe3ca1c4eb0942c5a5d01d56029ff2af4fa8c17e980febbc7e77232416af4f0f4e2a48497335cbd216643476d54ed9d46949669fb72904";
+      sha512 = "422f410758fc24ae17cea4e303ac703d5f1915c1705ae50897835905ee3bf7ad24470d53adccf4a57650a5767a949e44bc702cc896885de2cf01c654080b2594";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sl/firefox-68.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "481d7dd0c1cdb22f58c9c3977fd5a5de545a3f8ac3f7f9922518240017a3c5f3bb7f81188feb852e6b568a73c1ce5255f85be1bbcaa24ea029b0da6493159714";
+      sha512 = "dfcabc3ad3ebf2c163db32a49e53cf6f159d2cc5ff5e02d18f14c182158dce37df6e9a1ced11400814cfb245f092f94b20c76cace535e0925dc1cdcb43cd2660";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/son/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/son/firefox-68.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "487b991bd263f1cabe88578a5ac45a3deb65debd65ac2447d885867ac8cff29e03001326ad868f7d52b680ad8e754648933be95f80dd61d6165fcd41c5d6cd34";
+      sha512 = "2d838428b729714dbf4a4b669989daac6bebcaaaf176c41ccd570bc05cd9679fdb020d76976d1552a397e141e8df3083a3c695161d1b1038d77eb7143eaa54ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sq/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sq/firefox-68.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d0e33515baac6813a2611aacbbfc2816a3e5b71af593abae158a0b99d8f1d0dcc4036550d94d3a2cbdeb8091cc3d8bec26a6da23cf332386f596149d57a4fde2";
+      sha512 = "4156382920042ced4c8092b98caae66ea49bdc5cc54be03b90731d30c477de1f2a54a9b0880c2ee8c124539aaed449946bc5a6ea474029ae6d6e8b5cdcf32877";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sr/firefox-68.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "dc9bd27f9c93f96789d807429bd250d12b41ad47a15c017f5a5d55ff8ca33b475c71f0c26da090de86f38280c6d7b1a9605e1f8b4aa9a78b1734b250a216ca21";
+      sha512 = "e7baf8c455e35b169f24fbdd618b0aa10b670153297c6e936f30c370ceefd96eae6125ee18d5e83acf36bf36cf00406a4233b94225d0edaad0455e558779ffbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/sv-SE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/sv-SE/firefox-68.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c26df027f8812a9a2e6a0e5b25a24eb0d9f8808d3781e388a7297667f731f1645f847971ae8a672ff5bf14aeeddd05a594c45f4fb404e6ebb89653da1bbe658f";
+      sha512 = "c93cbab8cdb6bdf563a39ea74c62e52bc9d80467f61dfd75af0c54814b93e60b4558b8ab6562fea48b9c2b79c4a01f69e4440057f2b29621e16dd00ae76fec50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ta/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ta/firefox-68.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "f9813a98503ec2d6d8f3552d14d5fb9440629a9f57ab9736790c812c1df959dd8cf1a68d8c1aeae4d397e6cb84b1592fe514e44bf7d563c9805f2502cc75872a";
+      sha512 = "e7165fc511dba6e2d9b1a8e7818902f96902c67493877afb6c10c71c84524258949452d1fbc59287c06ad68a3612de0bd8bf059ab29e7d6e18c2e18c45ee5131";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/te/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/te/firefox-68.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "168b9b80fba410f3b37d8a1d051100951e0e6ad71e319e7b4ccf450c675c2a3a0b23ebb3e01aba1dca6c63f616f165a4e533e33f50f9467c139e17d8c049d9b8";
+      sha512 = "650e7e4deb4e85d3e4f33b428df2d6c7f8e3977bcac38779160ed12847c9385456299167d8546fc2d7803eaf9c10f904b757cbd0fe0b47b3b8334d3fa850a732";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/th/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/th/firefox-68.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0c48881b66a97f1af8225091d6dc771b03f3acfd4aa07b6999cb72f50b8237645697918352a589cffa8b8c41ab1820ceed7129c9317414b20ec0945d84b14f72";
+      sha512 = "a4a5b5bade3781bb5c41f6d3c377103bd3b0968b1af6c240ea266fe57442e8fd55a2dfee99a690b765f3361938db6e1302daf993d0bea3e4f58cd2b8986b2456";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/tr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/tr/firefox-68.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e2ade84f72b6a4ab711de4f12b3310f818dc95598a4c0203ed345419644f4fc4e9cd5bc0e6f835f5718bd3409095c56e97109d85a16fe738fc6ca5cbc14bd658";
+      sha512 = "fe255f3412f31a021a123f3e912e13f5aecdee62c234247039437e6ca8da3e0dc9f98c1a345eb056d4e340932f691de530e126bd2372d7173efd6446a6b1352a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/uk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/uk/firefox-68.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e3d2f7e69f46ed10acd4474d2244c071b28919d5b23a9f582dd674ff0e7d1cc20f274ca1b3b0992c549066c05d632d1655d09ef7dc8d174d135139b0aaf16397";
+      sha512 = "61ef3522bceb7217a300e4dbee82f93c0f97ee37d35ee895f6df598f6d121ca01d31239ee52e5e17995c21fa6143596d0f56cdc96e2f8391ee8cb3fbe9c8ff97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/ur/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/ur/firefox-68.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "b46f2cef7f29915f034a876f1f149f8be0f9fe9e60cdf8b04426d8bb25252176ec543f55f0e8384b3edf540ed1b1255d474ac09812f8f047d427469bc99d67bd";
+      sha512 = "0394f396dcea7d7f542c5dbbe82aec78fe24b3ee45826b3190f0add346b3a4459f9d05c2f1b045565a5697b127325c9f9d829a6f27afcd83521752fe38827764";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/uz/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/uz/firefox-68.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9a4927f0bc45d249763de3a99e228e7e8c39bb037bd4463c1a39c2473850628a70608cb83b1f7ae17ec0deb369b0b6e6e2ddb6ffdcf8499944297662fa02ab95";
+      sha512 = "42795e3a3ff0cf593c930583b2134e835f6f35612e46862ad338eea843bb2a88919222658e7001e3731ef93cfb27919c83d518956e0e0197680a68bbabbebad1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/vi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/vi/firefox-68.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a1401acf245cc253f385be5421731d2eb1a3be8df920ec01cbecef5a3c67164152d7d6d650e3bf8d1bf8cdb738bfd0d4ff29d20d31e83a034f290fe92af5e4eb";
+      sha512 = "2e9264548f9b28c54e66bc0b30d635815758b2600b06a4602b29f529b2de899b7670126171afcd811371e7e3abe240b594261fddaf6914eea63c62a5cd895b14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/xh/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/xh/firefox-68.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "7ce477a17a3b38bba19a9b1e21fde25e15b24deebb91926440486ce3fdbc29fe27591a55af7e2e49f058ab70142a316d84840c833ade2da25195d4972634531e";
+      sha512 = "fd823ec610b4eca17dcf667319156cfa0bd2a3ba2db191511d90cd2104d0324a89158db20221dc17ce2c3a95587bcaf6d746411561512d564145440f334756eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/zh-CN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/zh-CN/firefox-68.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "3eff54e11b6059190ddc3da50636ca91d7a4ff696bebca2c8f4c9dffd26f1912620662408df205795e790bb46e73383b57d855b43619c0a8c54c3f762bb53f15";
+      sha512 = "6ffe27618c7cb4eb1a27cecc9e6639154c93860a43e5d5ae3a21bf5d10fb7a70c4b9c9fab9d24e76b0ed1571a8df7989f920bc22ed828212e8aef5a3e59698a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b8/linux-i686/zh-TW/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b9/linux-i686/zh-TW/firefox-68.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "b73a531817f8f4db397d76ad9efd3611ee9d38f9f7195f454e8937241eaabdb50088b06cf16cb84ee61d411c600034cdbae504566f65b028c059422251dcfe51";
+      sha512 = "baff90dcc58edd1c307686efa41f5f887d741baba18c33f403a7b50d3ca342e4fa796a55da760622d38386c2366f82af77aaecce075ab24caa4e58f24d3dfb3d";
     }
     ];
 }
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index eba98fdc71be..2a730d15f7e3 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "68.0b8";
+  version = "68.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ach/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ach/firefox-68.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "ff63c16100ecafbf2fbdf9769c6035b69a623675e6683b4cddbbbc20016beaf831681b1793b1810c5dea1db1c099e3e04955571dda3aec1ef87a795694572a57";
+      sha512 = "db5f238d7d5a1ac4bfba0617ff884cf3fa26a51dc10af6919e83da642c43a140a586ed17f5f2eedcd3fc01130615589d692a1f977d0833fb37a640588a755d38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/af/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/af/firefox-68.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "849a9dd2e2361616bbd25106f83e180fcaec55885aabd2733810bd0cd7a2f1d3216b62cc5599b733fc75af8ce7c622e4884dfa2531db36d5141870c008901d07";
+      sha512 = "ee733785747c1b1b9057904311a135d40ed27407d5cd5975a3d77aac22f7d2be1fbf98eed60f4ba620ec137c49ba09525cadf7cef75f3445128747250d947b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/an/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/an/firefox-68.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "00c839d16125b38e34e21ab722dd718de0b08c3cf073cb2fc0427aeb2273bc2301b0bdf67d58aa80c5778fd4bd055680a0bae090b4b5ffe7817b66cab24c6f6e";
+      sha512 = "2c0a3a87f6152bec86a1ec30af6f5eec66f1b52efbe4061af0540dd91aa870d90ae2a9551df538dadafa9c8f9b052b86cc65951c78ae8c20a4481bdd3e861c44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ar/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ar/firefox-68.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "69160b1d46328772289b45724641cf0f47f9de4ff756b078a3d35ed942388f61ff47aacbaf6e55dfe101ef8051b2877be21d8ed0622bb3640ff9182abe211b4c";
+      sha512 = "16c3992f184a48b9acce28c4e35ec909591893c51b537ac813a971fc6d3b6989789badbe5071556ed53853235f172b1d9169b12f6eb9441a31c1b5fca3eef4ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ast/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ast/firefox-68.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "96e968c45c43b23e5e759847db4aa633632f35715bbf69f5ad27fe0b42dc3231763c71085ea3b4ec354cfb5e0a872cbf7427b32289b13b57acf21366fc7a0585";
+      sha512 = "02e96d16ec1c1d4a11e032564c325c6e659b4f13be9aa17f66fd360a7fc426b3be68b9edfb65677cf43f1564121148e3546dfe8399e1d73988519034df28c3a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/az/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/az/firefox-68.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "e0424b26ac53d2c7956480000e9f8549c74286fcabe8dbd7876dc240943dec68db3dae1eba1ceb6896696224224ecb83c0bf18b858e1a6ea3dd24d2d635ea4ba";
+      sha512 = "35a7fab791fe53f9cae290ee0ffaa16ca2ba9da813e72913eb53bb5dd062e346bdc774f48060d2d14993054244b04aa84734692c233788828681b231bc928eac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/be/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/be/firefox-68.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fe7ee45e6f5665ee5a39e845fb1d5a60f5b5603f2392174ef75ffe62a763dabc55403b418a0df7a73d6a8a448792f487dbfa2826f82f672c5fd0e2b28f8d28e8";
+      sha512 = "21b2d711201ef1a010abd1aca2809bd7c60c791613cccf926fd9a05b2f0157f10d9a473cdc9cb194570ba7341070e8815120cea70bd32f19837312dd43e23545";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bg/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bg/firefox-68.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "d23a6008594771fd59de10523c36b2603efcae31d3b863e8bcf245757e7ab98d339f5ed9fab15d71482b79d743893a1afd573fd5daa39bc8cbb5086f6074326b";
+      sha512 = "01c2213346568687dba1186f6708935e5ef7e2e8cb29691fcff03ffb6320f8f3b32eaeb71062c8647d23c7ab16fcfdfae0713886cdc4fc5990d0ff07c3572aed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bn/firefox-68.0b9.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "81914daacca3fcce0d42c185ad2c9118e4c97fb8b70aa8f244909c6de81de5a8ef6795bdce1e0a041ce67dc0ba8a3cfda6d2518299b9ccf37cddbf8d53210666";
+      sha512 = "2904a0dfa385b00f21673675c5f7f4b6aaeeca235131c140e76b6a00aa4184b7e1dd23fe8f02d10fcc84f0427c3e431eb0fd7e3e46f11b80a4d91c19485b6202";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/br/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/br/firefox-68.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a5b6179c3ce2e68c973b620611466dfee67ebf73886d0ebe4e2162adf880bcf32b5a8a5c69c93898f34c9481dc789b43d5c0d33b9501d191e972b8d0ae21d6d7";
+      sha512 = "e39a53d3fd5f99e56388e0181a64b6a51a48c40198a251e87a453dc1a217fdcc526612b854b90d7a7dc64f170873001ded95cad51eaaee24a1ef1641799548a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/bs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/bs/firefox-68.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "ba1594ad652fcac36e3474dd16c867e866402e4045ac49dee8a91d3e3dbda674ba1fed97130b5b44916fe940bcd172cfab34bccf116abdf78858116be758516e";
+      sha512 = "59f1529494edc2024fa8cd048296524172766a16030a8412b7b916234e2aa6f7a20ebcbeaf05159d1ed4a1c80b4a4db21483d56a027dc0551a3f2ba5d0e82765";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ca/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ca/firefox-68.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a10172d81c2a634daa440558ec8a7df899b0dad4ed99e713f5138cd8d0009f3d03f36514aa7c9b15ccdedbae08ef0aa1f112357cbb00f45b8bde56c943542d12";
+      sha512 = "7d6610f2b8df17d5e44a4c0225b2f81c1e3802f8f89a7809dfa74d81b11f26d1eccd4c0be666f927cbb53bb50f33b402d752a3da1747c1ca8329eac6fdb9219e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cak/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cak/firefox-68.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "dd970674f6072a1ac30496bb0b6dc69c1985f1d7f9decc11a78b751b6ef9c92d690fbd179356054bc242d9d8d1e36c91d249cbc8be5f02869fdbecc37f4406cc";
+      sha512 = "bff4f337cd2d86f9b6b036898987fe117665ff978a56bc542da489a9caa5898838bed1f81c8e4b6a13759fc296f7cf2adf7732e50a83ccd1c0c5ac8befbcbab3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cs/firefox-68.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "365934e6f656cef8c1f0436f56e14a82a2558e2b606cdd3a655b95f76b7f96821938df332625a6b3787c6ecd94aedd7c747799472517390ee33cab087fb4c53c";
+      sha512 = "fd03dcd4405d3e4e3fbca79632e190e3436a569960c5a18f3996a2c42b0a401f62a345921eefa18bc129d20bd0ce57c14b50476cccf659400084e57afacb1415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/cy/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/cy/firefox-68.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "ff496950abe0701b43c2099ee2d87952c0c54366b468d2d338e4c5d939277e84fd33eca800612f1030525765d60ef026624c02d0b6d48b4ff16d38979718b2bb";
+      sha512 = "939b24e3f6ddec96327dac1da8142b5150ac9fc9e903e702fddc9551fc091abd6efdbc771d7c14038b1506c265592200d8273cf168be17c328058f8f7c3edec0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/da/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/da/firefox-68.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c89525d91dff7cecc0718e087e2cbca52702f34f895abd59ff22c354f4f93dc5cb3cf0c38dc40f39211278342044038adf5310f730e3d41f0f2b864e341b263d";
+      sha512 = "6f823e4874ca55759d693e0cc180f24362b6192ac887d2424743130dbcb824a470594005ab7396386825d290919994aa2e994918da0bd591c26eea8646070883";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/de/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/de/firefox-68.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "c3a76633770cddc3bb0bfeb6fac2b25a70474041875210ba628ad792ccdf48b60d9e5548ff8f75d82a84b0d6faeca185c72f780daa7d6d3942d706c86812aaa9";
+      sha512 = "bc24a3a7d244621d3765131babf0b9d6167885753f83cba10ae76f282900d43c9cf803aecd6df47f5bb55cb33046613210d85a93863e1d40af58db79637276b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/dsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/dsb/firefox-68.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "1315b0b5555c96ec1f9eea7f9a772a888162cd522e7f3cb4f111097ba8aa6615a2256bd977ad44572e8bfe70ca335599bd92b8dd0fb308ba9481ed6d7a0b6b13";
+      sha512 = "eaafdf03c5f5b7d2ee59d0d7bcc859fa1824b44f71251f77cd5b97f3d2e615d4ba113cf7c60cc683df22eed2415b3deda26ebbc04dbbcc52465b732833d75639";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/el/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/el/firefox-68.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "76bec3f9e05e8e953d3e3b393d71456b734b62dbabf658a10c219c928ea414970f7cae19dc3f260383e72a00780c3e369fe5557d5abf1850d360a218c92b238b";
+      sha512 = "0e54b452f7f1cab2b7090decaea668c538e77f2cc501e303ac3df7a26ec28a5136cf449f97666080b2f16a4bd743c59d0cd6e5a74574378d29a78b5460664a0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-CA/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-CA/firefox-68.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "a299b708ab360df0485200a9f126159f037564cbbfa1375b38b84650b0a40db05aab4b807229a0fa3d3805a8a4e448d7d9d2983470eee70013e50859e69e5fd2";
+      sha512 = "484efc6bb1bae9a4f20d0e249e17a5e08cc199410132ab00b0641bc44d92e9ce0dc6438e8f56a6c47d56a828e0721cd54caccec56b5015174902553bb13f1056";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-GB/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-GB/firefox-68.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "250fcba57ec18209c443fde9919b35ad656933c5da5c01f4accc97620a3b32052a2c07bde3c6199e3bcf4915b36ea167066f7b6db487e22aa59936a4b314da0c";
+      sha512 = "1d59ffc544383eb7a8b79909e91abaedd50d141625e51c099eae733ca9281b939f829ddfbb17997342de2dc45bbb3437ae36a30cacda17a7e50b436f87b13997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/en-US/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/en-US/firefox-68.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1c6b49a356bfef7abfe2351b9d02d2cf2e87a154494f93386350e108ddb159d3b24ffb9234b92e1a85662b0bd990672562c31425335c68f6a0361f5622be9e18";
+      sha512 = "f8bcb49e93203ab941e482bcb0bd8fce17dcba4cdf1774d533b73e1ba9fbde67d3c66a7d5b15c6b5542883ff623d87534200c81f2323f856f4204c8e1358c4d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/eo/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/eo/firefox-68.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "cff0693387fa1e4e5067258dccea894c42d13b741a64cb89deb07d91c3f9621e2122cdef79d1e9b7b9ba3c1ebda836c86c0ff3c8d6d5bd8bec881f8b7bb53005";
+      sha512 = "b16062dc5956e63c27148145d4467df17d7c112e503d0ce9612ab55bf7388df0865153dc7a1b21c42bd6a55927a5664fb59f0da1ed1c03593853383e81b4d720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-AR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-AR/firefox-68.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "a89b3e3101c673b0b97fe0509efc77abe653429e8259b15a4e43284c1926ffb60b24e9ecb4286353abd118a519ff1e60c0464796fedbc26f19b1b82c9e6cbd3f";
+      sha512 = "46ff34edcc6e1fabd2cb64bdfa45ca5c4c9bfb090de7cfa214d221e6f5ec856b597b9378ba97e8bb5bda47e0ef922cd9588e3d2d5825164f03973f05ab56552b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-CL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-CL/firefox-68.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f4037e2fab4185860db211ea4d706c9d3508dc45fba5be83c183d65d6c91ead76eab8fd809ec2506d5da8148c7767e3390627ec4b5135f41a1bdd887654b49bd";
+      sha512 = "46cc9ed05d3b060480cd6e0fca646bb68e6e89686b2e78af5f90b29eb6da06461c22cfb1cb0f778e4ff5cac08a0518ebade3ac54ffd1aaa47c020126ad6f75f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-ES/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-ES/firefox-68.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "be93fd5f281bdd030c61756006ad7a49157178da8e071fc26c09ae714940dbce7c08d2522eca8b348215271da6c7b9925e945ece88098d7484a507b91475a323";
+      sha512 = "edfc318aa25d2b9a087276f011e357f71346ca68b80f14d9c98e4b4568f7ef5b78f805f238bef4459100fe57795e0a720b0fb998cd3407626c6404afefa60f60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/es-MX/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/es-MX/firefox-68.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "814a10cb7e72cf23776e130996b8c4961c585a608dd3058520e1c593678e1716d29f3562bfc775d95e1b5bc455c0fb5b5017c437d49690c45ade2b4e9f5bb366";
+      sha512 = "22072bc9af1e603a236be1c71c0dcaa5a00de48d8c176783c01bea8272caabbd8582e3fa7d800626cadf289db1c5bb236faa7e30a1d80d99a23e71e6c11404b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/et/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/et/firefox-68.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ed6b60b4ed2a437cc666f6b13e1c0d453f6bd33387da3f2993a2220959abb64727c73d7be8efeb103d0ccd19139630a4d89ea3903e2eff0f6efe79a17baf6e90";
+      sha512 = "cc93b53b022aab5cedb2013d9cb6d7f00af680f031ef3fc8d812a44788c259ebd3d985eb56605e7f22d5d08106189071cb3a05339b58dbd671cc5ddd396dc34f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/eu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/eu/firefox-68.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c84da347ff4d84c9304344f971eecee0901bcd41ecc6cfcfb836c69cd2e86af308a968144c638d5042647ee6a9e9ecd28e51c3cad15127e5de22976beef5db93";
+      sha512 = "44472ae9b7020bb17427795dfda7b2dbc0bcb941eddacc3f2bafb310629d605e2e8bd531318001b479c3b65b2cf93820185fdd8a3db37533b6150c7c09826054";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fa/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fa/firefox-68.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9a7ffab31b9fde700c7c4e1741b1034c8dd3be3f74397105e6f06ef9e86e90ff5804d2f886b5f14f73cac22aee2b9cc7131e567870a5fdf0778a9cfb01c57142";
+      sha512 = "e86b86c6354774bd6adfd17e4924b4899f0162fa1b342ad03cd2c62c10690bd997862bcee9ec36dd92fbb5899b90061d3d1f835b0ece5b41440c63023b8ab5b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ff/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ff/firefox-68.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "1314945f4ff1ca43f243679446e025536f138dd4d169f8f9d76aa4937591a958fffbf033c85f4136746e644d97e16a23e319f484e35e38497dd079c2e75d5077";
+      sha512 = "a0b42fc8ce253b75e8c899b924464be8297aa62d19a2b1dbc3f4df434065338477a4dd4bdab9f28e4971580c1aa532df73bdb3ef174e8ed9b0a10dbca9cdf10d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fi/firefox-68.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "fbc01d23d9d1c94b9a2f569d98108150e9d9454355485e8c550e50202561cd733425976352d6547067053f748b903d50c3635fe77254c7e55de1b984b5f1b40b";
+      sha512 = "c1e91c73269716cd3f6959006ac0f33f06299a52fac81ce368b28aca26d5d778bb5e3230d4efc00302c3c284d75cfb6b55e4286b14549cb28f19040d04826570";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fr/firefox-68.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "cd777355a323ff6b3b4cff33cee6f4e1b9c5e95a6ca9e5067ff82bd451078557e091d0c6ab11931b7c7d77a4d5aec94fe0c2a1d9d6d457d785583c47125a5fe2";
+      sha512 = "025b33398740b911809109fd6729e8dd3642d089d1cc61407d05cd226f3189454488b0e42ee1b31502b9744a7571ff837c4670c27d9fb1ec34bb7aa0ee75b416";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/fy-NL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/fy-NL/firefox-68.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "28bbb5842bfa005569925bddf0107150b3fcc80a2823128d432be6861844e076ceff4aa7fb6dda2a4c1a2fa1c15e5f828f4febadae24ad4fa784179922af20e0";
+      sha512 = "bc0160b9e09e55ccd5edfb60cafd581292b1612ada9d89490cb8846e31689d6a51b1e086c57c58f322dde2f141a43b52fca7803a146ce48c0f62b6ea81c52b93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ga-IE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ga-IE/firefox-68.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "bc333542ead9d60f5b8a1db14df367f4c026b96ea9f22c151686e8656de50b7feb4a0e866fd10f4e49af7b40f466e7559740f3835adb2a7a1f968d82dab46bd8";
+      sha512 = "3adff1e2e7f9e101e8fd87940f4d9d70084909e9a14331dc1c164c043c446611178024c55e9badcd46a79606bafa6c32889c8897788b63a38c043237011b5cad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gd/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gd/firefox-68.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "62e9bd7b98babea32431c22f112d061c478d8875d2e67ef13fb96edd5a10ccd31ce1679693309cc07f938aa1e2720fef2fb0796ff2ccbd494c18a34d5c9c81a8";
+      sha512 = "f9796ac4fe96d972e7291c8f38ad2bb1c6c2d5fc5487ce1a0bab8ae20c1b8cc20dbcc2fefe385d0fac6cd4221e5c45e99f665c139e7aa467749db9dcacda57c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gl/firefox-68.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9e1d6eebdfa17937dd40e9e7d68d7567c1e11abc3eb4c01200227c53261e0f4fe04e05045cf2ef6c1cc0b53aae3e891dd5f5474710abd906454493369d8f452e";
+      sha512 = "20558c4f00b37615fe8c7173a6f2a92c83274392be00b752103e428dae0308a4a4186787758ba4d8cd1d478ec7004013bc3fdc9a2bc3a5a93f099bf93c2332f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gn/firefox-68.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "509517a8062e1ac34fffc15748bd2a156865db54ce016312c0a48b6ab64c4de53587d0b492a76317ac4684a82f10b31009afb25510a18229067671bc4f0146ac";
+      sha512 = "773a52d07852467c602e17445ea829fca38d63f63aacc44e3dc2e01ca9d9c2f848ce03091479ccbb2ebea26ebd73e0c5ed73dc4a891ac48a607e0f47ac627e70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/gu-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/gu-IN/firefox-68.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "128434552367f0812bdddaccc2a82d7204fb8ff7ebcbe02a370ea12ff12506f3976731fd0dde538275fa0df4b93f06a40ab1eb240af0bb04324224db07be6362";
+      sha512 = "eb2d4ae2461dbb60215b3ffd844b3cd1273047804adaa7d4d3da300dea85ebc53bb167262a63de52ea3078652bbaef24377bfcb40c518002818bb8c7e4f75f5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/he/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/he/firefox-68.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c381247b86404a30d55c4f4e1c6c2273c145fb5115e575340772c152603b70a38956fcab7eed75691a7db1b4f9ef578111349dfa4c9c0e217761ed89f0d670d1";
+      sha512 = "74bd92c476d079c5376e632e95d8a0f53d54f55943c4284a50aeac07e80c1686ea93ac92abd2d8a65b1f67c79f2ff1b36b20f5ae75f3a4807f5654266ad756d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hi-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hi-IN/firefox-68.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "920d587e78890a39432ddd2e711f103d5e89ff9e8b2cac828e9009733893a71cb503eb17877cbec75b981e6f417b37d75dcc246990f2deaa573043fdc3a3a763";
+      sha512 = "220e0c17a67db40dbb7c19a6afca0b32eebd09b6f9f5d7fd4369b553ef529e44edb4f9022a1369d633455dc7aa055a35a3b1bd82626bdc0f83c0ef37100599be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hr/firefox-68.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "822ca98aa3768ca3ef3596b2c4f1a9233d712c049efedb071a99ad9c34b12da80f7dd67529fc60366d44807382d26ad5e167411486053e7b2bb1dffb320df456";
+      sha512 = "f8a08779ee3f4c50e3b5df11298f36bd154188bbe4252795d9937e941e87237953ec5de5e2439b6db422dc53099615763c541acbb1184d50548ee7be52a7466e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hsb/firefox-68.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "2acf5c363c0e61dc69829cd69beceedfd81b9fa63229b24be33886ed27c785eb5965dd87b261c82f295f7d5ac6184b39e2982d42f2736e532b5a132eadf11090";
+      sha512 = "46a48d530accf8b6bbcc093cf753fcc6ce791927fb907418b98401628300b50d27c3abd249afafbda532b51f2b10089b3cde5bd685953e00a0d8a52611e661fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hu/firefox-68.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "4f46c20ff1a01cf6b7df1a2927908f43a7a87c3839e361f76adc451662c6739867f4e16964dbc74e14c08f6334389550aaf6c0a32e831fac45bd3cd1cb161591";
+      sha512 = "2a4ddb106bf909e5369682e8e17f4572db33c6122c47dccf6317d1ae3fadb5eea2305957e67fdf1e21f28bf7b3b5d095ac72aa21922582035bdfe0ac6c2acb19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/hy-AM/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/hy-AM/firefox-68.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "afaebc25966396b2d0ac57e320f1901ea092e721198eb298c38e4c42c97be1317875e197aaf9012eb8cd97f3d1a241cc363fce3b12c7e2721849a664fcc51949";
+      sha512 = "086221f44902ce919a2fcf60f3bd2431cb3d8e1946fe1468d40ff8ebe79aa8b25d5beb3498e5908ca6b1324e4ee7ebdfbd9a2cf6729c79249e668904f56cd12f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ia/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ia/firefox-68.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "bc249e70304046fec5c9602867cb1d78a5a5d71a9f258b96131f110df0d0a69996842d2d853a4173570bfdb67bcf7c42e1e0e2627d013e69d5d022f02e5a1452";
+      sha512 = "c7424bb90f2705bb5a68930ab9bfd351bba45563231a8ebc1e1bb675dc69afce367f37b83450663c92035c3d1ae92c926f688f49ef84c435a6cfcb65346bc9e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/id/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/id/firefox-68.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f753aa4620fdf9cb5127464861ffea932439c91486fc8f538ef12e574e6114cf38ab43f2914959d5e2f0582c6d1b8a5b59af25b884419e6481330fe285ad157d";
+      sha512 = "3211b8e995cd8dc42888ee3c59aee27a338cf5082646dbecdfcdeb210c8faab61660173c03179cba8c790ec9052bcd31dfd0a24028766fca7f687c39355c67a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/is/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/is/firefox-68.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "74324f109786eccfd3d20bcdd8a481de74defaa774936cbc81bf196621a0ad648091deb2a8faea655125af415aea659f7b2d83c798fe5ce74fe1f4a010225ce9";
+      sha512 = "2846bb599fa5b8f4b76a46a1fe8377591e3f68797fff1f3047cd7094797e20f6d9e1783da1f643c360a5998f1b6a89587ebf032136c76329f0924e09ae61f144";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/it/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/it/firefox-68.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6d5f77393a0f4537fcebf495471e75b0ec04bbeb62ca09f5d46244220ca0de9a296688159f3ab255f80251bbda2e3dde2f80e5cf08bb3778d250c49dd7b3ed09";
+      sha512 = "ddf9e99aaff277bc6edcbf09b0eaaf1b3405ca4fbafa063407f9b8ea3bcd9eabb2421a389efa522ccb21589d4c32019cbb78582f9950cb97e742e5bb1a018022";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ja/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ja/firefox-68.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "e50f2542005a2b25196c0ed5b942f06d646aaa61cecf1f6099c3892401a94ea135ccee498abcaddc37be347ae2febe4c67d62f0910b48bf80d06e7bd8d37432d";
+      sha512 = "d6268a582a72f68b42bf91c0ef3066d04bc2963ea60a224ab8f181c790e5f4c16cb5fca68abe6845258b0d2d70a4a4d02279c49240cd394cb41f1daf3627f2d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ka/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ka/firefox-68.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "de6c8becb6c0cfcf6b05a68c501e61805c479a207bad57968faaeeaa6956743625af5bab228fe73516853c5a464e6ca4427b2c2e36067d914e87e556628939dc";
+      sha512 = "f4012c79f6854c34ee94efe6fe85558c1970c8e014e0e04e0c6daa02f2a78b518e9d99c81be9740e8189a5459afe8c7e79fdda9459c1d5e1caf2d31dd2f5bc67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kab/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kab/firefox-68.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d3f49f5bc1b836b8aafeb122c3196acc4e9693c87f389d9b55134cd256168351c5c8e7a2d71ed24fa43ff87d31ff54da4f03af97c3032492992a5f7d75e64b6e";
+      sha512 = "554d03a80d75f9233fd52bf88e93d72af067183fdf143acebfe3b314b67e21f651080e49f9cf9b2a14f5be67d4beaba42499868756170596bfec578e2fdf9a60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kk/firefox-68.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "721d9481808012ad8643b725cd36a762e4a00067a8a2e5bd92c3bccf22b9400d2e5fd1943ed5458169f21ef49ed6727d93f959b8fb5533351e1c953c2a3bbd9a";
+      sha512 = "63561ef457f60000208c03d3c6f154edb02ef698e7857df79585e9fe7542d5ee58ca7199ae1371937b9a8650553cbf5fce34376c6d0032af10f605a998909357";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/km/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/km/firefox-68.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4159f65c57ae9412f48f941bfc855214edeaecbab8e7c4141a0d5059394535917fe57512a1dd8f94bb0c32c01f774a369c02f1e335f4aa0b3c254fa9da9ee137";
+      sha512 = "90e1c270a1b92f01dc1109650c170d1d83b3fbef725e1746711d0e7a1679b1c1d6a3aa1d33094c9f5d4627d52db46007c58a8b869bd84eeafafc6f08d568a128";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/kn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/kn/firefox-68.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "d3daedb1062c858e48e39bf6e8df70614abf5fd485df2ac23c2092a5e85c5a819aad7788411533313c0d3ebf438e307fead02390beafd912fd01644dc9417437";
+      sha512 = "a7d6cbab93f6a6ef7294417109af5504ea3581729f0895736204e04c6ca93f7909a20408e5cd263cb2646ec7f977b280ce478dcab58238d11dda91d6008142ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ko/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ko/firefox-68.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "8bd3b706ba46267bcd70648e66e21a5a19c37663aead73e37351b683dc21c0c2226778bce57d42e9d07ebfefb5f61597e1741cce3850ab04623f610d1a29c2b7";
+      sha512 = "6fabf3aec60b6fafd5295d8374619fe46a4cf36005aba61d3c3b5d3623787aef69b24c825224f6faeb08c813ac5295195677d9aaaae3e2196586672766411e9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lij/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lij/firefox-68.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "ed20ecab095a129ed48bba6b6072dfcb5e2d7723f21d7d09bde9f12ff0508ec9e6ec1d2492d1b7110088e9e92e50bf632016ca8291a2cb431982d7b4e43c483f";
+      sha512 = "965695e7240e65e3261f3aa046234035adedc2d97cd55abc3c919cdb49ae676f76b9c40b4e3671a479b17d9f845b1a116cc6c9b56c29dc21446e5bc6b2ea0f89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lt/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lt/firefox-68.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "e5df4115aad0cebe6d3eda7ce47d646bd34ef9a063a41c86ba475ecaf0e10085dfd0c8f9b6f728ff9138447441d3d7def662e5b130a88137b6d85e8e18c91f95";
+      sha512 = "44d0521e0cb1e4edbcc0385a9d6c26c7593457d42f06c4d8fe7ded8a091ca3dc1d53e0567393d593ed11c2e8e1eb6f399e4c2058e60443a1d69c3e9111afd21e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/lv/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/lv/firefox-68.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "430275b310006ad2b6d89de96e65bd3c98287a0126efe9c8219709fbbe0857ab63f87b9f72ef43aef7040507a4ed0a5c5a407b66c76a23c9f504a98ed0ae29e2";
+      sha512 = "598e803d32acdf34d801ae915af2798e4b8be03a25a61f082a9107e0bfa75ffbf5e3ca2e54906a54f63982ef2faea2297cbb6646a34276424ef5fbe58bca12f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/mk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/mk/firefox-68.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "f74b1a27eef226e88de384c9e399308bee2751bb03e11540119514818af6d9ee6aa65d817fff2d7a5b7d6a4e7c522b9b060731ca2227057b547d58764a127232";
+      sha512 = "25822eefa7562165f58602a2874b3e6f363bdbe4c820b7650cc9e5dd34fa71a6dbda3475d715d2de023d041ecbb856632b4329bcf319d2f2651af32439440c52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/mr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/mr/firefox-68.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "34edebf416a58a811ee53038ae3a8fa66772fbab0cdd226bfdd103ddfcba0fe89f79fb9dcbd1aae2a1743ef728709d9781881f79dec0f082828b1acaf17bd60d";
+      sha512 = "ab4cb396d5a51ac175c97f1a6b436d2c44cc5bf89b622c8aadebaf3d4a4b9b7f9f21e95b8fedf2b8fdde40713de98d4dbb47d083a823e12f10760ca3949d7ced";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ms/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ms/firefox-68.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "4942d69ba9151b2c38bfbea5924bebce1e2e8d8a413e2f4b86376aa66e1b3b677cbe2598e3071a8c9cfa092eb6192f662dc31d788b39cc43a4a1a30fbc17f41f";
+      sha512 = "7ae3fd6ec819e551975455a29cc6e7df94f55096b2a66b63c7a4ff8877af91095c722028afb343c941df5f9d604ee998fca40f00d7cab14a4ceffa408bf69bef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/my/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/my/firefox-68.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "36b0f4560a1f97ed13a8cd3a3d8644b7fbddfd83e43304db3611e219861ca2e1fa005dd3c33ed721d2cd450c61f2c96b21fb09daa72f700e15d8813894194550";
+      sha512 = "55b0f48e93175e12f62769faf44db30a3aabfeac3e8ea2ff6e8b00f83e69cc06e33ebfddbd1da49f1e66a5d044ec7b35f4ea55af15f0e2736214741f09e415ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nb-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nb-NO/firefox-68.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "17fbcde776aa2479855028acce46b77b554b85595861039fde9c928ea689f128063f9e7bd9acdf3f96f9570f83363279517b9e349f71539716cbe5057b935e99";
+      sha512 = "8d227cb41810ae52dd31a99e62604088cadbb6f9377390fec351f7f4d9ac28dfc11996db292cbe45d1ce4ec0a587de84c379c3b9544c88a3c543cbed964eed03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ne-NP/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ne-NP/firefox-68.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "37bfb5acc85bd692da3b9fd11be6319e198ec9adbf9cb2dbcf03dd6c601185a771e4c0b013d5569e82a2a61acff7bb167129199434b5d12344c8e4c52e0393b9";
+      sha512 = "8d9f45a03824583f2305406a083d8ec4360d8fcfe68fcb16fc6f140e33fa990869f68b8ecd1991d8706f654bc95fdad85f4626e19b22603ce4ea136b606b6f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nl/firefox-68.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a2536216eae939d8120cf30065b69c45b29ed593da8d3ecf1effe3c31af0df9965f559a017cbc10bec2b40f2b708c40f7e2bd28249e4e2eef4f30cba4936323d";
+      sha512 = "a3c6932a492e4b92f881d76577cb5ac73403c7f0820326b340c683c50730ea406601c34e662d336464f1f7443916d7c5a635f30df6372f8db310a0baf932cf19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/nn-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/nn-NO/firefox-68.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "071dbde0a083aa911800ab7cb6d6cc3cff4fc941358db3cf47e42f69b4aa003ac70ea3738838591ea4157dfdbaa30cb5c3026ffb97ca1317f8cf6862dbfcf4fc";
+      sha512 = "276c8d5d549d59819ebb1780fe53fba4f4dc8d956c5886cd61f9241f8d03da05481bc4b7aab09bfcacf42090af4b7d39b2b5af873bb3b36cead91c6f1c91dc72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/oc/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/oc/firefox-68.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0d0e3d6279a5f4ab32816943d847cf4fdfb8e93535ded8dbab65ffd3f1a4f6970ed2640e08c346932dcc0cc11dd8dc94d5838e3617ec8c14337dbca344969858";
+      sha512 = "60a99ea7b63bd677f2a496bd1669e597560fafebf425b34e07a91ebb19a612f9e080e2c974615c7595373a7c8cfdc5d329bb2dfa956ae1526859af9db645436a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pa-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pa-IN/firefox-68.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a4502d3443e88b7b77f22bd5aa3785aa992eee49f60f30cb3706bd4d61eced5de328d6f694ba7368920ff001711dfba0b2150425db5ee5f3ec9508876c21c288";
+      sha512 = "80b6a7ab2a9fdfced378eae554dd4b456cc9a9e442efbecf71131ab34089eb5890363e00f41a71444a1810b469fc906b019c0ef2f1df8ccb77ecc2e9d3e3be01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pl/firefox-68.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a7419104bd331b0abc735efa4a0085e59da1809034e6440f43a994f428b78a462d4b4bcfde1e10c3083c485ff1d8089984ead12fdc3c1667f8311178a27c381d";
+      sha512 = "b7cfb9c8a6fe962d5c18adcaef9a9efc772302c64c981df2ddeb78d47b51f435787a82ec48feb7f4195d1ef0dd4c20a2d2150e3b8c982dd34108e2c5a1b6a097";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pt-BR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pt-BR/firefox-68.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5796a6c4a42ac00c9f55ea569124cd8cabd21169043a6988e58cb281df20cfc81eb75175e151e1afcb7bfec2017c958d5d8896e342ade2f7c67467c1c987f149";
+      sha512 = "71379bf8ed2af3aef0c9dd55c124db78551340dd26685beeee9101d5d5b7ef74af96f8137a28a61b72124aa3dfd34967ea241909740286847643f97094bed0dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/pt-PT/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/pt-PT/firefox-68.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ff132f5a5c95005cd4c9a865689e83956c48a40589b83aff28aa0e5ab0b426c5a6c60e5dca83df9e50f1f1248fa5b9193ce9f062e08529a583660aa68ecb07d3";
+      sha512 = "fefe432df9936da24f4a9aee3edf38c2aeaea340fdeaf5abd58fc941f8ba50a3ae5dcc60f4ea7c561c430a707f77a5de1b59b90d247ed77d99857d91cdb365c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/rm/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/rm/firefox-68.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d58c6d925801fc8873c5ea555155823c7987f8b0ee18b375bd5238df8d1a0698888e0d9afe2e3e468bd191dbe8b46c3de0b72bb0eed7ab0701cd63ff335a1ab8";
+      sha512 = "8bc56508a7895be6c3bddec083eabbf99779808c90fb0a7ceeb501f3a1cbc7f05a89b3cff5604222c856b2644ab2839712447b53c6ae2755b315760d072927fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ro/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ro/firefox-68.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "a4737b2f92abc05237cf3ecc03e16d29c760c5894a86b29450f2d0ba10e4b9090053f596e73577981bf220e71f67e0fcbf4a5444f60fcb2b8ba48c1d7992d897";
+      sha512 = "3b3b70093553cbabccb6d2a233a2b828f656434290f3cfbbe0f1fe744e1a7e9e5dbd175e582db437f3b8618aa026552fe393d72fc48936669aff8e8cb7ed11ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ru/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ru/firefox-68.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "91d32d4f64f57551d29e02cda5411f581f0993c7de0d155b756a099dfa14221731b3ef210726e44a9cc1f7f80bcaa3a7e1f6e0a642b7e05add19f9f93039dfcd";
+      sha512 = "2c3275e27fe183ba8f8d5daa3ba30785b55c27161de9c668c10805650bb50d8182c2eef0ed4127a73e852e63dce54442a47ba5421697f8e7c6d798a4d3b7a7c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/si/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/si/firefox-68.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "208eed304cc54029eb14d59ee7c54a65804532cb72ce6fd4966f2cddfca65864b763d66f1836dfd47b9c0d3e23ba49b2d8115704b86feda9407d196680fe03d2";
+      sha512 = "6d988362a5dfd14ab2ee34d11237ccc76619781e1e1db96d9782ef68d61edd6ebf0ad391104deab4342aa4922efd43e2e53fb5b3c284061cb3d23fc30b1988b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sk/firefox-68.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "23be4ec1dbd94b03f24fa5fbc2204b973d52f32cb230b2120c43df65dd8bf9662aa3a476e8fa4da9ed31b47d5ae8c2855d81d34749b5aa8d18c1419687b80693";
+      sha512 = "651c32d2c1897ab4fe57ab8ced5796525c67b234fed8b92be2ba09b18d59aef55b7f257e67c0f0f045fb16eff1a45027c0c4f441b41e151b774fe537b0918249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sl/firefox-68.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7309839990f71f7c755b728e8c488866ef5e8cdee27af4bc5faca6000c38c3a13a1ee11942b4271989e9c29b165c69b8cc1a8dfc4857dc4f969d9d563543261d";
+      sha512 = "84c4dd17696e13fde68615bc877525f00fb3308a432e2f4dbafb145c0ed47e14bb574b149c23b07c34f6962f915d121a3ea0c242f0bf5885a5d262e9309151d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/son/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/son/firefox-68.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "6e330c785817399fd15cba17e0b43b371e3db075a448b587ed352e0b0c24af85b21a268038e6299bf37751765712be72bd7b9a60a561c40fbf9f74eabcbeca6e";
+      sha512 = "2d75b2ff19b2d18e0c1a28d3177d6242ddaf0c73c67f00a3c90630b29da94dd1246f64df2b1969b250a7caf181c1ea15afc8849ef81f4809ec1f63cc3e1dfa6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sq/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sq/firefox-68.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "88b93c67465a704791f0ba140eb377bf9486b830f9cf32c3bb6f560d1a0eee5e214441c6a798fe2eabc0b6e0dd32575473d1b8f21e8b4b480c99b4b326b17c1f";
+      sha512 = "fdd721f489e18f9535b7ba1ef10bb58e73f8f31c4412c2c3bdd728ac38183208942c6e5904282e184e61ab63db9ad87070c08b652b86fa53f8c05f1481d04b00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sr/firefox-68.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "51d9d2290a2bcfdeba0fe583ce03758aa07a42e76d1e62211bd38f804ecb9d6474d90c2b16a28fb8bdb1095c814258651d6da1be74bfe9b4fd47fb7ae5f2f534";
+      sha512 = "3b3b052fd524cb4ad930188f8d670bc5885efdc8728388fb36d058bfceecc5a6f50131d141857d059ce47c2c2e7408a02390bc2339241aadccb990bfcab7cddd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/sv-SE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/sv-SE/firefox-68.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "28e1086315054262ffae75258ab72336dec0f5125d4c34bb7e89e6004daba717173ded1311092cf874456af0392d18246de43ac9ccadc8d9cc125860362bf146";
+      sha512 = "4bba7e0d3357c691c6944b72798ecfdc2c013c487a9631ae08f61a4d9a7dacf8b7737289c74172e1292c2cc640c99c729145584a11e60a4bd467784eca29470d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ta/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ta/firefox-68.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "a1a285889518da1be73223608263da6e563363a25ee1d2a686345a2b2f0f53427a07435bc84e16f2f0dbac2563a9cf9d2852bf2cf7ca6d77ff5904eb8b61ddd1";
+      sha512 = "9ab0faaa47edd57859d1c1c8f7317840853475bf7412f1c3b5941fbea9636f17258fe96ba20851e437db673549251944413f8258d00b142ba180e9610508c4fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/te/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/te/firefox-68.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "cb2aa880e4e8785453b8c91cb012c001209c2913c35978f58bcaba41ce441dde07154fa4e9e9aa838538ad35a9d1612661d12e0b1449c475f04f005e6fecc9af";
+      sha512 = "50d426cbb383675ff3201bba1f66d5af04cc817083fbe49ff6d72514ada42a70eab1d878f5276c5f48dc172f5efec76936717adc192fae92b39786fe17b9dc62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/th/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/th/firefox-68.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9c11ae14bc72d228a39d52fdf9226dcc6fb6d65809b9ad7b6f8a58d296f6d80408d74a468351be134543c3b23f320d0378c20505e16da06762a9592a45c66023";
+      sha512 = "c8396fcb2c551b5e217429166588d4a36917bb3b8afd1bc906e51c32f2e4899f64e74b3ab2504a26419bd5a19781da18a4aaf72e097d809c9cbd3ff4fefa48ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/tr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/tr/firefox-68.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1006cb17b9d025a019086425d37704fc7de287f939678cd0407663b60a62390a0a99d360f8238c9cacf4c878fe526fc2b8cbce166e59a25ec748ac802488a4d2";
+      sha512 = "fe1ea74eb5122a8d83c63ac836beaf0bef8749dcf585e495a6b36232946b6bf8a12a3a0325a545f7e711373e23f35c588686fe8b56538ccd1222033d9e5f2230";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/uk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/uk/firefox-68.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "97c260072e195b930ce4deee18f26165ffcbea43128622ad317c6aa5a372e697ac3992552997a512ff8c03d9f049f3cc235c9b9411494fa627d20dd990c0e1a2";
+      sha512 = "b4fc14e7373b0cecf7e7420bdd9413de6119569e04f9d75788a63fad58ca140ebfb654e6d51bbd57a892c4ce01b812f05c10618b40a69e2605a8583ae43039cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/ur/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/ur/firefox-68.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b6fa9a0d0c048f435c27ac533f30f7b2504dbbfe34abd2feec11e55c5437569af756560eaa34c917931a2f8fdc96a41099020e7c9966c057579757e8cd539d3c";
+      sha512 = "531e81924d4de006d3aa4baadddde428967427c8450985d262c610e6ae403558009d5c4bebec391cde53ba06754ac8399469ea72a81e9e5741126c05ee93cee7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/uz/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/uz/firefox-68.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "5cd6655e2aa14869b9cfb527f02dfabd0720e11ac1977933f24a16f93fcc65846b7c55f83aea74e536368c37358d64826d6ad2a1d00f63c0506d50247dbc3a39";
+      sha512 = "ef91ab0fb00191ec730a571f18d93c6b96b0bcc937d49f14bc673df4768c4bfb5d9fd85eba9c8e92f9311500f6670374121c9c3cd75a71bd811f888bdedc58d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/vi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/vi/firefox-68.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "78ea921b403a996ba573c9c43282061fcf7ba67adc148654e0b441056c39062595d5a659e9945bc4c2cdef4e22c54fbff49521179185d134fbeacaa34b4256dd";
+      sha512 = "55063c288d59681c14d9eedd669aba5df6ab708a9cc5f8ef4744bce82bb9bfcb5b51c0a96ab3cf23fcec93f243795cb66a948bb353b48178f2fbb04a6806fb15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/xh/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/xh/firefox-68.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "131538a2adae871189816a7c14edf6adeca5e89f2b93b88136e88028c878e8347c07314e79702e5fd78de270b86a58a7ef35d7ab54adf259d46b9078c255ac45";
+      sha512 = "ebefd84b19f93e6f54369456b5a61de9a5fc89f1ed00c985669ae7ca0c82d5f1cdaeb9e6c27227b0cd43b7f9933fd1ee77400b5dc4c8d0fc700dcce874aa8338";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/zh-CN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/zh-CN/firefox-68.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e8a63c7b848d8e7623b2623bb7dd03d9c276ca805b81f3fef0fcd29822247862fdba68594cff177121727f2998e4fa9a37f49df061d6be53c85e38c562fa7b4a";
+      sha512 = "91685a080e8d6b694511c49194a4b9a84004796adf883f1c9c684e74ad8c14cff2d10f8352f75646b2b561787750e4913c11a4d0c93eb99dac67a72b32a45d32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-x86_64/zh-TW/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-x86_64/zh-TW/firefox-68.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e5e573a6f3175420adcf57bf7ef80f56a31b5c06eb8e91b6c7ab8242afd18b609d38cb5cdeef074b35f6324d3b247b344a118b518bc15dc59d9cb41a391c829e";
+      sha512 = "3872367f940b2395ac2c24978dc8f5ecef4b29d28ca2ea3af814bc1b5d7e9404565871c8a9d7715a5f09f60f3dc530da8d62b076fb76d4c7f50eedb9fa81df74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ach/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ach/firefox-68.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "2b711b6b5ce89ff2745f2e1c6c6e5995aae481b5cc975c5ad86d86a1e8d62901df8b75f4054d316d1dc6307cc90967399a05f868a285d030dd2ac5331a6d60ac";
+      sha512 = "b346028221ac15ddd6c8e481a99444f1c6b24c3258aeb9c7e5c54048897f9c1d373c0d4ba06cff587e346d0cd37a4513c2547a53f8d51934f20dc5b2a7f3bc38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/af/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/af/firefox-68.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "c0a4a643e83f2b0a2a54bf0ef5b7fcb7d9d2c752eda38697f1a6a4919cc0ed5be75ba90b4a12a3085b6fd64cc0a87d2321e402495ff5f9c633b46db47942c318";
+      sha512 = "a668d8139fa28b955b31d7425d983b4e472a25473b8f1fec1c0979359da1c6cbd19081e8792c10f258443bb2f85c58fc79bbf665c64b4c40c82e5af8c4761fcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/an/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/an/firefox-68.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "5dedebfca34f67400d3237381d461a2516db59495fddb010322cbc5f4411f79b8302d6bdbe8a492f0871b4e656af1555e0fa1a19d1774fd6b244807241923b10";
+      sha512 = "4effb715d7537ab80fbe37121ac6fd04c9792ea2c777c902033722979c36a5a42b09bdb2eb9b2bda469bc23f929d370471d49bdabdd9d53e414c22056ec3217e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ar/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ar/firefox-68.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "44e1a696c71c0aebb29af1be74eb312caa1bc52058692fa16dcb5754c14d360e6c83bd84976479e48ea0f8382ddc2533a6b8af5bb6b456061d8bfe9fb8bd87d5";
+      sha512 = "130d35df6adc4df53802ab30da3cf16128c3ab36bb969fdeddeed2313258e71b703976fa9c9d0f304056d82f72b71d55a74301b878140fb8977759a0ce5df1e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ast/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ast/firefox-68.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "86a6e53859b9fcaf15ad1d382e1063ea288c0c970e30d786384b652fbc314764dd90d9bb6f687ecc37003f27bf1cccbb479b169aa40b8d6dd11d054312f4ce2d";
+      sha512 = "2fb1162e1f5014e7303b5e49f117dbd09bc1d99822d64d1c0bcb0f52c7dc488061673c0036899594b1fbf6f680edf49d327442b84dd15e22af8d962633c27338";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/az/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/az/firefox-68.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "dfad8f84a2336fed6bb7d0dceb1b7a513290abdcc76a62c348bdc1a735696d15223624d99bf08751dcae801b396409f9a3812aee84bc556ac40e51e6e0409aaa";
+      sha512 = "cbf1aad2dd96739c5f5ac4f5fa600f693d9e4c2b85503dab076d9494005c4e4a63df28719e350e74939ab10df620208bc47958076b220dbe994958c33dd3ea60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/be/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/be/firefox-68.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b94911e16bded8e7d6b29a07822523aac3a0d10d92932695f98cecf2cf51d2b0464a4b7bed5a9cfbd91737333a1db9476fa220a392a76ff90004e7171819f7e7";
+      sha512 = "d14321e587d8ae65ed5dc431ab3ad7b2372f81ae7316a91c3a9ac39fa01adb33fd29b2af0097e7a5a1efa6c3a39ea136f5eeaa0a38e7db9e5c9f89a97febe74d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bg/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bg/firefox-68.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "7279348d88197959184366ae247dca0a2edc1bd943bd20f9adf2016028778004e3185a5276972050b93815e12b073a23c9b6094958210aa5622ccf411c2fad17";
+      sha512 = "96bac9ab2c65f192ef006696ccccb07b3b85ce4e9539cc78b610225bee3fef4a685a6e7f5880b3a00523e14f1a4beb783d27ac08622387bfd330034b06766d2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bn/firefox-68.0b9.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "8faadaf97e045338271f70587aa906889bf73d93a690d774f57dd3634fae5a893992728b26b27fb916ad0f0bb7e6a06ff3d66162b6a4d34114181a7c1c4ece50";
+      sha512 = "420d076347c92a86d615bb96a49af9a90b0ae9eb29ae497f915ae0a0d1adea7779f39b431e5d2864b212acb6a69fca764a9e7398becbd29e08807b8449edb8db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/br/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/br/firefox-68.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6a93b4f9b5f0035ae6553113f6484bdbe3d5a0c8bb0b84767093d5cb1cb2c8f984bd8b3534224a0f26c5bcfd0a7fdf11877c416034cafd88c87538fd880128ea";
+      sha512 = "6b6e0708ade7163ac3a2807e341e17f7502d3c11d6aa8f8fb192ffaf9e4e3592052c17be4046b5ed7467ee3699172537782f815e51e6faff6650f20b77d76ac2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/bs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/bs/firefox-68.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c139c25f30fe100427dd134fac3f73f032d3e2d131ef8c355668bbeb04b4398e0ce422c3ff7848cc71f85a98a27f87d692823e97ab22e4dd95dee09386835aac";
+      sha512 = "28b095b4e597f39f5bfc6e66ca4457746abcb31f121024d8da885ecb3e5f9b6beb77e6ead79b87c343ffdf84eda558738a802a22509297f1986e09e1e8d727bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ca/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ca/firefox-68.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "08b568ad832db4b9ca02b98053223403946ec8d14085268082615459a1d0a6c372c8303b361ca3c04e2f73fae60208f3724cec31ec558a49d3edfe16167bd27a";
+      sha512 = "e4d02eadb3be8d2e746684727106c41274d3dfce617dadcd51ab83480dd4c7012e84ef54ca8418c9c334fb736b8fb347f083c6303f99adffc96a62c790e118f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cak/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cak/firefox-68.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "6b36808fa8ea2a55b755bbd3f22d84fcf2bc26c039ab44662bdac2c9a907886bbd5e36f04ba47bc94de82653388aa23cec03af4a6380cb9b3f36ae1ad7e1699b";
+      sha512 = "aeba7936b9d6e1e732f7c653811e7bef25082709638b85a5f5e9a44393b0446925beffd28c6f6844b44ac9d66e4603490666e0c5b0ccfc155a9733401f1c4e56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cs/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cs/firefox-68.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "27985a8a585735a680644d55b3098f3decc4f9125b128300f868d11e2f334bb2eb26ecb387d69dff40240417cd03d528ebdd66c6fd794639e1edf1eed35fbb35";
+      sha512 = "b1fb60eb2526348f86568332979d3a293461a7aa06dadbaefd1c4be4a571f4c863fca4d70b30eccc38930c7d12f2880b522df9c21394406a5d4336298ff5e068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/cy/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/cy/firefox-68.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "43a08ece16f3ec74f72eb5cc2390c21fd9bae91e9d40a3be1ba9f7272b977482b156c7a2fa43a6a62789bae1ceb9fc9aed8ed4a68540f794ab30d15a0cb94407";
+      sha512 = "c8fcb332891b6179287cdcadbb0987c51a582e237bcc6eef5c5914cf09f01d1382d33a96998efc27f55345e7c8fd47efccb27212a8bc49a34ce5b5a7b8dc28ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/da/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/da/firefox-68.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "4ff43c30a3fb198453e4336e8a7ce885255e9cbdd084cf3e7c1d440da3945cd15dc4325492b1f6b99c570d3b6389f4642b69fd2acebce7bc12dfc93dd80a20c1";
+      sha512 = "fa1fa748c496050c46d584c8d0d5fe4dc942545a3ed161d8e1bcf84c8d51a4a664dfaff00f37e570748b83655416839e75023ef53f47af633ed391b92aee7f72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/de/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/de/firefox-68.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c6eae04078c7d1d11cae812f1d7f54fb9cd9bd2ef87fdecfd992b3b6f1cef4ae8a6ec587284fe5d124d7d339090b2e20a74e1bff2806314919d8c60377f41239";
+      sha512 = "ba8c69079539f67719c4a3d43c2bd1773e52a5ea0008a7c0b368feee80df831ae44dd0fbf502861d1140a640cba9472c3a2a96bcc03b0517d39fd4d689af13c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/dsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/dsb/firefox-68.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "091ae1e6cebe4b1e0ed167e73b0bb83b808047c15a7596191fe75c438f8d20fda656fd73a0ad38b0c5c691b453d46671cb772657a0ff517d9afbd682b19971cf";
+      sha512 = "0e3c720c19005706dd9745635efdfea095262e23dbfa11ba1888cbd55c52cbdd140317f516b01a613e47fbf4b61a71c877dc04a5e539114f61bb25d2a217c110";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/el/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/el/firefox-68.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "007f9511f6b8b966ca5c71cdfb0ca3657f69ada31fbd8ff872ef0c520a2336dd127add7eae69bb503e6a6febd17e08e19caa8286f37b2abf8fb9d704f37a5bf2";
+      sha512 = "790f7ae4da8f7b1309045f6ca0af64653de3b92da75e0a79ad5f3c367d848824abaecc15ae93db37e268737abc49b65707d292606df068022d17f20dfe70d997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-CA/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-CA/firefox-68.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ac0930b1b95d7739a059f603b2b87f1192354033176cb5777d1d5411edcd25288830ba711f3fcf5247fd6fb62a4bbd5ff48b790606c4d589b5e41006d86b179b";
+      sha512 = "67a3ee1bdf9ed65911ede4bd8ab6242ae99d9804ff6c66ac3c03dbab8b13c204ff9ac8975bd098814181043dea89d93f793c4bea00bb27a5aee142aab8ee3eec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-GB/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-GB/firefox-68.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0098f9cce57a5b75aaa2a310d3a1bc85aebafaea987423e1b43bc68774fb077d26046c178ccbd7188834887ab9684e03b61b1cab4f6a7f2daae3f9a714bab105";
+      sha512 = "af1211f0899a85e4b154de791532963dd4f0fb58edb275440e9e5486d30bef28b7e05ee8fafd2648ec0c9cf035a8742f08cc89e30e9b28db165cc0f673919161";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/en-US/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/en-US/firefox-68.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "dce6036140680df283bb7183c3e4ddf31abcb124976600857d2c03f9723d6d318efc171308a369000b7a98eaf69f3250f726c0c3f2d22b7e398499948786d3f4";
+      sha512 = "eaf276dd4bba688ca0a746f6f7ab49822d20b0c05a609571a792ec8e25aac58e2bf775ca6e71b6026b1e4c1ab6b08061659a6aca7f378e738aaf82710cbb8e5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/eo/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/eo/firefox-68.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "25c7bc33ed18b9228a22c8c15573ee0823ef1a7d7625c24e85318df559d4345e109b6d4d0ab67531a9e51752799b467c738d549c6917fe8e23d5a50cf616f34e";
+      sha512 = "8b7ee6a0fd33be491f0cec76d54211c2d7ecc1c89b5c0455ebd03c99ba0f0a55e2d0b26c20e1aa29c81e938477d2926aa0ac950b870ba5849a246c1de298b7b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-AR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-AR/firefox-68.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "1a2d2ed25ff5c17944f9590418a4a1937e319522d52865811e23f2aad958ecc0e2a512d580314432f9dca7c6d74724c3e11aec51271d494adb6cb44b3a66ac48";
+      sha512 = "ca06c00af72fe8d7e15ac083f8a4bd8ced21a037fd9a19f07a4f8348c603f586ae13530527f931da092788057b0257ab6930aa8afa933f7bd0c3fd5e2630e30c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-CL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-CL/firefox-68.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b8ca9bc9aea1bbdb1f7201471b17349fa4c1e4853e3f04ad8e5a69f5110571061d57829606bc2b8a4fedbd6cc7be0067801b6d4b6ab10c3c786be7fccc4b6bc8";
+      sha512 = "c9e2fd5824a995c15c6152b7bfc79388aa5d96c3e9a6ef7fa149c6be05f903c19c48d1798976cac67f55ed68a685059d3f2c375c7a57a4939682b497523c5a9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-ES/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-ES/firefox-68.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "a9d03a7e247fe20f71232556a6723e022e4f1138fa6080fdf1dd3d13f37657ee4f29c9d745817e83e4805fadcdf54d6d6a9c5813280a0c9b2e8411758e9c277f";
+      sha512 = "496bb635cb0ffd791dfac62af654119132be1fcf9a023c175080b3e7934af330e4caba8eb0f5c0f4d1d8f991010ff9b3c3ce283a219e77f2801d068d05f5555e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/es-MX/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/es-MX/firefox-68.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b39e7a187b840424d4e2771592171a4cdc9d79f7875350956e238919e1d118deac2d56c91c892b443cf987f9529fe10b6d9e1192416098f31d902cecb96dbf7c";
+      sha512 = "5018d4db4fce9c49cb8989de5a1e7036c33c4ba6b2d7fc1164e88076d70e19e2232637e08d5c59fb5a545e1826a15fe9055986be9f9a91fc2aca8fd79fbf4936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/et/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/et/firefox-68.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "80be85d4ab79260310e7df9d98b76bbec141f59797dab18201119353cf10131f8a018abe96261c6c4bcdba9b24bb399245b53dd3962ad3894d2bf74efb94f296";
+      sha512 = "10769b04432c45265f0105fb5c49403b0244266e82b8e61a08f4dc1b5db41313f5f917767e5bd3e97f735a727cd5149af5b0d2fc7d9cfb589171a2ef12e01787";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/eu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/eu/firefox-68.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "cd76fc9998f3e079f7cce051ae4dee47bf638f838c6702693744bc12a3b5cf35f34b0d824a811a65ac663a7657eba10389d964761e8d2e45a0f0c4c7628af61a";
+      sha512 = "60ea0f4f227257a40190b4757de5030255384ff0fa2b29adeb7bab4c6747a204f07bad5889645e317f359150b7ceeedc56ef6f6a024ff0245c042c7c35e157a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fa/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fa/firefox-68.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "2fa56fcdc5373d266bd730cb37f236a14981d32375213cebb129c3ee36bbad1ea012865dda9bc21cb94ddd3bbdddbbd79951c254157ad4edf349b6d8361f1f1d";
+      sha512 = "1a2d8abd4567cde78f986b395f5a7d6965a8ff89c61795d648cc81ec4fb83af3b146f0b418c021b2ae3ac2018b48fde53910efc41ab32e2e2a43294e2f9b8e4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ff/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ff/firefox-68.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "bab20eefeb6fb55fe311bd524055b13e61418b2f59985c79625e69106f628defdac18f14ab7be2e4c5c9ac7533c8f372cb34922d9400dbdff74ea673506deebb";
+      sha512 = "98666eb854247ce8e93dc0a5bc4a7267699069e5c3338e6234682efb7649bec6fd03f6b61ab61741df6c49483727621cc6c795f2b15fa5a1c3d4dc1130e3b51d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fi/firefox-68.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e536ffc2a338c35d5b9f4c9888e958c16297610dc025219297c3d19ce975fdfedfb30c0f42604c74955c8e38fd17d8506170ad9c7b8b2b5996668c8798134b02";
+      sha512 = "3e0cb2f20e565d27de9859775b42375268d68b514ded4946bac62946c823f500bde6ebde982d16b4768193072a15cf00b2bd48055bbadd963577e40d9cd656c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fr/firefox-68.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "99798ae3a69141cc83a229b2799c16a63d86e0cf75835cae565ef920376903d9eef5eaa6774af7a3a9528508ffee8682624831928ffe93f9394d17de8db58e67";
+      sha512 = "51a26f0dd7837a3d2ae5a1cacc051d6462fb309192a46eb4b640df9d3da87edfe284d3adef07da3a176d83fc911dc1b929d6401db874ac3c12e26616f66f926d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/fy-NL/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/fy-NL/firefox-68.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "340692d3f43af99570e3ecdab466582fa7e61a8bc20a3775496435703559411653028c20a10b8d828865d55b5a064fff59a6adb0a84b7b11c67b3169097d1858";
+      sha512 = "564d2df685c3bd844c2670c2302d36c52e1da1bc2b7719e2caf8d7585fc353f0935b8f11b788a4a11d58fb27888264f5c6876ff208b5766c53ec5f7966a8b049";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ga-IE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ga-IE/firefox-68.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e345e3d9e83b1b19578e7bc80f2f1d0f344e46891f3dcfa60f27c4d6825a19b60ad944f5f216e9e86c6755c0dd6315f42952bca7ec0f7d8bef088eaa53fe260d";
+      sha512 = "c93de8369a8b26900399b061c767abd778a3a5a3370538bcf4d963441f4e634e025dee8cf600c5e8d5479a2ef559e349df23fea9a7ae8bbc6f122471f73dc705";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gd/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gd/firefox-68.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a60a2c572172b4e04e58a0b793c25c769680cf1c8818ef0f5713dad0675c7079415a8acb7c85b32c823b0960d1df4522fecff010639a66976a5a81f7974c35dd";
+      sha512 = "97b03b7ad935378f2b62bcdab70506f210864e9377001573049c956b41afea144c97368a623f2a97d04d1e0f2bae7b740efbcabffa414829d4eedb2a7891ca29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gl/firefox-68.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c2c46b34a84adc003e5c5deaf816d5a5e6973b432df4a69996c101cc863ffc1a63c2a4a23a60ef544d058cea74e7ab0573e2f0e76bcc9c9610f5df0d4f6ab294";
+      sha512 = "6235a54d1122ab01a10c7dc69b4f90c73aab3bac94bb6fa82f9e6f7b5039575eaf53a070037829477659fe6a925c502422c237c2a7e18a6742ed0f0c8ce060f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gn/firefox-68.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "175eac6c0792ffbf736bcfe112c890b04734add245aa7f391107909ce3bc347b9a4a417b5fd4cd60765793a5664b43fcab2c15ed72dc59569b0b0107209d5932";
+      sha512 = "47cc8d7bdc2c00841cd883f95f78fbc07024a7166155dc8bd950f628ba0d6cd62e0bd396b013c5efabedbd760b98e04b37a0bf5b03e305b52d3c0697ade22c81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/gu-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/gu-IN/firefox-68.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "2d7259284851aa51cfe348a379c694e219de6c49e240ab45283ed533cf833ddeb62c4d74740e282d55c99eaa5f06f260c11742ca2389938c52c01f62bec4edd3";
+      sha512 = "d4cb4fc311251f7acfcf8bb1a2dd8c03e8f58833eb63356ad09d40458c934b7a73fd8729549dca390752bc6625c1dabcecb4d7b9141b22722a1a4848f723ac4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/he/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/he/firefox-68.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "88f0f8f7ce8bb0184aa7ff3aa7a957a5726ed625ad5942f18de1c869798d70bc6f675e18dac43be4393b8f0b4cd40053f3bd461f727f14e7150b687798be11f1";
+      sha512 = "e7c4b7da0d7cb9c7e81a6fe5d67e597e062c0f996c26e4bf7a8d5e388e7445403ee4c7811b32d47df09ef6ae30e71b58fc92459c88324b68e30986399f3d779b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hi-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hi-IN/firefox-68.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "31f7b54c47f267a45b718eccf03f7eee5c5d11ae2652616a75851aaad7425db60593ff957166d02d6b65858831d7e60a8124c126aef5fe10db2940ab3a686173";
+      sha512 = "a9fc890f1ba8fc0259839d38ff6ce5676495a6d234a362bcb30134126278a70bff8e6767bcc7fca42ecdb5287dbd3d8ac2a014576c88768b95e0a0c99a33c97b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hr/firefox-68.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "646aac6037ddbc23945b970598f828f88a90dc2db5165432617e20b8a3fe86d810c11213c2a8333d7ac5e0780f7767c0b1132c4b362060142249bec7779db065";
+      sha512 = "e9f272954ec189dcca6ba38869fe94ef1fd45d745f365902c9131024dba39eca716222ab13855c6ccc7bf0e34d285c6a07334c8c892143a84b128e90781080cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hsb/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hsb/firefox-68.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "724267d1b3dc0e190cabca2296b58f5eb34c56b090f40f6d61f0c08b050b16422677b6b2352186376ad905bbd0091d4b6d0b4a7b683951b36b32603b79568a81";
+      sha512 = "d4c880db76d41a3b40780183f7f44ec95115baf4fa036d33cd3510c844efc1e6c1d20c5063acb187f7d4ff522b4a7dba0de4161662f6ca231f9b915b981e51b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hu/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hu/firefox-68.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "55ef318be0a045090d0f54d3a6f90604853b31774b260d71b46f4df399e84ae60728cb645db737de01ba36dd61dd1d847136b10f58d7db019c307ec4b8c8aa6e";
+      sha512 = "d481a160791ebffb6f8cdcf68cb0df36bbb6b7af7ccae40dd4775006960fc4f12b05a175cb2455398b240778ad123caddebc61f05a5f0abb517c5c851bb699b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/hy-AM/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/hy-AM/firefox-68.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4f3913aad6c3d9c492a0395f7bea6900f4d6c14b7c3bd5a91d310b760e8fda3792f0b428783130d42395c0e29c2553a76619a66c01c8e16ec09376343cf72193";
+      sha512 = "92b915e5a5b2ee6f9e363a32baa56dc9e195d2eb7446ab6d23a78b37edee15d395987d44849ede776c2923badb1c841da90c928967a5468ed150b0e55da5f6c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ia/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ia/firefox-68.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "d08c7e7b80a4380fcf62fd0250c418bf50fe3198186298632e62c17d1b22c9f09d791d082bd83d6baed1e9d9c30133f937af9dea95d88f5fafec68f1359aa620";
+      sha512 = "5ee0eb2d176ca6265828f764771afbe98b1e053f87298685ec1bb88ac682158b7f2a410e04325d55c7b6b38b01ed47744ea92171c2cfbd98af92305a28f2808d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/id/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/id/firefox-68.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6b0835d9c4fd7e5bf921cfc00b1606b48400013c63e14139753b6d82586b40afd355b44208c72e3adb9612b968cfb86077a25a646ecb913535c94357a55594f3";
+      sha512 = "4f5620a21e478d032896648cb536b396dee06d904d7246098307c48a033d5b4c193a2782763370dd30b09f90b5685e0ea85be432fda18bd322c9458cb0bdf922";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/is/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/is/firefox-68.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "296eac1f437705ce38eaa57cbcbd8c1afb610fcfb531f593716515aa7f2846d12b44f63c7e23f58b87167b5a370579778bf4190343366428f153a155b83253c0";
+      sha512 = "8186e48da90aff0e2ed56f60d01119742961d6493027c113245787ffa0b81f0161134bba5a30324b018497841d0a1b254c9c1d9a126e7aa76faea4054b3e6348";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/it/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/it/firefox-68.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "6cb1cc869bb5c97d6638456bd06a6d691ba2f162ce378aa83718447311d41ab9e836244c10a425247050ed2065fa9c5ab8e7ef5077a937b663a0148b24849570";
+      sha512 = "9dadffe99d5289bc36bf48ca9dab78953edae7db790309623f405abf637908d67b3328ceec3b6efc27a40e5e595a79638e5185eeb25f0a8d6dd524e456666e10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ja/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ja/firefox-68.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "7e1087d2dd5636757abdeda54060499f82a245a26d6d40a01537535dff9f77ffbd717d063c812b651e8a0375984c184f6bc0e38fdc4fe33de8708c2a479f9035";
+      sha512 = "28548e6b1155b2d7e2158c0d81fdf2797591805c03662b1d5febb09e45f78970ce7e6d47fb2f07891cb8ac40daf70d7b1f29f518f1522e147d3806ee8195c4f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ka/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ka/firefox-68.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "4e61c168ed9e007723091f98798e22539b1dbc56a82f7dfe4e85432c5bf80bcb3651bd458d1344b9ab2c7bb5dce455e03d1db339bff137bf1800d7c5a6c3d30c";
+      sha512 = "9b64c9a31726fd62a9e17350e3224f38ba568eb454f5b5dbce5a0f67beef88c2a459da6161236c0156500cac41155481bd616ebf38fe53cc09cc8b20b5a251d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kab/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kab/firefox-68.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6563fb01a81fb482fc1c9d67540d2b11fda4fa51dc8a5b270ea366816c02d0d12731c83eea66f61b2d22744dea0236f92bb6f4847b9bef3a0fe6cd6aa7fb4cda";
+      sha512 = "db124ff80ba2d0c778f0c67e52d3b1e9b1d8b5aadc54e75d3205946db0eedebf3771ab6dc27b053ff3a2f750aaacf4c7d53ec32825e974caa54194a30ba519e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kk/firefox-68.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "b769702b4f92556a74153083f9ce665f0ff7f908d2d04832225afd10da00540928ff7327b4d506ff156695a6ec31589d063e207e3c45929a4c4baa2d57ea1f3c";
+      sha512 = "e4cd0621a5b4dcba456611d3ac9dff2003085f1d4d5d772deb2b3a6260a84beced5cc313685223f60fe7107eb4d56b1a4c782fd89b0876e4959811b088971664";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/km/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/km/firefox-68.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "580eda69d605453fa338faa9b1ca1ccedc618ad2930d6c314d639eb2508988eafeaf96d85c72b1aed63790bb20620a743f63373f06af26d30c30ab4d77f48f9f";
+      sha512 = "422a6c5d4336eb5b45d812e2acf29d4c2dd75272cf5facb45e3f818e3e2e0da6f3b2da98d54bde2325cb2c89adfe64b51e114373c35c279a363d9bd183215418";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/kn/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/kn/firefox-68.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "50f3293a1de3647cac090c06ae81547d66eb97007e8a309edc4e2842fd7c87c35df51faa1d2548c37659cc6c25b15b301cc8cb9c700db124d71e4c85c5b6f093";
+      sha512 = "44987d4be46a7739c6ef1997005aef8de36a959f463adb6fb11e433e9c111409b27f5bcbcf8cc61978b9c972fed1d0980fdcb965b670590a3dd18ed6a60de2f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ko/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ko/firefox-68.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e6df7c7560b22b2dc0ea90e182ac8acc1a1784dad8d74be9ed714851fc09bbc3d341986e5554b0e1452bac366694ef470bf9d30a30c1c786c0115de368592d55";
+      sha512 = "9b5701a219df7910b7dbdb82da3f24e1756a5f2990a8693a7d93eb2c91c7fbcff7c69595342b6a804545a37f484a53ed73bb169c1d209a74e860d8793ab669b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lij/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lij/firefox-68.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2858e86e576978c152faa227e25c5b958f3ec580619550bddd8c709ad19485c63aa66f9da9046a7239e78292426ec7bdecf4e9d984228ae9dfb447a3ee2bf182";
+      sha512 = "fd0d9968312bea9bcb6b60c3e708ac93f628f1bb2eefc21d431b2e3243f232d4ba9af9fb99283975156776b0caae1fc85b7b03d7f1a9007b8246a4e572d97c61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lt/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lt/firefox-68.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "1951d8092cc71eedbc00b0597affa948b39ce9ac3fa97c9f4880fe048a2c097f35c428241fb90cfbd73d7b6329651a80bd2587696884ab04e62b8c9b5e72f779";
+      sha512 = "c87aa987c3f2062b5c8ef4db4de6677f6ddc154080e32bee6f634055c8e3943262def05a67270fc5c787bc20caa9cbdda700eec50d753f1c45b074941da83754";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/lv/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/lv/firefox-68.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "a1b62f8a1a055261f2e8e96f792e502ebb489c8886f32db0040602fc7c717be0da7059f43a7e45e4c4c1f6f61d99cd9629220284478acfdec26e10d3c1ce4502";
+      sha512 = "36fd90f4e8bc5d8514858e1ecd9a9c19a3a6e873440ffd684b6c667cd7585c146762149eefa48550e1eb91a1536434124f7799cbf517aada3d2ec133cd3fe1a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/mk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/mk/firefox-68.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "70b66096a46724426b52149b0980200e249457f4b05d2255a166a75583a5a998e4139b24c5b1aa1cf3fcab01f2333cc1f24b439e1b76b6927e54d467c69a04e2";
+      sha512 = "5c79d0f190c81062a4c4b3c154d9d3bba4064de0e1ad27bf45a5a917e4918947f970e13d6219cce854e7165aa23142d71177b5513d51b73b2f8efe352593dd04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/mr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/mr/firefox-68.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "ec8ed2e15d52d1e092e3630f7793331a6e9ca1c3a76aa8295b1b31cf80d7787e4f79f394f837953c5707d478635de23111c8053e8731f8112107d6eeadda2a67";
+      sha512 = "60b1b6d2840d4c75efabfd2c052ec6f2aa90156f2a74bb84cff2cd40cd9f03b2f2041106b0835f1ff2df47afe5dedbf099adb8e47820fa0cf7d08593cd7628b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ms/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ms/firefox-68.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "7c3fad5b34054d3ad0b8084fa7fb9a03cff06caf3aed122276d3dfad73604476632fc23ba045246adb0e4aecc42299d979c413a16ccf7d52d44dc7085ce5bf67";
+      sha512 = "9ac8130b352097e0be19638b45eb47dc2023c097e444e67dfee1024d1579454a2810e4d75d138eec49537d661107c823bfb6f004d7a90ab8a8521e35c720ec0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/my/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/my/firefox-68.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "07c070638621a24a7a13ecabb2f8cd3bdfb406fcf24cc2170903796ced232cdf1beefe30c579c0a539832ec195bf359bc949c5c7a3e30facf27df6a2c65418ec";
+      sha512 = "3e8fa65b9d4c134930727c55556664a5854ad3eb3a3c2cab6ab2a8f26f39c62b91f30e467d34f4095971b4009496174a824ba613d96cac662009aa6fa81f94d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nb-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nb-NO/firefox-68.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "19cbcfed325cc77a750821a49a1dace4b8f0c2cdd4e310492ad28769c39e611b2ab4fc15fe8761e247eed6914c53dabb411f4cc98312c8b25dda6bad640ac6e2";
+      sha512 = "02b6636e31ba7d06b27526595d7b986b5a60b4b4169afa34efbbb38c94df1a8a3780b226d29c089e3027e04eb91bb48c93bbd7b2cafecc01682d212ab683d6de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ne-NP/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ne-NP/firefox-68.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "d86e478fd92db3505e910c92c206175b2e302fd0caf37bd115679293238281001dd40045c4f77168b422c2e6471e4698b890a9b9e1f758902647294c5d2b7b14";
+      sha512 = "33f85f25d3bf058b01d2a49133564fc810812a5c2135ea4ce34edf6bfa5af2613a1dfff4eab596f141089eb66578ef1f99f1b0c9fc583b52321116ff4829461b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nl/firefox-68.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "037a0d8617ee9c2da844631f51a795e4ff50d46c2fbbd49118f59bc184675346b24a12ddd2ab15847b83f47f2143af0353dd6b3a29f3ea4c902f43709d597499";
+      sha512 = "cecbb821a21b9ff56a4e11f5cec2087453a9eb4deacfb5bee4cf540a7ca85686de0226b62dec1b265cf3ec573de7f92e4d59d67e767900c677f9ca4dbc9d4e12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/nn-NO/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/nn-NO/firefox-68.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "383c8d154c3fb8cc527a35a19585429dd40de54a7e9f698d7553404b80596a385bd40545e3d112ad7733e77a385634e324d6718fe15322de493ab63e12ca508e";
+      sha512 = "efdd84a637987aff5651986eb3cc1976529abdceee1933b70db19c5b3e56d058b1a906f88ecc7f85f208f1836850b448484fe0b5e468fb761af0fb537e5eade0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/oc/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/oc/firefox-68.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "4d297dc21ee1a135197898277955bf86f71991a0c9db7b5a6bf3cb0b24fdd1aedb36a1ae5ee7d1ca54a60f6806d624240d6dc3e7ae24f5b9b39b8088df349fda";
+      sha512 = "f4c1363bddcaa6d6438a9c7d6bb137227b820e9d03f8d059203912e32e3352a46658c7b4dd696f3824e04f223f59498fe2aa3cdcfb2621492eea561e254b0a02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pa-IN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pa-IN/firefox-68.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "749b36ad6fff90cab9c23d62e2b7ce0308633edf1de17f5ca15e6e5498e888bdf8e1dda1f5880c5b240ec6c3b2ceca0428207f855448c8f0f8e15d6b9fc5ce95";
+      sha512 = "fe0f1fa4d88f2ab21dcdcc6b7f56802f65cdfd3db71687a81534844869415718d1d9ca020b758d8798e47f65e8bf155433708484578d823aced2c47d1558928b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pl/firefox-68.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "77a01376bdab00c60998a298c026acbac1a87c07e435954af88f2786cff6f9397f0f6f178174ae76ea23d883562935f8acffbb760fa12d8ad2a6e7242efc8cff";
+      sha512 = "4a141e19c5bc8c68cd0b1727f66227719f14c7fe9e5e0a4b27d661dbe4baf2e7c0578aa3655d04cad998e5c306268f8705f6521ec45f59258c1b0c4e9a3f1cda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pt-BR/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pt-BR/firefox-68.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "97079cef05cba0959c8c542d55e874369306f7c09e6133f2f2eafb055b9b7aaa508bdf365fcab471520e78fcbcaae2c74ed1f64647709327023bb5e6692eb72d";
+      sha512 = "6393cef6cd3d6464c81c731d55c23c79630d19662fe8686514699d94fac6ab77c442aa6ed8ef6a8209ad3a29ac9fc344ad00f67d47531042d46d19e701be2c6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/pt-PT/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/pt-PT/firefox-68.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "de3599a2b952eb231229cbc443b95c6ff2fb4dece88066298b6cbc6a34198abec21055e43ea06390c57f099c6bc1ee8d2ebfa86ea891e94923f683300dd98bd2";
+      sha512 = "35180241a44d245ea1af0cdd67ac6ed839e582ff9fda594ba43afb361fb3a7b426a2f629a48e767e923f69f9b68f6ad45797fa3431b531d5531b678acb843496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/rm/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/rm/firefox-68.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "b72490620ead6de390a9c65710f21126237fca8d8a9e0f30075cad82b81f5db6096bf21c98f8238af2e3bdaee67e444dd4261e852a08cd536160491d6d49a51a";
+      sha512 = "7e11e5260165fa448a3a01e21b4e0a5e74b7ab82e8e10bc4cdcc0d0fb01a82f0a54daf7cc31f81e798f90fb05b38930a14af757299cacb459c48e3d801734a8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ro/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ro/firefox-68.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0534eba3bdb93051d39b63c871a4fbebde2555bbe60ea9e896dda365bdf364a464b7ec14b5842572b5fdcc65412b874fd8fc7ea5f9d93df3b80968f216df6fdf";
+      sha512 = "3328a992d9e59794a7885a7c4cdddb72f967885560631c4f6259c667c229345c81d45dced6cbce270c622f78bf49ac5dae0c5f2b2fe025de435800bd72a9419d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ru/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ru/firefox-68.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "91fbe62fb9555b2208a9ad7984294706b6809a4dac633387bfadb3a29e94a8e4299cc719963f036e88b65364adfb82bb99a87c529cd683b939d6178d2a56b3ce";
+      sha512 = "1a024f704dbdf633bccc9084182364e9f30ecc0418e97e89bfab5b4ff5b6599bfeb28408d57152653e208da03feb0dc116eaaa1d1b828700e424a3dea2897fe3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/si/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/si/firefox-68.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "cbe5636596ff8beb74b4338c0b2a8177dfc031e6fad4a594df3ae3796b8d93063f2c64c1c035a4712761c76dd44e489f3699bd33d8ba725857ccb44d6f7af334";
+      sha512 = "fc96fe15916035ff1d9b722dc96d2f6a934149655bf152e84a49a3296a7f4b1d90a908f680c7a2394b16bf39dd14cb05ce2e64babc3d3759a1a13daf1bce47af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sk/firefox-68.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "61f98ebe62408db59a4572ae12692eddd9fde909b598496b91e9ffb111968ca0d2916301bf89585ed6e7ba6b17d5a5a474c9011f171b84d933ec4a34cfdcce4d";
+      sha512 = "a361a1cc006ba9f365d92a2a99145900c006cfd47ec4c51de16535a13b8bc08b48f6557d28cd0794f321f5f9d6ea170be28315a692d2ea02177c212e40e3d7c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sl/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sl/firefox-68.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "cbaf5093b24241e62e5d9e59e85cd55e038b852523ddc75ef441517f41e79ce67b5c59050e40bbe3bac89b5ec5a3ea4529383b2bf343b3c2e677c94e466406f6";
+      sha512 = "a08e4f706127d72efd753752619f460d2e9ef98c390b1084d82cd7a1c41bd092da9be1f6497953be1e5f3b766108c0679c219b58434a8c160ca9dea2281a3890";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/son/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/son/firefox-68.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "be5ce53d4bbcbf6748ce9927dcfcff464519afe7e8ec9fcb08f752827f8d1d777cae5a4e4ca9911bfef443c9e1b9ecf3805c4e10bfdf01be7ab45d06afba66cc";
+      sha512 = "4847cf14593f469189b5fea96c9feecf9face5602596f743996ad28ae4605ad06b81ed626b945a7d388bd94127ceeaade25fd54ed37b6bb44b1a66b91de30046";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sq/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sq/firefox-68.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "7c01eff75b65914d96d69db99ff471b9e9dadee27ab2bdb00c13df20d574e34968a901adf4dc57fd41362d694e67ef6213efd603fd6d80833f19448d0246e7e0";
+      sha512 = "0691cbefb5c9881b3dbbe4777e955f1e6b6bcc0ebd0c2622f1a8f8c2bc2c9be652dbe8371ba7ae67e034e6b3e6f1f1184b3a4f2c846c38959050fd2e97dd268e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sr/firefox-68.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ed97ea79d2b2d1bbd94dde58135475f86e958a8a16302d9c354eef720e825a00cedef93a932ea451d398933d0199be3075d62923ba4256653c463caaf589fc00";
+      sha512 = "a6dbe0165d73f6a08cbf96ffdc594996007857345cf12394ae47cae61c6d37476fbeeb442575e1e3622e5ad6fb8475eecdf6a841bf4412ccc4703369270f4c36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/sv-SE/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/sv-SE/firefox-68.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6ddb6e38e1810a0dd2254cd3e2e291cdd6c53a390b09868b98662f06da25e2d436cabdb800284ad64ff589feff7a4de7de28b5d78f3c0ea64be0e8b74ca07a43";
+      sha512 = "4c737f8a91ec996bb229a726cd98b41dba8e072a7fee3f383f1cf7ffa18054c4cb65bf7a1f77ac8d59a3c2962404abcc487ce08ccb0f9c91a386b316f8408d9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ta/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ta/firefox-68.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "27631a7b5112066d8b593baf43fabf10c1e1f644ae813068694e71bef7184664862ec6060c79bd28c5ff65bc5f7f11c8c23ab77a0e21553294ee237fb0a54eb6";
+      sha512 = "cc5406268e3232771d4eb2483d32988bb6916e7053536ed39f0947a859e4b0944030a978713a39c0731b28bb03d84e69a3bb33bff0edff663bfee2bf2eedb868";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/te/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/te/firefox-68.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b2fa56f214b390d7f03b766f945c090f308f0840422c59a1e0103dc5adcf3bb2314b54e03d4d9454da978b37f2bd6846d92959e0cea022b5f5c4759136a142b5";
+      sha512 = "69c7d9a330187c202f6a8b97d2070012ffd71ef7fa8cafee7536ec307f0b5a9c792b85bf2d4cd856361b9598746ada97fb7f0d21e76da425114d4ed768ede04c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/th/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/th/firefox-68.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "eb92b504787065c2f7d0b180d754adebade9b8eccbcfdffaa91308262cb4d87f832ee8c130f61913abb4041db1eb9e0769b10c306897a0c869ad0371c906e3b8";
+      sha512 = "03b68bad46ca97c76b1d06c38fba4952a82a69a98fc81df3ee8f4c836b2a0e9a9b6c67cd39ce8dadf8942ab8e13166559599e1a241ffd108329f3571a9b5dbf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/tr/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/tr/firefox-68.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "42c014115006cfdb9bef77ddb47e15930a5e25a87a81a83a5de76db0aeedb6d5e712ec665e005350c05fe37a41b5f33cab03bb17de3df759ba86b3d2d31f9679";
+      sha512 = "c728341d864f30ede2c7939a4967e2fcf1f4a5c658f05ba599973faf7b7cebdf38a215fde87875051d64f9bb36bce34152235a5b00fc6f5ff4503e51dc1e938b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/uk/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/uk/firefox-68.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "12998bab12d1b7ac297da8cf0ac0276be9fc93b5ff2ce0bd7150afef36f90ce48faa275dc59146faede9806c65aaba4e90716e154e94f8ecc595b2caec7a4c6c";
+      sha512 = "65803ed0d08ef6f67ff7f94f3f8cbb73f8a21eaf4e79fcdcf16848eff71a451f2e2a891a8d2a92e9c33bf96437a2e1439bbad1dc33aa6ddbaf7c3b4566527b29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/ur/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/ur/firefox-68.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "914335ee1c6310e53d4bc74530a496b4cb1da3d1053456b14e1533bd20ae0905f726dbc3d6651f3b83eaf65ed432071a03833729da2f63810ce2be4b57f15b2b";
+      sha512 = "3f052f9e9261897d44426acca8fec6d070732cc64c29f78a5a96d80f75a3eb49947112d36258d836301a93da25e5c99d1e5867c8b636d2c8bd404322259b4aa9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/uz/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/uz/firefox-68.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b4066a27ae4ed0f0cf4fd5c498d914ca9b4ed4dee564ec6e5039b2cf7f56901b15ebf323e1067a6aeb489bc51b171ee388d8693baf19f0f16161f70de5685064";
+      sha512 = "a9aebdedc2f29b479c4b965773c3860e7e581bef85635b9e5e60fa459f10a99393ccbbc12c9029bb1ef900b63b1d4d2f16c4d7bf99f9a97acbcaf381e714d00b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/vi/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/vi/firefox-68.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9b4a2784a69e671c39c9425d334b66609e21b1785c64530303d98057355bcddbabc92e9ba90ae6098cc2ffd0374e2ac19756a35dd89e93fc7a8538fc57598598";
+      sha512 = "c63e6debdbfe43aa17eed9e18bebed446127fe77a2b4da3a155dec0ce03defe5cff9cf889383b5cca54680d1f22ba756175cfad6ac2748a966292438b0aa9496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/xh/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/xh/firefox-68.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "92b51794c56527dbe1c322ee8708fc635c1d50e60d28faa832bfcee615a3abe4f24f8102c1696fa8b2a1466a54362a61757b556581760b82d1183d90d994c53b";
+      sha512 = "adaaaae0a0bcfebe420c69aa6505e7b8261da02d36e87457fe4d980296b609105fd9c690e9a646f79450f0f2840e0db1336b8c08a20e43a6821cb576b8a28b55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/zh-CN/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/zh-CN/firefox-68.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "acc95d0dc0d48ac48d0dc92fa3b94c1b9a51317b2bc4684a826b955fef29812ede2929b7e21e025e54cdaee1b2db6479a5f3e87988c45a42f5efd2d0e57b2268";
+      sha512 = "dddf8b726930fa6b8a0083867bbb37f1ec2e12c0324c4dc2544700304fed18fb34d4905d84019246be53917254f277b2e6ce07da81fc70dd15c3ae26ea2358fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b8/linux-i686/zh-TW/firefox-68.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b9/linux-i686/zh-TW/firefox-68.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "20976902f1cc944b58a0171ab7f2c91d9162e6422fecd4a020355892f42b6027c8cac74dc3bc6ee4cc09969cea95242a9f2b3f7f3ad5c408cb727c06aa427f8e";
+      sha512 = "1a0311e48f2f6738a22c2624333c3132d3af5ed53f63a66e573361a12067deca5b27e39b7c074431416d43b6b72fa5731800bc6d1eae287a3aa1ad0c87bc638c";
     }
     ];
 }
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index ee8e2d6aa20f..904cf1f40fa1 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "67.0.1";
+  version = "67.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ach/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ach/firefox-67.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "c868018d9c1ae3712fc748f8d8db4b7f11f17ba539ee44453acc948cc68e94ba356ba48631581762e6f328f33153ab84791d8113252b40d6f70eb2cc29264acf";
+      sha512 = "ec8762aaffc4402a61594835b5b813d8593a85dc8e1a87d9efe00d40f629a68b2eeb34ac75641197d16f5c4503beb06ecb6d0a5659c84debcfa9ba4d4d2aec04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/af/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/af/firefox-67.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8723a7d43474a49c436c66cc196d81c5a2f430f4d98cff542dfbca3c181bfe7a2af2781f59aaa9decda5d660c1bd9bce31a3e53c5ee187764c3c4265d473b71c";
+      sha512 = "a42d7db1d3ea7a1ca17cf5460de619a1c24ae6c1298a0b08e8681b6e3e7f9c7b3da0b6e7b4eb9cb39ad521d2f18ca5ce59f4f5f14c851d58444310d070b2fbec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/an/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/an/firefox-67.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "98432b58b2a263134b0331399422a044df7860b4b9d7897a6ee05649ecb7507ea1bebff2b30ce88ef68ecaca751c378f279fac06e0aae1079bfb00a55b94cb64";
+      sha512 = "1189292cca4d4ee4b4153a6eb7d403686ea7235227d0ab71b6a45b246cc324cd3fddd7e643463eabeb809cc7127ebe5fc730b75223d3367c57af489b088f36d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ar/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ar/firefox-67.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "3c4da65cc4649980943cd73c62e10f8bdd3087ac7de73b7b109a51a055839cacf791e6cfd74f35daae4c10d9baf65aef48682202e3410013a55ce65cd6963f9a";
+      sha512 = "c6b348ee6d3e1544495e7b815b026052251285e0cb8fa92d88758b066c46636c2bd481543e3fcf98c98ffbe05714402940bfa3ee49e20ca42c5b2b63f6b12843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/as/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/as/firefox-67.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "6e7236f364aa8800a9f82b1f83969d3fe4c4443861b8b87d5bcada2fe8af91e86fe2b3f512baa5184bb777fea903e00b04280088672368cfa6053d7f1143dac6";
+      sha512 = "6532fec4d57fe325699bdc78d98c97daddc3c4f143729d4db0e949ddf62ed11497363f79a523c97d3545c4ae6a225086e5790ffbe54a994e8a880a24afde52cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ast/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ast/firefox-67.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8e722a2335dc017709505179522548bc88ca2eb09710b869243bb12c18eebb99fa29dfcece76385abc9ca7630e7093778fb4bf006d31360488e494654550bd63";
+      sha512 = "732c76f935754b1c08c674ed5cea5181483c3766108c9bc1b7a022248e8226f218c5f111b3cfbd683408b3ca328f9cfd63e65720e85693c5a8184797b3372551";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/az/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/az/firefox-67.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "a31007953b96bd66362114a3ab290304e0831575d2d84c02686a3f413bab1bd2685f95931cb21d5e44b07b2be3057452ef8902087b0424ce258140400e99f38c";
+      sha512 = "33310fe5f8dac1921662f9fa1460a653dfca25a8dc3f9d88324503a021b1fc8f980b3cf3e7793ca3cf7051c58fd9688230b1e0bdb277bfdc6f0f6a6825ec6c06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/be/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/be/firefox-67.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "380589ee226e1e4acd3bfb263a620fea20e66b71372ec3d0c1fcb8abbab64f98457da45824f6616cef6912a55fa03f0740c48941d82b33e4d8c65bb78863517f";
+      sha512 = "995dd2a26f13aacc9ecda53df04bcccf35dc1685285b24fc3d11c27414e6329aac564879d4de17e5625fa605b614a3f2a7b3ea747ded88432f33af327a80ab9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bg/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bg/firefox-67.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "6aa4f7a4e3938563bef34e29bf2998a64dc316500db08bacca2fa4494ae6f775ea8f1224fc8ec7ff7bb5b95674d85c7e42a380b1a0448cc79ce8e99d78f4d927";
+      sha512 = "61bfe4c004ea55585afb2115f83992a2a4bbd1edb2e0e005d09e97378419a2ae52b90d27d6f3049b6fc89b669881bead704be0c35f5ec5b8d6cb039d2127c64c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bn-BD/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bn-BD/firefox-67.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "d08b72dd0ce155f455b9238100ddac8a228ad7800f2974ae3765728c7a5ab4a4c9b53ee1b14a50b6ea5cbd0bc2824d16ad191e1854a1f2e29c8ff9043f052b38";
+      sha512 = "b7621d371e0404d18d075714f758ddf2706b3de883cd8881fda0c720842baa1b30fc7346d3af6fa5bc5c8b2d626555dc21185b0292031472da12be8708d363a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bn-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bn-IN/firefox-67.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "53fc8e9dc403be685b3e4923087c074e5e36fb54a29f981b1668fc55958469b8de303e58b22ca1aa2908b87be065b4da2da33c3359f49c11fecc0548fce070a1";
+      sha512 = "603822bebbd1b0fd6c1a47e7a76bd79d666c1198c88c45c7143efd923b75901ddae483d745fab6a47fe9c08a912d12f616d06f6e820f1bf09f5542bee72c32e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/br/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/br/firefox-67.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a5a08f1f19879e48dfa330bcd2ac396d41e357156fdf82d273ed29c0f8e77d7233df3e05f573fc62b29d96c1b2fa499b7598463df5eecbb736f7643ded3be58c";
+      sha512 = "d8afd2275cf8dc30e8b3285d9b04c7462bfa961324c2a65ba84121dc0b39611297930f5bdf7627de570267739592f4b52cfc9efe0af5c8bac6f1ebe465ed29d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/bs/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/bs/firefox-67.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "4bb5097920ba78c9159731565cd34a711e8824572e72c0f92f6482980156297ac9479d63a3663084cc91b023a312e16f460f098d3fbe717fdbd59b7c46556890";
+      sha512 = "104bd65c212fccaea9629d6f799046a663e89ed31182de61707551700237ad23413d80ab916385642b415d35cf1ad613617d34c76f503eb89347f1b19be7a9f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ca/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ca/firefox-67.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a97846e487dde9aa7efc3f0727e5f0dc1e0306c618b4044bc0f1b797b5857296db4a7456c3fd79aa11106444b4298b5f6e8453a0ebe9316e0ab95cbaa8fe5e78";
+      sha512 = "39a4fca88ef57289c0584302dd433fae111a4fa28146691868b693f82d9569ec5b5e973ec2da1e8fdd50b5b65c315f0867795ceb85e5d897029fee37d2eae5ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cak/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cak/firefox-67.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "9a2c76ec6e3822aa56c729959f0e7005c5a8cb9925fa5fc05d37800432b796d4d876d60ce67790aba6ddc0f29d73d95c81605cc8f3a039158eac35834a6b4d96";
+      sha512 = "8b7093b2dbb843c42049082b39bc9677ef06709092d9a6b05d70eb53520c0ecfb8da4789a47c83ed52755a68c5f4fd83b37831d0be99a15b168d5869da21bbae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cs/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cs/firefox-67.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f2c89c734d7ddc2c5769566991bb3377046932e26673f04138a87e766253a280a5b75f805c0ee571d39acba27dd33241bfd7aa9efd45e29367b55330e14094a3";
+      sha512 = "5eb6e925c7c9147dee853e1e3763161f9fdaad73edd71fac995897af3d3e8d018e2f58880a251c8d09ce06d0a971ecea7d05b0f7e28c2e120460c297d4bc78d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/cy/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/cy/firefox-67.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "980f1bfb92ca53888260d451e5149d4db1320d981649665f95cacc236c6dea65ba7e39d845bb4b210f08f2be2abbb5d918796a4672e6a52d2c1dd3ff424776ca";
+      sha512 = "82dd9971cd65249b844ab52241ac86b6e0c2de84c65b7689756564714b85c61e00e591cb9cb892e1c4e75fd6944f191bbbf8920ea18dc2c1adecb5a0d93bdb6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/da/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/da/firefox-67.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4e92280a962d3ad18f2bd2d8951b4880cf14c1c5ef74c35b3fb836ba388ff6fdc35c81a08ae87ab016c34749db0e9031cfacd163eded7c6d4114fcfc1ba40efd";
+      sha512 = "d4f7066ea01d8aaa9ae7dd92d0c7ac8ab10f628c5a9e93244c49d546df7708bfd450f7988e05528d2bdb9f5a6849473be22a4f7cc44754f51d09118731fc9411";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/de/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/de/firefox-67.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9f666528e4f4890d4dd5d027ed62222b0f1c8888560365cab63defce34596a5c992bce1df176e6dd6f3b8368688bdfc9d5330b69d36e953593569d2da0d40141";
+      sha512 = "7ab0930126196041cf8b83426d81cf998b9759fb65c123f61efd641502c42b0141fb55086b4ffb99ef5ed9ba50596d70368a0188610a1c78799e26d4904bf4c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/dsb/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/dsb/firefox-67.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e980c6479a724eb5f16fde0adce4be17d471501d6e569f08ad8c3b1b8ec7d8a187e57627ceb1a390a0a51b4accb34161bca935cdd0180531263c72d8887cc95c";
+      sha512 = "901840a64290edd9b9612ae1138d64ad88744bb270cde132cfc79f8be42ba4b59ab3266adf943c61eec6a2c05748cd3fc756862a6080feb62a2a5445f2ddbba8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/el/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/el/firefox-67.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "373642d255b141f55b856162c744ca6db7bbc2b238f08e8257896a27e09d93dfe9f0de8ed0a2feb11ad8e9dc2f08ec79ac6988bd16882b62f8c3f46bcfc03e91";
+      sha512 = "7b4e51e879f12f2ae5d041d384ceea9ddfc980e8b564dfc9fb601d9c5c71c1614a6ba0675c8bd9bb483c65b5f92b0506dda3a1d1a3e54ea0c4135011e1a471b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-CA/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-CA/firefox-67.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "4e85ff012b3477580b293cbe9d9617377dc0562a48bb6b890583e2b59f98ac65aca0c9329347eea3e762efa440bf554c514bf58a26a5f0b10e27b02f444852f4";
+      sha512 = "8e96857b18bcd8718440caf5d17398612afb2e4cbf74b3ea13742b79532da4081e2017856c99707b0edd0ffd8791bdac9a5e6c4647edcf6e96637d8cc020cba2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-GB/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-GB/firefox-67.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "aac7ac00545c9e8c90acc3e06c5aaf1dfe6995913a67957e08ac5899e70b969a6e2d0395c3aec023a61ae5057ec6023e000846fde5c92134bcabc9746535e41c";
+      sha512 = "51b4d05987aef814b36326066d50f3903c29840bb780b09b7a7c4ea60848d33618e0a40329fb80221e56de4b462824531ae250736d41a5cb498173517a29341b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-US/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-US/firefox-67.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ef86d1feddc368c695aece44d4af655a351e9bc313af5ff1a32928c469fd19eae75e1c9b7f66dadac754b05d8d1cec8e44c468caddf4277b11a9b72f66b2eeaa";
+      sha512 = "70c8b0ab34abbcfa916e5bd5dd687405422f6d2339843d8b332d13efe7aef474064ca49ebe1026585a540c04175af2a1e88224d92506b01012cfc8e173167138";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/en-ZA/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/en-ZA/firefox-67.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ed20b44da68fec92ce529c14edadb351f937e26cfe60f48acce5a5b9c3fca3190eb974891c7db8c3e3524943cc93e8f715859242221ba21a5b9c14a7b95ae827";
+      sha512 = "73ea4fa964fc97c15672eedd5822fc5b83a620780ddd46ae07f851890c16f3c8f0d30f2a5273f4631f04cae8bf0258c9140dd0bb256d38c38c620d4bfdf51a40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/eo/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/eo/firefox-67.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "1fddc64bc09e10c076919e6f1ff0f57adabfc06123f1e12c1455d6468db6bb05e51eb758d621d569d90bcec6fcf349787daed53a9b7932c96bca0c5f7e2eb383";
+      sha512 = "77026c365a103f484daa17d3228eb02f271dd7a3065830ef8b42d30d1f39ba81732b7f9ae35fcd4a1ad7714f3935567ffb6d3aed9bce50da30a1e8b36c4fead8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-AR/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-AR/firefox-67.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "48c6513cb062c9ea04249291e383200b9745db20a6660b90f05e039c365402dd7dec35101655d36fd53f5a0223231163e503aab23f54f285eb7d9be8a165a17b";
+      sha512 = "90b14b2873f28f48d49203e9ed1db35a760a5d1bf3dc30b7fdc238a9c8626c54ac9707a4845835cccb0f3aed428574d684e29058dea945cdb2f97274766dd3a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-CL/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-CL/firefox-67.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "8bc6261da80286004b91fedacff707cd24f1fa56a3cb4b3e37bb21e1439fff082e1fabc806e092b834eab13d4b11c3ebf3933ec21ce4588eb28696fc18f36fe2";
+      sha512 = "58ad3c66ccd087f4c199af647cefd37d41205f2f8faec9dd605aa71c9d6ef9cae64a4a97fe55b5bb8fb862d19c6c41e504608780dafbf365c1306646a72ac125";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-ES/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-ES/firefox-67.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "940c2d5a85764e3e9eee63cebecc5b2a2cd9913cbac170cb4ac5179518dfde6182e29f5ca3fe8c0e1459ab0c38887a4e15184743d003cbe4d0b7eda427ca9836";
+      sha512 = "2ef0cf55996424b9430f0241ea68f32e0064583abbf8ea8d7bba181048eebf1e157158fa51c7ed9c8ceb7ae9c9f6df92d2284c3f397d8d912d4ecc8f78d03773";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/es-MX/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/es-MX/firefox-67.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dd5e7056107732aae419cdcfd350f85b0989cd858a096649eb138c6ce9127bbe5c9f5422ea56f7d0c159de0c0401e0a84279ea9411d434e5e093fdadc790dabf";
+      sha512 = "79c45541291ab0e2b67a945c43f22c08fe89306060da60060a8a61fbbcca2538b6ba6a1a5828df4cf9c2cc86b64419281b39c59f5cf12ca61b8f4a831558b452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/et/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/et/firefox-67.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "116cabb2d751aad2a37e6e6c3bd43924ff060d86db18edb5a7a97320d38d8a0a095370d47a3a663fb5a79aaac4cde3a1fbdf803b6161823b69b57a1bd9c321f5";
+      sha512 = "362fb9635f292fca9988912a8dbfd335ffa0d43f20461f04960c424b92719fc7347c504549668bb823ba2afef52cb4f9a2852d86f6ba187e9e2c7e2daec3f257";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/eu/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/eu/firefox-67.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "afdb63e987163babfc5d7d1558cd41ddd412cd4a4dcbf258ad61a1fffbd1d418565012e8ff17ea6c8b9b458e9294d8ce8615e00fcb9b350f0c892543f2e41a58";
+      sha512 = "56f79575438c58e0302fb494433f498ea55892605b30ea30d0208ff700830446ee7f831021a1cafc4f8779cf6aa3340766d2a60c42466259e6273799acf94b01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fa/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fa/firefox-67.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "a162164b3f8aa83daf4bc3e2cd278cb34a216bfd4fd066c7750d05a6aabea65592f272f520206c5a0e9a2052555fa718a3bc11fc8701cb85a0bd1bc213197018";
+      sha512 = "2d8ac7fdb95e7704cbf00d18c6a3f0ed1ca08a9badaf1908ae21a1ccc381efb4c3a7f93f99b19b395d0b09bf0bd037b120e1e9b856b8e091bbfc87f37525de3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ff/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ff/firefox-67.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "cf770f3a855f358d7c0f62f50bb311b94d6435a3a785c925034ae373b754c76de5f795540a5f5c100506385707df6d577b92c07a4dd426fa5fc764ff3f8754d7";
+      sha512 = "e203accc21c37660b52857a18746b8a22bfa4efef558952e5162a65e3d27805fa005ace1892bab81047bbdaa4e11ad139598c2c9f13f5cfd0fda6fe1b283f3a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fi/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fi/firefox-67.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5f00d800c8cdd11b11b24575aef14884d3e0f2aa00d4a52aad0b7f7067a3eaea7f6225834487859d341140d344898f26eca47c29cd4f695103909663bd90f336";
+      sha512 = "2018a2875b08b6a311b1e42c7763218449949d3c5a7f97c995dd3bf6fb73116a32781b44f2d372605b1718f12dbd62aefbfedd3cf976213f215b689b5dda2e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fr/firefox-67.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1bd08df6555c61dc77c7f90c18ab7199aaf02b8a39dd341408e9280fdfb8c3bffb149b8d2df1f6fa7a11d41c7e6ee5d39502b258b0319e9026faa401f9ff385c";
+      sha512 = "2544525e99b0e8f4013a4cc6a131d687f63e4cd5f634e8a8f3847a51cbd7ab26ea4d7bbe490618e61b82843abc6c6295e89d424a83398cc3e900247cc6503a94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/fy-NL/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/fy-NL/firefox-67.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "cd518e1191fcddb62293a5668608b152875cb43ece29b993dc87417db059722c9797a9fb9222b46eac24c333e04a619f304d5162d5a52d6a218af5c8fe6933b9";
+      sha512 = "7db8c00d0641843c55696d1ae12e695075209c32b6a4a764246bba4ac1d553d60ee0b3065f4b214a39622b3036b8efc49467bd59067f10a00143997605d16b86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ga-IE/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ga-IE/firefox-67.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "f5b43a60aae12ddf6f2cf75df4b252c7a437a8d0e74a90bacf225d043ed713491b19d666b463a75c6d04020e27cf93047626efc2aaf956596c055809f196ea62";
+      sha512 = "1472c619b85bb324dae529b251f7674bf6efef3b4229e4d9e39310d746f754c97d6a99b00fa3a6f2f3b77ca5bf6e1705455b589a7614ff11237715b935d8d56b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gd/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gd/firefox-67.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "6c9f0d9af45f271076573277fbdd49ffc236bbb1a8d75eb1163a66b884b734596e2f57e1eeadc229d5deebf5db2e87e1b11429debdcd3697891a8e3a6b04b201";
+      sha512 = "a2af23d919a3c5319728017727bb760ba5e1cecbea550e8dd28afac157542c52c1e9294ede4b09b4e8e13b855f460670fb8b9bb27be33381181a2d02176f932b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gl/firefox-67.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9142a20aecee5ed787a280feef5205d9cd337d21f64edf9de37d597f703f42bd1e6de2c8568c821df391dcc30f69cc61ba7910ee585835989ce9971ef2d64f14";
+      sha512 = "ae6cfd7f83e8565a59b85e9329ecfe8a8b55891e7967fa31a6586beb62f7387f24329a6488d359d084990a7566f907cae5ed2aca9db0a0cb160732cbf2d9d9dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gn/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gn/firefox-67.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "f433147686f92444d01df7dfd68ad26c351d9456834830d9351e0e72b428539f14e7be090209e5ce35e2b6ac51b5b429a57b12ff0c57b867b41d862cb87f6e1c";
+      sha512 = "5dfd75c0c322114c6fe486aed5dc844b205de4fa4358a2b3a66c88ea65ad375dc1055b446838f9c29b0dc81d25cff04a18428c468035bb80188f9f9ad6731176";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/gu-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/gu-IN/firefox-67.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "6db70a7d074a1ee8a1e51152de8f3d13b5d036fd54d9aedee47be73b25b044a3cb0ff4a28c265a69065085c2e61f91da170e060c0ea2d9579a606d1201006133";
+      sha512 = "41842c245b997be7f7fbb833d22ded9333e1cbe4bc53c0589ddb0b66658949919eee3bc0f26f4e019de661cd1b97cd96781e936541909cc65ab2a171e1f29f5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/he/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/he/firefox-67.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "b2e559f01a2d47bcfd25080bef5c09bc96c33ef6049e4ad6c178fe359a5d5662041843c7bc6ec37e6d7bfc157ac5d59dd24ea87e02c139bcd8fb4d8d0afb6ec6";
+      sha512 = "28b159fa1cbd7168b0025408a6d7f75d9441f8c0bbe3d1a1ebaf61fa066d5709c37ab18771d768d05ff89dc682d494598f3d281c2b99829b8975d2b7adc06432";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hi-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hi-IN/firefox-67.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ba7b7e07d9d660bd0f79ffec1f539f56f663af3b5a8aa589b5209ee62b1fd563371a01a883a0e7dd8498442d4d12fe45ec7afd5cbd81212f2fdd0446b00351c7";
+      sha512 = "4dcd82cf0de1a0e2d73e38f0d00801c3f3ab89e41a8fb510d60bf3c2601443ee14c9e801f2a02d3f9b8b1c084542fe7463a20f1041efc06029c1a9c57d176f64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hr/firefox-67.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e91f7eec141e48f721585b5b00ab390076a1a055e60e8de2add55f716a0a1271d031e25e28206acd14d50046a46e515fba5f1937bd7ebf25262f9932caa4954a";
+      sha512 = "7c4c1e5eb202cfa56bcfcd597ea4bf57f0f882814b0fba10776739d8defba3c436d28d3bfd4e9977d19a58c5d1b949ac12a12801a67dabd631a5faca71db3d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hsb/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hsb/firefox-67.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "f40e0ce5beabdf0b1bc3aa569864446c0aeb54c0eff2bfd377ec6c1ee473b78f10772f53b3c8c432d328dcda366357860767e235ec26f468f3d94353313c7f20";
+      sha512 = "f098af4aaa9f707a4dd10a405e80e523f39f4dcbdbc9b2ee51e70611fcfe9060cf5ae776e062e299837699c996a65680ac9d1bbb87d53371aa206f7e92c9ccd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hu/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hu/firefox-67.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "4c2c57098f3490285f50b4995e1800dd1f193ce781a600a08288566bbeb5b6eda59d7f648722494ba00b827341e9aa1920feb49a15437ed87bcc1b69c73e2427";
+      sha512 = "ba960bdc6c0b9f30fee22beda2cd6ccaf7ca21e069a46e7284bf967c80a3e4c3d969ff6ca9d6d637dc65099e41655268b0f64ed801d00fadaac41630707bb5db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/hy-AM/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/hy-AM/firefox-67.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "85451050240f65d9dae676504576d594678797797cbfceebd7c6c3b287c1e3da00ba8c3dc1ed5fc8055ab066f058d97fb7e88500befe5b1820499cdbfdb2f9a5";
+      sha512 = "39a5e68217c9d43f1cb66733f68cda55078522793132dd90b824f26088c770e60e292a76355314cff8656c591c5c07a5eb4d15af396804b00361cc9d7b612eec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ia/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ia/firefox-67.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "95d2014c98682cbb59a5d81b9c751a1117cb21ff9d76ec176970b33d17ea2f3e76a99aeb05669d9831e3a7f560293cb3848e7369e1cafa00edb682e2c03fead3";
+      sha512 = "56af9cabbe9b7c9af119e111757a1ab9313142ac7eb3dd1fc6fa433be16e4c583be1731290d1e1a83703638513e0575c5fcfab25b13af2b21b510a9e68d7a140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/id/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/id/firefox-67.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "f5a290ab8f5a9366eb184a5177581e84561ded6a76601777db66c2d2560a484502ab789228ccd8374d9c185fa81d88a8e36acee239fac5167ba1fcb2ebba9742";
+      sha512 = "fc36530b67beb5004f01751a20b0aacb9a5ba3b97c08ef27f4c1c37d4c269f01af514ab5786b465750506c18e6ee3f6cdf4b6c5368d7a2f023cda1b88b963e84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/is/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/is/firefox-67.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a8edd686dbb58f058928638568644233917e8bc6128f0d5e93eeea434df0e0bb729a5c464770b2aff71638f220d50fdace949e70dc43876fd979fd5d3e62705e";
+      sha512 = "1676c1a62a2db1824183e3c9e31e5907a3f75e78d142ebad96d644853b2a3f53ae7bf51b439221de1bb949d12ccf7d05b33ddb004b65f9bf5d7f39cba45f7205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/it/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/it/firefox-67.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "96d84d920e6cb83f2d68db3b6b4233efa15031b386eb40d9d42d7c0428bfd73367038ee916867ee66195f293f7bd14065109430673d2199acebc3d352a2ff5dc";
+      sha512 = "9e6e5b8c0055bdd64b6f61cfda07dae0cc295a8278107953ac05eca99c4d4f1a5905bea6f583ca86cde3f80282bf04753f9b8e16721b6abfc205d5f9fc461a19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ja/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ja/firefox-67.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "00ba1fbfa7e17744b4de9dc950c1bcfc98e5e156a4e0bd4bef976d52189835b4a6f84e3f17bb38058f0f4e1800af33aa9de0dfa985653fa756b66a63c5bdc556";
+      sha512 = "4ad489d06459cd17f6658d699f844e877aa5fe8add9f9e0cf36ba3ca551271cc5b572dc4e9cd6b84df8b60c756ea24edc9b9a5f8a6c0f50c2dca1ec93b9f0f7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ka/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ka/firefox-67.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "08da471802d0baa0de993695ee38ddc0283ae0ae19de09df154050ba0323216a755e32f677473d64cbe38fff653c769efa44a5f26c3d30b8e3dabbe14982e3c8";
+      sha512 = "9148dc40c9b5d75d7eab501de2fd338d3b745ca354ed4cc8e78fe89f92d1d2b82bda9607fbd942bf19c0e44e3925e0800e0e3c4c9992043926c2c611ae42af9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kab/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kab/firefox-67.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "39b34fad303ec213ce1c50e6859c745767ab1999a60564b9d09740856c47b88a78dc7a567df6ecc02f55949e7f95488c286ce273bb4e8a912f6055126e8281ae";
+      sha512 = "56b594de53230cf5e9ad03c49171a13914675132b2181092359ddbb12eeeff0a34866f501d5b95970514f0f8f9a9aca7a1e4a6bb1c76d2be99eaaa8320628c59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kk/firefox-67.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "005837faa89c25888699da347473c2683a31649874caadce3eed3bdf834b16b90bcef0e69cf1acef66fe12af2c4f8245261c0283ec0af6b29a7a416b50bad462";
+      sha512 = "9bd8b2da9ccfa515fd794faefec4c91fe2b0851b0321a523addbc56f2c6110872093ca8146b126e69949bd44ec20e8ad3b63b75da38818457deb03e70330e919";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/km/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/km/firefox-67.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "1f6f9cbde351b9ba046916d7cdd2ea64d0a1a641cbecad272248723d6090ace1e27b3562d28989fbb5bde597e9cc13f1824bf87932a41cc0cd4059fafd047216";
+      sha512 = "ada2fe4f9d3901b4b0f90541357bb0b52caed1616c4612c855731715014a1265561f1755fe33b16ec449b75085993935aafe4b8a3755a902602290ffcb79a580";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/kn/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/kn/firefox-67.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5a8366711021c5bbd39bc686717b03567703fed6fb21742028601d26ca691ec92ec3adb6dc1290e1ddbfbe90cb82d04680c575ffc00ba112c55852a736f1388f";
+      sha512 = "0ed21b278d1b31bb9d6f37316f40bbbbfe6ccda5ef5077ec5593fac355fa216bc854070578b2db9805b2c40ab1bb1845f0ecb1405a8d070377741cc770d93ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ko/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ko/firefox-67.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c4ceddbac8a371cf4e206db53fdb00a8b6a2354912d5de6e607d530e6d9b7ab19efbb2631e797408f0856aeba480a63f32cb3a3ea96a426cfd5d7cd3c6eaca38";
+      sha512 = "527d920673b1c38399971648bae3ecf90099d8561737c9003e8bd839f7d7e89f5819d795073ca35ed8f8268eae8b8c3c4357db709f5753f46e86e7cdba14f1e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lij/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lij/firefox-67.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "d51780b5bb07c430de3914798bed306d8e08af353ee4010d0536005c94b1efe598a34650dc7cfff89cdc5c41ef9a9f5f4cd8adba9c861727a0a8506adc2d384f";
+      sha512 = "d82a7e8f5d58a1e9f768dcc8dd62d2f759fb2760ad1ed898de0dc7b0261f0406724475842542367db3d9043e5d5bcd0bbf712ecbccf82a10d2ed6c44ef5e2955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lt/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lt/firefox-67.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "e2fece90a6c84a45b5e4c687d64d996866c4e47bae691888504e803a2fedd17deaddeda4c691b5c42a6ed48cff4cdef141f2c89e4da864e32957d5ba087a93aa";
+      sha512 = "374a97de975b2b641d71489be091306f76ca52f620c5b5f50ffeaa204e23e3b9f463916978b6b0977ba6bc39b616073ce4e15a426de31c48c3fb89f74e5ff063";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/lv/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/lv/firefox-67.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7ec38379878b8178f92e905a62aa8ac3718ad268f12851aac6c08f28358150936cdeb6ce9bb1364c904d933fd87ac628cf6daad5de3a7629f7bd06c0a5167ede";
+      sha512 = "a5dfc9207b1bad2d67a88218a03f9622d8cb25b5e3dc0c5e3d678b17bfdaa662a3c6587b4b6794d679a8f99dfb6af31d3cdb038510ecc33f7c2f12141459af2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mai/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mai/firefox-67.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "67af9610fc67f77e06448bd88ffdf3f0ddc0c0a29e8b8b08f2c00dd0e37795fad00aca231fede025090209417b06d08de5b27f70644c200706ae482ca9c758af";
+      sha512 = "928bdef67c7c4f0355c46fe2887a935b58c07e65b70dcb1aa2b9b659256b613a520a8b427d8665b3c07bb00cdf0fb30f70561a843b8eb62aedbc56b8ae90bfed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mk/firefox-67.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "ca774f6b343ab4e2623ddd9a531ad0cd925a810908b25d3f101e12a5f92ca8f5d195ec6316a8bf56afad9676b1154cd94746873f41c02aace459fdc875ee9b5e";
+      sha512 = "2cc563a78bf029c9d64012c2711e20face6d6460658328787f774cb04e3e2478d1aa584688ea32d87efaa06c8902f9db68dd27fe0326ace06f67bc75a4af2723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ml/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ml/firefox-67.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a96457926309cb28a22a984695b4b6afeb1908ff59087251034209bdac035fc511a6e01658dff217a66c023b77bf1d5cbdc770c1c70cd9876164f3d1df00d716";
+      sha512 = "e4e5f9b5174cfa4c98e1855560d155117ea7084ebcef4cac2deae32d10e86d5860d79b08d83407b82a657febf7a68ad3cccdfc6754dc93757e3cdfe9c4540182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/mr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/mr/firefox-67.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "605e107e1d68398db16f403c95b24b123d9c878c62e0d339b389b28554713ec8b569e1faf2b6c855b59f9273eb040a31ecdecabdb81b6568f12a82fafb583a6e";
+      sha512 = "38b15b6dcc709e0d7df1f3a5d083ed45eaf66e27f44c2547c082b5ee52e78d55cf190a971e6929d68cc397df74caa2b9433b71a02beb05a414af9ea4415855b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ms/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ms/firefox-67.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fe831de9c5e71728276feda01996e31168002b4029474cfbc1ad743758b809b4b36b62f4413e29abf84443890a63f771043eaa180d24fa562944173572c18a07";
+      sha512 = "0202ad8c65fa8dd7468c19ad59930864b1e5cbbf6a20af850547e1d40296389f5b49f0406fe3366aa45254cf328234bdf1469948c6dc9ba8ceace29f33847b0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/my/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/my/firefox-67.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "dc01473c556444ebe2d05c1b60bce0cdb96d64a1cbc9d6f76de1d836c0cf371f283d809f3cc99345c826952e7a2959e0468449b5065115f5acf8ad360be2a942";
+      sha512 = "9dc7394730878c6828a4645719567e3083aad9df62492b8713dc65c5faa86f9ccc8a2bd6992b19044ce2eacf426fe43bd16c83169aa36fd43ea7131fe4789647";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nb-NO/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nb-NO/firefox-67.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "1b2736ee296161d89a42039e238705858d3d4fea9f20fcaaaadc36bdae052a9284a188d2dbef9d07cf8967ee08b5facb4beb671a66eeb90b1139705a2d7b9174";
+      sha512 = "67722961e89e238f6a27495a6cd19f02cc634f058c3f350ffd3230f08049a486de3ce0b3b2d87a4a050a38f67e75fe0eb98f8e5a48e09cf9c413559835e921dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ne-NP/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ne-NP/firefox-67.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "6399d697b59fd06bd1793bbb7b86a25b9e075cf8b786ee78da9f5418391ad45e27a1daaef5777fa83ba15b667c2279c68e4f1c730320805c243ec2d1082c1686";
+      sha512 = "ec582049c29062ae210eb760407ae782df794eaf9803581549c96322312d0c9ff4eb1db8c7a5e3329dcc42eb88d661d10fac35aa218280e163b9cb140f8afbd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nl/firefox-67.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "189381a4cade7d3ac0ce34447323b37777c44e4101108d5ceca27a8557bd22d8b3acc8d3fc2f01c34f4e82e8b8f6014da14378e7dcb4d298250423f9f78143b4";
+      sha512 = "67eafd14c297882d2683d77ca06b576b1161d8f83f7d181e3b182933429fa5e2fca2cfdd4ca63ec62a0105fd62c4fd39653986d3c6a3cebdcb949b76101c92e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/nn-NO/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/nn-NO/firefox-67.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6a3797f0db08aa19d2b59cccd2a524199b9b7621d34d7f27b7404d604c3bbfe50c4c59c9b189315ecff86bdd1f4d3092810c66dcbd091549a9c3bcc6662f9bc2";
+      sha512 = "6b97328e6402b8c41a0dad0485a707e0316b462c7db0c1a7eb2bf20bf389582aae8195d9d7b25243e86a2ea1ca122f4f4fbb16adad7d67af97d548dec80b7cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/oc/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/oc/firefox-67.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "50ae2f5685b955904036e92a5289a05bb2d207fe9816260c8840119ad7063ea6ec6d3e0ed117972fcc2779a389e603ff99b2a0cadb0c1c407b4b70728a5a347d";
+      sha512 = "c1fc46c423cb40c46fd573273a64f4765970341597e614f58fd08189247ebcac3f5b0d5c922f44586adf2a67cd058a6564a9a8ddb93467e12ff6c34c1520188d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/or/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/or/firefox-67.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "e4e0fefe02fe0e6031e3c992fe111987ed328e03488e53839a65ae0baff902047a3b1fbed7b8c863dc9a05a01af291406b4946321e204e537d19a617b5b50688";
+      sha512 = "86ccafb4f087a8d64c7cbac66522ba3e57c4563e5bb8556d92030e7fc3535dce524eda5d88acdec1a1029071ac062f8099a3410030e98a52e374fe3e91ecd207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pa-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pa-IN/firefox-67.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "59233c1964bc89bf1be63f4ce901fa11d48cbcb0d0e93e62f7cfff5abd4617f84044ba6810f39df6902a25f47e0e9845419a0786f1741679b3fc7ac62cf6415b";
+      sha512 = "a9ff382aa059c3039bc7bfc5b2cfc1c1883b26f923d5d665f2789f3ab710e596b57b970bc182624ad68bbb4ffc3ae4edbf8a0d3773d5d4eda9f8a0dc3f36d7d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pl/firefox-67.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "225656779445d84eae1da64a185c2f949cfdb086a13475c8ccabda6f1076dc17f1b9874db710edfcdd094d0ec1e9e8e8c9d32f8b2e6f3f80dd9652f1309f5c9d";
+      sha512 = "fba6c16ba8192f0e47dc4c3e3acf09bbbbc7851af9641f13008813cd0109b5e6e77b2e58605a632d32a6be6352b25d725540ca0dfa301f43c4666ab755f16d0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pt-BR/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pt-BR/firefox-67.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "6a910d696e48df058719138e6ea7d0d37095f2a81b7c7ff7c9d418c24760cfb32398b887f0294a25ca4f4beced913119b0c6c4a25e9cb3924e6972286f9da7a3";
+      sha512 = "0b1204b3ff0646df71529f5a5319c9e32ecb844938d2ce7bc30ff62e20eeebb99ba4d34820851ccb00fb68a369bd786e1589f920433838e2e4ca16682419d174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/pt-PT/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/pt-PT/firefox-67.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "3060be3fe72e23f9c6af6057bcddb70ed48dbeb02632223a1e040f320cfe825d68599f35245a7b9e8b335fb5646738f839244adea38491e04d7d4155cb62f1e9";
+      sha512 = "0c7ad169a660e3d315dcbc5322df0e3fc3f41f35fb8ef39d21aa006c36ea6692fd999ce229fa5e25ffbdd3e7609887c6795e1b3fe4b2679fbbf706e904c9e14a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/rm/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/rm/firefox-67.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "61e3270320b5ae32a1ba278dd8a60db18db46b558adaafee14d0bc60e2d6fba0a3fe95f6f7b95c19b73e36f6c42f19bb09021ce308448116be479ae5bd0ad04c";
+      sha512 = "9db14295905b73b4c401a6ede5d6e86c10ba9da8c5a0fdaf8984cd800dc2344edf0103ae50234d06984870ac8e0a1aff7190233924b08d9f2eee0981acf2cfa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ro/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ro/firefox-67.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "97070dc3e1e8919446c6331ba014c21dd54d88d8c775f529bd16acbfe7903cbd10d51337f4129d4547ebce402de228bd4a8a7835150a145b34f0827497e31f8e";
+      sha512 = "48cbed795a07cd92441ea435dc9f51459d7a5e23fc9407dc4eeb0b39dc7d3f8b6807d5d441711b9931f566e527a2a456cc440635e0a1185236ec8938f4dc9b91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ru/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ru/firefox-67.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "3bdc32fdf089c72377c4c166360320f5c23bc4c451c91cc01bc0925711c88c0f0f1071714d28af323c602ab9ea84ef50270b7f6080adecb974c7dc5fd23658f3";
+      sha512 = "9c4c2d5f6231c7504b67037f6fbe5d8f31aed52da93cc343b2a6bce2a1da75ffc59d0cec2b7992098b4791508fc39d029bcf16ab96dd8ee4c1dd535c8dd81aa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/si/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/si/firefox-67.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "6552073a65ae22e140b1c46693526a50c96da4d0ab55de6231915d52b8e402172be7aa27ff5b7d6f7a5128e77006c0c4073c6344fb21708e63cd17a09da238c5";
+      sha512 = "431b4064558cac4dbf459b71614e7287c17c4e48268075dc8bd4158b120fd7fd84f96ca0516ed1291291c04a9fbb82b3df1828134cbb1a59ee76127a09ad8630";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sk/firefox-67.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "68a204a72b2ff261b09397f1f5b2d82fb3f0e2fa42332cf881198bc8949f185b66c101a0f513eb6849efefa7c717aa013fa5ff4812d10314f8e3e49c77c117ac";
+      sha512 = "9d9a52ec4c769c00a851f1434113706ba6d0fc555709494c014ccc647cf708cb1d8dad9abad4eb2988c5fdb7d0437e79bb01a8aebb7d7a5562f2bdc72f8c5114";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sl/firefox-67.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "4cb79fceebf60f8fd95b85f537462413f64e1c3559721a1909ab07a10a9621c4c27dcce888e29d4f0c3237acb8956e63253840fe3b3d2e1ded56d4f935e8e6f8";
+      sha512 = "1ff52851d656d0b8cbdb730f09ab374ee0a29fe2eef7e3c1880df03dac07687ac5bd3c8dcbc6893534a86b952e2e0604d625cec3df14e7c70560cf20a38f96a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/son/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/son/firefox-67.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "038bc081026286b08e753077f45931f724805030add5ce4ea92ac50eb59db298b3834cfe4c3899c59fde373c21564dba0b5cbfccda2fcb734aae255ec609d7ff";
+      sha512 = "07288885374781c2164cc23929e86b666e393f5c3e699d18447aac9aa2e3d098208cb806a2e3a5528b3cd40bcb5c5f62a4eb5d17bcf50ab7c44f387b5b153de4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sq/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sq/firefox-67.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ed6a31b0496f60d2c4def5ef5f343ed57e421c8c628c84610a1b558d454dd7d765307980cfc9f8bf463c7e03987109ee8c342d84e33455fb2fe0f9dcd0f80c4e";
+      sha512 = "8c4cf47a4ba9f4fb9228dcd60ba3a85dea90c353b45092173fcaa7494e5afbb8e92f81151cd02290a9e8d9654ad04da10e53acc39e4a8983f02737883b532c56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sr/firefox-67.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "790cc26da2fe7691af2e50640e7458055e1f9e48ca7756fc225341339962f615f48596a10cccc2e5f6a505dac73740efeaab353587cbe19a14d7c8ee1dfece93";
+      sha512 = "54c23457008e84b3995b795f5553d7cc22edcaf50af2bb31e621822d9946115683ac06f22373e64b313b145f707c4269c9291b95fe860e26d2ac4fda0df9a614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/sv-SE/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/sv-SE/firefox-67.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "b98190c45f637fda39807f40da99afe6ff5aa0029f51d8649144052785b9942e30c7d0b31fc6c55bd0cb56e2275ac3c511e61f1e6d4cc8d0e45e73642150b7c0";
+      sha512 = "551d34b62979e4a27ca152a3560347617100e35b1a9ba357cb17efce619cad6c8b50b222e191ff117a154c5f1db908cebd8d76e5be016b98325a02dd2bdd8c0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ta/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ta/firefox-67.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6a9ac4b44ecc81de9db574334f81c6ae67ea2b578e9d5dbe11710a7809f72a5c408cc776c7def4c400405d86add0e0f54cd238438305badb5b0e4a663819a230";
+      sha512 = "62fdb16d50cd7b17659486fb8b915c605cdd2ec6d8a33bea7a269463044b1943695eed05526f785835afe9f69f12e2aa40b339d6a6d3ee8ed3e622d6dc25f5ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/te/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/te/firefox-67.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "67afd13cb6e27c266669477e82ea93ef406cfe7b64566fb90665f8461348c12a0ccde36954025c9b605f691d9f1e101a47fb467b02147830900a35ca923a3b9d";
+      sha512 = "c6837f6ea7b023a02b8f7087955dcdd9bcd834d0d4a46eae0cbc05098cee2e039cc053497f686fcad658896697aac60d875eeaf8be12b2cf34403be759cf5f86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/th/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/th/firefox-67.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d99b4c58e299cc9d37ef0eae150e0e3278721b3c0c6ce217c7effedd3b8e9fba485def0c1cd0c42b48c7cc20721ddbb02380556aa293c1f7c013df5025eaf5ce";
+      sha512 = "53a52d76cd55f0ee8cf2361868a3c2fad174836e5b947c3615410e54dab19e182a4f08a4c9cabb206f684429ebe8c692a3dbae50790ebb617031976a0d210c1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/tr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/tr/firefox-67.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "33aaaf9b93b51289a0b8ffd0896e7275ebef83e8bb8eb907f67a585ad02793de1a3ea3d370465fb5bb401cfbf57f0088350476cdc374a98be6c073cb0724f581";
+      sha512 = "4c48ceff4d62193e22323687e82761b37f810a5bccacd0679eb248d455c7e5b12e0677b496a51df4557c89b6e1dc846d32738a53b1ff8c9176249e39ad8e3064";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/uk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/uk/firefox-67.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "802c1a1fff2f734ee20d57a2a23b23d434093648b3bac802f4509e3c8094321ab3e51600a516ef6930d9eef2188f5ebc30eb684c882fb0f38ab94fc3b80a0b31";
+      sha512 = "45a9e335dc561ba8dadb8e15aa1aef620fa64ab0b4bb985b9477542eb457d146ba87b4274890edf3587d45bc6ff0b6b56db01134abf8557c8408d923be8e4a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/ur/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/ur/firefox-67.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "9e0a5f04a705e674e4d5a4c6e087f1fd8e6abaf6a47086daa838fc0def6fcf93e4eb0183d4214277a56a790e11a29c4ab6ad59bbf7b0cadba11ef1527219365a";
+      sha512 = "c56d697fac3a76209dbf031e88e02d3018ecb3fd811771517d1aaf2619a182238881419fddf08bb68e239438d969d8d53c243f3b204644d8543ec6372bf7f52a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/uz/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/uz/firefox-67.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "edf763b76602aebb3a77776716ced9429b5a15836b6a9a6db2bea1d491abd94e1bf8cf925f23c18790bc3383dd92d91d0dc8c081bcf3ece24042c0fd8e7549d9";
+      sha512 = "c7abcece9858f3a14c7c470a96fed65820cb417eb99ca7a2ab33abbe1721e4d14c6aa7aaafbe6c5cf283782113fc1d9d8f13cd86b16faef1303f5f0aa3312deb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/vi/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/vi/firefox-67.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "b60ee821056f890de4d44dc3b20a2c0fab0a892936e3d5f5f77c9e46c7743b841c421b55dce6c69d97f4270c911d5b489d0b61f23101da70c8dd52a0038835b6";
+      sha512 = "6ac3ad94a985f3367673620ea94311c60b0a43f1455dd232b811335f75f78963bf9c2b4e6519436beacb1c40ed3065c320bec048dba925efe8dd2bd3e2458609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/xh/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/xh/firefox-67.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "5a52fb8e49ef6824c2c95bdf472371cb2c95d5c6ee963b704196cb297907b91602ea0306fdad2bfe84716c999976c242a257a4c62b8b4b28211217b7790366d8";
+      sha512 = "c18022115ee3121ec5a29a7778ed7065ec8552e4d65d27d4ab38c31684fcb2169ab9e8158a861abcd27a901b51c006c528d65d8f7d6a8cf00fa990dd310dd2de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/zh-CN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/zh-CN/firefox-67.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "73ca694ffddaf5298437af312fc4d13f393aab300a5a3937390766275bcdecedeaba6b751afd67dc31d0a5472568c4fac99ce31856f4f1905739f49d9f81549c";
+      sha512 = "4f2688557972fd281607b25b15636bb2e89bd034d9ac2d647b4fba8e8a258ada3bca32ac80f3f9f49909aae52f7261e5c39981b66d86ea55f058f06c4887e2d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-x86_64/zh-TW/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-x86_64/zh-TW/firefox-67.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "baa9b532b1e4cdce439838bf5630bdc4d4ae625c4b643098ef1217c7ad34b4d50cef21cc048ab861036ad5be5a9d10ebe1b9c288ac524f17dcbfcd2d4b82d76a";
+      sha512 = "d2263f4c8cef29602c67d01758b18e22d63530f093c8d39b22ed556b2b141e135c94f51087313be8677f20b9fe63930ee983c50691b59498ba904b927c6678f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ach/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ach/firefox-67.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9aa1a72a4b75b506ee0c7c12a0d35acac31c25d777488c7e01aa1f84fb14aee343ad9e9853ef713dbe043fba5a6c3064bbee7ced63fda1bf3e4039d849d9e923";
+      sha512 = "f20d308d540cff62b153c8592eb26f16cf45ddf2554c1076c7239c3a63eaa0bffea91e11ff130ae89432a79159d30c5b501b9577bb6713c135925dccba29c10e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/af/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/af/firefox-67.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "074c20c4d78313899e990683d2ba51c251bf3976a6a3f1f7027e9b9f7fbcb1dd38b54bc51c11dd3bec831c7999effbd0548585303a35ada8b5b7ff729b924d75";
+      sha512 = "a2e9c7d9aa7799506aea57c39f7c0a8d40f5e371702bf3cc4ef1b34c59edc4791644f4a27377198b72a7df2070af6c32e1b607b7a11469e1fc680f0aa4bdc042";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/an/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/an/firefox-67.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "0b3b62035af0eb3cd52c0d011571b1ef597803a4d6dba2b9981a3d851952b10c8532f5e90e99d2459eaeeac1d4bc8cc45a6bbbbaf34642525aadbe6e6db0fc4d";
+      sha512 = "7a1b8f13cb987587358a193c2242de334a93bc4727fa97566bc62726370217522a5c705324044fbba134752835e5363ef7a21f7b62a2f4a31df8a755b3856ec9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ar/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ar/firefox-67.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3f393f8d0f8f33675de96fc1987002c90df3b376f395e9abbaa704c46ab35b93ef91e128f9e54e0e3a1d39d6b5e307956c30650874e78332f7eb786848b028be";
+      sha512 = "a17a8a7f7effcb4fd6ba380c6a7405a16d99a9edfd56c33ca60aac0d3d0d1e03017636f5ee6f80d621dd69e16ea2b52796e3e0c299de9d52cd2f4b3c4e10dc62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/as/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/as/firefox-67.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "703cd4f07cbb80fbcd82e810d23e9b84de9c9f2835556afef0fe9777c33196343f1a21a99ab1f4056f4621a5131a6cdcedd408f4446778da5fe618d755f60f25";
+      sha512 = "3e723c42d9796b59237a50413c84d760520706d6ef071218fe512766b662d3d22b8e1228d9fcc91c1a140f3ad4ecd4b57719ebb38f245a5f272536575841e11f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ast/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ast/firefox-67.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1fc80cfd8a6f26974cce991f58271fa736ad0984e6a4da75ee7891a6c723b4793d4a4e72fe44910b718acaf3ab983b71ad6d2b8ddb1c79facfffdf823332cb7a";
+      sha512 = "59ee42766f8a1c5e5c14103659f5a24a1f7f1e10d81fdbbdfefc968ffecf99a222edb393d933d84581a42d7ef7557d3b7f5c4bed6946d7abecfd190b2d84eaa1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/az/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/az/firefox-67.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "c4364e417125cd2cdfa13d6adcbb7d0363868bd956ca1885757071206dc4f85ad2ce0b69c44bc12ac65a16e295ed9e609a6ffef7469ddf8f1d1b4f33e8eae0b6";
+      sha512 = "15ad74a16bfbee2af34c68af24736188a71990b6dfdf319f2911784d85eaa4f5d588d1ac283cfb9535725afcf993375ac886c971197531c449ce5dfd3195f2b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/be/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/be/firefox-67.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3f19c71194c3b99d093df0b444d76a307b54512f992021c99e71d046170022a4083c811ee890556e946cd7a6672b1bae376a7ef9134494baa39e11c1fbaf08fb";
+      sha512 = "869736953ddaa5a6773d9b35f4cf2e2f3c6c2c3cd07fc390a6dd5d496e226693f050746d94e778861a9801d0315ddf9da62b9ad20d4f06043c5a1fb11bdea23d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bg/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bg/firefox-67.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "5e1017761fd9e543c36d4a19e8f0e725bdc680110595a7364b69b24d431a54ab4858f17a99f02ad3ffb7e90ebe615c21c80c2142f4541c55f1f8878f62a18a10";
+      sha512 = "470b3624415c317b06f82cc4dca2a738962acee5cf7fe203b9b01dd92e7d9e7dbc8a8f3a427fc831882bfb1ee11c39e66f2f13eb483f8a9cec5b19bfdedd165a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bn-BD/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bn-BD/firefox-67.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "35c2a51f4ae58246f2ce212205ef54284a8aeabe67b47480229220c904c379f9830860939277dafe54b6293a71c357fd696065cab6bf2e08f4986cae2a9b51d6";
+      sha512 = "6ad552eff2dc42ca8ce84b547dc2e4f79ebd1922e95f27737dc6380329d04dd816fd3ae7c0938c2468ca4d00e4fd76b296bfbb0a5251b1c3ce28b8852efe79f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bn-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bn-IN/firefox-67.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "e60380605bbda7f8942fb4181d3b6c69da7558603229861c20ce7a9f1ab77c1f1f75189dd65541798d6b8b27b1722be0d8ed3a7fd5cd68a546f55661309f903b";
+      sha512 = "91e5e4c4e09ab660a3f4fe603dee03217fa663d6d7252491fa0b0d350a6cc6fbda9e4ac95ceddfe3634d9b1117558ef0eacbaa66c1697fa7f1cd7fb46b2c8bf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/br/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/br/firefox-67.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "d2a58e9c8970ca5e2c8b76c8e59e4084f9cc12d94603c3daed086e107e195c5b0187ff4cae4c3c1fca43bad9cc0ec8408ff058c9d7ac3f89a998f93dbcabf032";
+      sha512 = "92f9de0e263876a5c322b5f161a97969a657908a06c32a09bbdcc22eed696751f2370881c94bcb46850c31782fd7e1c0a5eed6c717198007ccd808dacf29ced1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/bs/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/bs/firefox-67.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "d651e2fdb17d28a05552740337230526b90ab341dde440a91cfaeaf42b73ac728b9004ae8e3fabea3a2e59d3842d681b6d16518919e77e493b26d4437770c672";
+      sha512 = "9019a42b4e97a45e4b4d8196a06253cfcd8216093df4918544f5f85ef6d2fa332808a545bb76151a7badedc684fce1817e4bf322d524fa8f5487dff9e4cfc0a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ca/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ca/firefox-67.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "91588258072187d2af65140dd788d1ea2cdce3e66090be350d93f9e1606f6eb82ea952e5431815c88d4629cdf5bd446c6ba0a1e5f26b4f83c013c568cdc55d58";
+      sha512 = "80ee22f52d97e8d0c6b18cc766555423b681fcc01bfdf8d52babebf985f44dca59d0405bb792649d3cc3fd7ef9461cb1fcc32fa0f60a6599aeaa27b6fcf05595";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cak/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cak/firefox-67.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "0731080aaea48e016df2bdaec019b3c0bf1b03d2912a801f055bd6bd237b6885753b71b11cb7ea726a6391eefd833434d437de6d51f2cd0be6b3b3911f2693df";
+      sha512 = "3fa0fbcda1d98b4b507e716af052cabc3815321064af2e9e71af10281661bf46833535d9047418b6e5ec6f62c5d79f3739b2a847382332274549cd07c7de09f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cs/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cs/firefox-67.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "a8bd3e4d8f292928260a993f7352c1ea4ca9e2a86e4c5b24fd29a6b857ccb4a3aa80bcbf7ecf8435a5bf89927b1f6df681d225bb226e2e5d6c76576c44b05916";
+      sha512 = "7432adaf3f484c120ed98919842201d71747d8803fec499aaa5c32343ed7c757df554e9ba7376c48c3c7a39358d9ab6952bd323f17b829895f0646c042f2b518";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/cy/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/cy/firefox-67.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "bb7ea5154b1b6a860a5308388caac7f6744f7518345bd7291d3a42c08dfcada992466fd560ec3d707b5cacadae8e23ca683b98330a6205c3c9c3ccfb662000b4";
+      sha512 = "bd48af052d2bb0c1d1393cb4994ad9d76aa8d5c5730c442af59e8790ce40095e1d9721da552ed07c5d71f89b8a9ccc8900fab2895bd1239768589a51db7df92b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/da/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/da/firefox-67.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "7c62c16b29d62b55dc432315667706e4fc4fb15343d79dff6147c9c49c4106ea8a5c0efb0892d41f0c5c92444b0818bb477891f6d86f15ea4d7e74e692446636";
+      sha512 = "320b32e030b6e674763ae01e877a3d665150dac077bbec32281557930fb4b1cb17176c04e4716229e649088f40ffc2eacde7229fec178d34f73f0aacaa89d519";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/de/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/de/firefox-67.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "350d7ed17dd62cddf6fd75b5522067ba90bd8f17b63cb2e09442d1f8afeecc9aa3ce6dd033e5c26ccad0013d24195d869c8e611e58e089325e72348565e819c9";
+      sha512 = "afd1a42ead4d7b25ecf2e74f06642485eb4885291903d4799a252ef63d555adc847525aaa0670f032a4b36c28b7b14b1ed91ec7c4450816f6d222b1688342079";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/dsb/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/dsb/firefox-67.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "590d98484c5a26b8597d0d91eb674a6f8ce3dea40b24e4848f468a059f3746cbba2b198239cdf23c658afe7ba353091cf0adcc7ab6e5995c023d0ec0d9055c86";
+      sha512 = "b6984f653dc40135f247e306c3fa30c1719170ad54af5514a0a1eca57292a5f5a0ad918e30ff7fa0553238b34dd2d4d00866665232a8b2c5cc405bcf934feaf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/el/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/el/firefox-67.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "67eb4433df99fc0000039c1fce75dfcd3734f7f0eb153b6e2f02bdb2cd403c7ec49aac11ddf33aad3a00e6a06481b89e316704e05171a71f761de75603842c14";
+      sha512 = "69404fed19c796891222b368d46d10edb011e1ba9dd0588a8d855b31bb3b57d15d503348339119e8a6b2509a23201b77a8f53a9a1c86613496a8e4afdc3b9ab6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-CA/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-CA/firefox-67.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ba27e4c47883c1d0ee39fc9c9d96bfb818040dfceeaf91003176558373932b7ccb23c7a34cfcf13e8763e4e9b7a271e103081a7b4a60bd33f0b9a931089b782a";
+      sha512 = "9c32cc27dd06d2cb119fefb3e860acb05c58a7ef8d4dcc7e6acb0c8d2bf6b9db5685317be04ccc02117b1b25913d5b0d9f8e3ea12afae2f24ecdbafa37eaa74e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-GB/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-GB/firefox-67.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a4628c68314b5c4e102fcc6a1b7fbeb39ae301cea0d0b08f9bd5d8692cc56887dec7f05643583cf1ae62bcb572ff435d4e394d0c09c0e1ec839f351b67b8594b";
+      sha512 = "1a1691555f2f269e42bf63331e7b635fe733651ff2786446f643b1746e48ef3f6f30332b1a3cb9309e183da65f9dfaf9347acfaa852360dbd328d4256c5ecffe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-US/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-US/firefox-67.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "242136fd7ba32dee520366427234746e596c278e8a59fea70db08105944b50403c078219ff5f666212a64ee818ea2d68f15b5afce710c6b711ed763ec1e6f17f";
+      sha512 = "06e78c26ce3cd5bdb0c6057606a0e93530511f05ba2b2f35c7d72dc950412ffbfb4ec924bf989578db450bf73748e9e69ab080057e9f4d4e95986c299a46eb78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/en-ZA/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/en-ZA/firefox-67.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "89c958976906b2b0be42d6efc9492a348cbc0cc81bd316a2496db8b9d0705c2ee894c58b1f6d4143642c40752d110ef89392b1a689e2cf641839c66b650e5d7d";
+      sha512 = "298fd0cf1156c06ba529ac7f5f64ec8c9c0dc98866d0f93305c2adfcc2e9759fb1607a87dac01665978baaeff1786b253d483239f31b93ffb1e612d0da867c04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/eo/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/eo/firefox-67.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "dc9ae524c1e504a18890567c8f43141bd68cd34d0808516b3d9cbb039efa7c5da5ea406218d0cb9ebbadbd75c72479b181b8d7b4804a9bdb77561d1a1b88b426";
+      sha512 = "5b0118acdffb6e23b4aa495b52a76df4f4a045af804eb262e5d30fe8ea18ccfb9205e942b8f8a0a1e899a1116ce9334e0a68bbbfa9229bf82c755616d473c791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-AR/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-AR/firefox-67.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4b2ece30ad452eacb7fa23f046ff72faf938549e80f794f898d055bc78713b243b726d6839c4398a5a96d04b71512259b341f1227bd3bc9be6c7411ac34cf6d5";
+      sha512 = "326de324c14199db72b8da5fd8b41ae00a759c87d1144156608dd7805c09b2db7458c007eb56c8bea2e539556130f514c7da7cbb690ca0cfd2b7ffb512203579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-CL/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-CL/firefox-67.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "141b1295ecb2d9f2aa66bb61eae8ad905bdad95cebd23274728194882fdee154e9c68491c55f3938d33b8e85d984d8f79bea20c2f088be223790f07a39708111";
+      sha512 = "ceb38eac9c8e7ea0dfd08b7030bb817fd4163cc323136c6f28b1a1dbdce72af0e52e08940cfe05668ed9bdac9af0eb2fbfbf85cd7b0822da7c3def405066dac3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-ES/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-ES/firefox-67.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "74fbbe970da22d4a1bb3522b61787ed00b41d12d5463ab7b61797f7b0f07c8276e1366b23b575eb51ecb1b0a31e8aba2513db7daca25541a19e050f7c0e86f1e";
+      sha512 = "4f6f90b9f4d7faf7ad4357d8b369ccd7f27dc3b91302ed7e0a72e3a2497f5685fd524e5a02afe61c6b22574ea5e49a5e98207d5209b2ebfe0eed2d5e48eb7a03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/es-MX/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/es-MX/firefox-67.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a4ca6e40c08e4fd3d38840415e43c36db682cde3f5b0e177759d192ef9dfb7365f946ede5e30fedbfa27f07c64696904cbc36895507832390609ef1000e7d075";
+      sha512 = "5e9e1192148674ed5247003d804608fcbe712da60b32b21a5ddf538e6e335037117a133b72208379fb5994a5d4377c52c9c28f9fecd8269f9227066886dd4206";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/et/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/et/firefox-67.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "36b9d5ff3c88c29c2960b5dce898775b581646f1905a776b95a57288b5545ba132ccf09a1d80a12666936dc63b2d738caf8ba9154181f065959a1169e752b0e5";
+      sha512 = "ce7db1c964fa4a52c043e1e8279e3f16b84a216dd0faa09fa06a602cdf4fda7f856edde9ab250ba27e7fc39f631bb4f22f9f9439f1f177d1b167506b239614e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/eu/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/eu/firefox-67.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b63283de71fa0c871ef779318582959c440a6ad85d85997100db97b6ad4c10f280ffa1250138961aace4cf2549314ca63e637b043ca97483afc087c12c1e12bb";
+      sha512 = "dce4c457ae6b74d571a5adbee15083604b1e900d6cbb2180da82f6401d0c1ddab161b33811680204c5c7eb288077e21985ddcf0718b9b1e82d787399cd76ee1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fa/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fa/firefox-67.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "13359faff88883df9d31bd8c023fdb5b829056c4512d0ad93e2045ad4d794f1d979254894b46ca5d3ce65da48db511a60b1abcef2c4f1203d8c04aca5f8a8abe";
+      sha512 = "12385d23ce72f5a788d87cd90e33cdb45d45fa5a0c5b9157078c03200fa4a24a595e1de664390646e44a4abd3735665e05c27c391e95c392a606941e71adced9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ff/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ff/firefox-67.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "7ab6fa4f4ddc14cdfd0729279ccd70b15ee7897ef99050da12899f51fe1bf3d7dc10c98bd4289ea5e5d37f5008f3d7bc65d7eedea322b7f06773b65158f55058";
+      sha512 = "ceb46d75451d2f3c4f7019541febca272478fd893ff41da6218d3525b1de8feb0d1338a5ab77f25a87ef1d6484386c965bffa91d6580bec9830a23b2a16538dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fi/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fi/firefox-67.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ddaa45e8f63d430d71fa1c8ce73dcb94dc825cfadc4ba66a123be26b4724a26618201a232e4145e0cd2890507b51482b496bebf0045fac18efcf71aaadb88c4f";
+      sha512 = "9cca9064afec459cc2649ee0a19a18bf8e91d4afd141c4a83b7ed2e337c6bfe1c68b48ae8175e73b55fa219909161acea7baf885b38ef0304566c3860e4835cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fr/firefox-67.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "61db58304811d1682f1d90b8fe72f5532c0714666afa3fda14b20eaf598c69e9ff8e1272889e940fbb59ab9590f505fb8182ea49068831c59250980c8c41e49d";
+      sha512 = "018f5fdd6fedf4bf860b677491593ed10155659d60b2d3af2d0fd187fc790baa1c87e153facd018733e6443074e7003382d7753d056a2cea5b8adb6f299751db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/fy-NL/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/fy-NL/firefox-67.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "fb06d991e3e1098656fb2cfc4552c848bf39efcad2afd6b3764b12646a1edf4bf6cb74413600a50416899feb27c1c5effa9133341cbf14dfad80310b18aa122f";
+      sha512 = "f010f5b40573dee3108912ff538dd4dec9db1fc1f6817d8f9602a0ace537fa80ac0e684f3f32c006b10bfae8e3e65ab8cd0c25ad35e7f7638121d2f758447f42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ga-IE/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ga-IE/firefox-67.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "1465affa310a6824e7edc77b809f41b966f94b520ce63c10a36d3b604c43c3ade0d6d66c86cd863122fc2849ab5b037c5d3acf7b45eef83fc704085289d6b060";
+      sha512 = "d1333c7139433a4b330ca5d93e6e773f623ffe7c431f4f02dbc64be28f388aeb77fb98eb593c01705849d6ad75c5f3bd74b4beb9b5dc1f95816e1614aad8ac66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gd/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gd/firefox-67.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "1a77d9844d1aee49b8326c56d1af240b7970e26160c3c49eafad8f1079d1e318e7f8b832ae5d7a028e1d1d1585d8833361ac145343d24b3042576a84acb0ee4f";
+      sha512 = "4f2a6b7a8917a155f8e8c36041695a7f08f561140f554f3ad9cf2e78583aa48d5049080da1bb00f5550918d8d5999ed8960ed5c0b12e98882efded12467ddc69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gl/firefox-67.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "a6b8ba633be33220009b4c2b25dd2eeed7cb4d98df352e467f14584b7ec66e13aa20a546a222973a31a3e2458967a98c7ccdfd9f5d88cd44512ee79d1bfdff43";
+      sha512 = "32c88369a8a6028c7a20b708511b508dcc6fc1eeb99a52af4437721dd1299eccf28822343e8934c1a230e6e9bdf84e6a148fe7cc83d9477e65ac51bf477a653b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gn/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gn/firefox-67.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "f7e8011aeec51f623e017bcb5b562504fdaa79c081854972a9626f22360f4517ed6269463394ba604581809df3d7ed7cecb4f54140960a832e570adab5674c39";
+      sha512 = "e603801478d85d45431147189b84324b6ee04c2be1024a25ec492706dc91e76d13c7ce1da31f96a81e21e6c067efc48a31c5c3a121eedfbbc326545b5997ad3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/gu-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/gu-IN/firefox-67.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b91d13d217c313ab0fc35e46acca44f9729c5708db71219dbee8ebda272f74a38a73d60cad7b4865121f8dd4cb55b85abd4c6417e5167223dffcd4ddc6c5a17e";
+      sha512 = "0f0c788be9fec191f195d87762e4cb91d8ca3dce4ce35a9da1cc9fa8271456960be6bf67bd8135d7f4036835df48013507233efaebf95244ba158a18cf81cc09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/he/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/he/firefox-67.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "13483866dc9268597f74fcfa5a7bc111c65a7ba6e43f90c413c80e1f4269228a2da6cf2f60d39df4d9aea932ece8c0409ffa4406f9f562d79a86d563f31acfd1";
+      sha512 = "5bd2afe767cc81845835983469e5d5661e57131df7d26104d740dcec27026bdbdb02372d8170ac23f67982319fedd3e6449a7f06070ad1957526059528084a43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hi-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hi-IN/firefox-67.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "ade837f046c513e69c1122334b65d9aa4dcdb2e3faf1c8321192f76173b404c51bfdc97bb802e91df22dd2ad4342c247450b4a30215e94cd9604efe926034379";
+      sha512 = "69dbc6d78da4d44b86ff571fac073971e4864e66b0153040d29e5161102202297805a8a2f2e6d17074b250ec2782d9a32aca146992ffc0198b9dbb2b96a23761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hr/firefox-67.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f29d24bcc1d2624fadfe22e4ef9ed901799bae60b88808597f4cdfab81f66f3ab5fa273259e640b7ef628c7e638edf33c6bc06d7d883c74fd4d28b9beb4e62e5";
+      sha512 = "a2d0a1293d38a98ad9c3479f8a6cb4ae4da65a3b3c56f5730f175be710a867e15ef83fdd08f1d98df0e409da270de1c3615bffcbcbfa6e6ac1f161fb8694cce0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hsb/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hsb/firefox-67.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6a771b8ec7e5d035f7964f14077ac9e6dc775c44980607aa4407d7760ed947d78ec8cb46c0b8b3f5c4852eea9da1cfd8d0a15acc2c785f71942a073c54cabeca";
+      sha512 = "0ec1f0c9f7c0e9ef1204b17426db09f623f25cf5816a91753d171732b7b027a44f977a2bd2a38be3c2f22035a69a2438430259636c0b38c1e276f5b6b21661dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hu/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hu/firefox-67.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "9022917ec678e4c384bde266baba6dc3df58ae3d38ada07d896b6409d51ea74dc3eea29469a236210e2315a5722e0fc78fbdaeba6d0fde550b77a1bd6debff31";
+      sha512 = "7adaac028742223a09c598842de5fcd34524e93b34b602d2307431fc0be651e1e081c06804992e878ecdd100d1ed15b3a83ac664b59709eb7adfb75ed3de76cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/hy-AM/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/hy-AM/firefox-67.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "00bb4ae4cda93e8b9448db36cc3e61da415dfe544cd9b484192e5686492b0129f5b350aa48e8cbef9bfa843b273c3cbb9f10e108098d2f5eadcc52e848b617a0";
+      sha512 = "01c327f71e7dc09473c8dbbb2fb61d054b85431f15e4ab5b5759508b8a5ffa9c018a17c8fbdd927292a710ded9e49c0223661dc26a0e22f125ab4ff72b85ad9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ia/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ia/firefox-67.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a54a7ddfc99fbc63e4d9d18d15f33498734fd083436bb2909b0902298baf1042e77f8f59bb6e6dfc033e65f2e9c71a310947f4f7ce05062e8754f51644dbc459";
+      sha512 = "5e144cdd7d21cd9c94977ce0b9374e8918f67ef84a0a8f8d58d1ca170fe62456587b1f6d1a208329e3747708b19a3a647adb53eaf28e8f146f1c3deae00fc56a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/id/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/id/firefox-67.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "747d8532c45efd4311be057131f5a39eb2d8ab8ccaeb4dbf3966c9f2e175a237f5e87f84fe00eef5203f71fe2aca83d182d308d3129b1146a3e6e2c0b2a44199";
+      sha512 = "b1ea8d573395e06421f4c74c796b8fa68260a754eba0642c5685b1acb8d0a13c87ce001a0d7da43167223f1fa556cf24681bfb271840ce7ee3303caf2d355e5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/is/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/is/firefox-67.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "d4d98317d4f39c76ea36726e668edf1c2519e70628b3a5ac6482156c854457ef26e0ccf981d31a5b91dccb1af5a87f1c7aed4ce457932e74f2363e5f8fb110e2";
+      sha512 = "07055c68477bf6d27ea708f043bcf0a14da5f37e597c36b369129791ba7373351ee8d109a89faf7e8aa2645a6282bc03c4081d04dfc615d98aa1c45899fa92a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/it/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/it/firefox-67.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "6bf4cf809212c12160617a915fc6c0201919177b81925330c63a43f4e370108b4bb6fc6139844f7509367acfef7660eeeef03237cfbb0f9699302186397691c5";
+      sha512 = "da3af727771c5a3cf483b4179d1a7bd51d0aeb3446d04de2bcaa520279f5ed6c442b8ae476d5e5362e7017b97aaebe944e0509652ae0ea116a658f8bc42cdb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ja/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ja/firefox-67.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "870c4b627994d0a701cfaed320ea8ec81974954f2faf3a0d3431e9d211c26f3b6cc73b476cbc699116a4c8760aa374030bf8f7a55a2985c0da72f8476cc6ef16";
+      sha512 = "6640a635b112e01e57f36964a986cb62562753a5b598b5e3474d8a4dd6d70350c989d82e4d07ba3c19878617b97981ee8c2477618282089ec49bb933f6057bb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ka/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ka/firefox-67.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "7775bbdcbaad31acb2bd0151267d30d06ae2510ba20e3a1e9fec8530acf409733f562d7636dae8ee65c076225aeaf5417e1a1148d48bee4ac1eb4faced828a0a";
+      sha512 = "248da01a4a5841bf75af3abaf2c463abf1cdac17b96c1940c4eed6e2c11f0c2c02e5e99869e125024371436298e473d86456fc0ebc28e7cb16b8d233cad5ce9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kab/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kab/firefox-67.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "154e422d2dd39dda6af42005d2510aa4cafd718d4069378141cba18fe5c1f077700bb73f6421481b77faae9e714f1651a38b904a5e7aacad3c19272d31d49485";
+      sha512 = "9d7c848aef22fe3206fb78f554dcc0a9012b5cbd28924aa29a2145e6fdb985c56318e2b33912493d0d01d1984f8cc8487a3fd924af13b85cfd38cb5744c8fbb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kk/firefox-67.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "65d31621804fc3a05ea35a273f8a31c66882d77c4103168098abb3885a45a02f94d31494c29684b22d9a3ef43fc67d05f3bffec6ec53a6d68afd3b9e4cc82585";
+      sha512 = "a94acb2fe325318a5bf6045aee6ad7f5025b53f94615db91dfdf032dfce3f14f8c35aaf9cb1442f47aea808a001323dbff78cdda596d981421d7c7e9fbb2953b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/km/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/km/firefox-67.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8508a0dbc8338f4f306446a50a0dc0c25bfd5cd971462770cb7221bb2eaf433d5e970bc68a4f0b28be58ed959b5778529d8d3600def1bbdfd23bba8efbdaf0a6";
+      sha512 = "a116af962afaaf94c98de70c0ccf8dde414d4bb6e0256d7d69078d2b3b85b44038a0eb5aaff4d6bc630aae2a96ed8f51295fdbb634b1f9b31b2069012d90a9d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/kn/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/kn/firefox-67.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a3951e200713ab79880b304b9c7ade80f6fdeb558de5854362ed5657efd85b752306dd5f4471e8e9e90ada22c5b1b99e432f9ac2cf0d071ec5f6494b0c2bb6cd";
+      sha512 = "afd57965e63c525fc5384108977465a8b90ab47ea6e1506142d05071fe6f0089588d4ded589995db0a743000b168d22ecbc74aec6e669cdd539620088681b375";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ko/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ko/firefox-67.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2385405b5b46c2ad06692b47c440d40dd571f7c3c84eb14b7eef4317b983d05c63e26d362d40bab4381455562669a745be6edef2c6c03106f62892288b315470";
+      sha512 = "09f26513b65528b903e6728fbe10738db485abca4472187dcad725f0ca4b77060c059d3b52e68dd932f92ac9f321a27fd6a82d427873dd336f4dc25981d08e9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lij/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lij/firefox-67.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "ff14d7416d28205940c4b47bff8d3a938464c1ef4240751adb9cd3655239f94375845eacf3c40de2f28f35e207e12dcffba61cb38161eea22ab1cd0d4e16d371";
+      sha512 = "1b1a24f1a4928bed8ef833655e271e6785ffb9fb7efd5357af12e1b6a1680e07abfcaaeaa43a2aef08e02d802099758a0e689a8af03ecd2790423ca33f62a230";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lt/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lt/firefox-67.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0227e707fd7da06022965c61e8c30ebe4584a1532ad8d7da8f1228bb506a4abadd40c73a4752d81e3a6bf289363081185a28247c3a6ec90b69cae255b7aeccd2";
+      sha512 = "8ce739bca4653c81788529ba03d9b6bbb253d60c09157a184ffe3c4bcb8819af0c3831d5ed71ce32084c257d17487fc23ccc9841739e9839a62acfa17f14ef36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/lv/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/lv/firefox-67.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "4b15a19ffd61d8518784bc0c0336504de0db52f059f72c88cadd35a9298c6c29b0c27db603c54f3b155289a2dcf5bec6f03c642a9253a93be7ca9df0a8bd6630";
+      sha512 = "84542ae12dc18c6b586b43777ae0f3ef29584bba56d0babc9220c755a010b2ca138894ffe9c566f943c9465938b36a8483f5fa3e61ce750da5c556fa3efbda12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mai/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mai/firefox-67.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "5c087cf79f9789a0bbf09c15cefb98489f4e92cc0ad229cb620571abb4a0373339eae325d51294e0ade233495a6b56dac699fd3a75ce4cf5e338ab748bc4542b";
+      sha512 = "9767bc1057b6194e09c94d7ad96d62d791113bd36ecf518c581127b32ae9baca790fbb39391bff199d6d62fec12cb6fc047d52d70469463dfacaa48a12cae76d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mk/firefox-67.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "c7e79d5175ab69601b6b83a6725ccee08aebb956dfed7b6668ad31aef4aef2715687149ec9a5eca8309948d9b5c31927c1d0aa1134bd039c6be528b1353e3a3b";
+      sha512 = "3a7d5eebb65992be8c71998c5c8ddea9fff147492e51781d85aa50dcfe45184911eed787be93097555e71ee7c4dad7df773ab86c10f41121a840c7fc604cc744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ml/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ml/firefox-67.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "39ea6a6cd4e078ecaad5c9bdc2e4a4e61e853bd87ff77c9c3f09383c7e4222022ae0aaec2f6a2ba09ab255c588493fa0f4a219d90fcd57e7d525188278eb761d";
+      sha512 = "15c1407419022c20f95437aad1904e23ae24a2e8b82101b0408f8cea1096d8973c354a98914c927375398e7d643d986c0f79bdea47152b8ee9fe9b14521b66a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/mr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/mr/firefox-67.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "f10546d51421b0a0566cb035807f0b577bf393724bb1a659b60e3239ec2164bff84e38f7344dfa4b5c264ae5f852882a496551e7e50375a7c0ece299e23ef9a8";
+      sha512 = "d6505da2a2686d4ca08eea71f6eed0079e30479b80bb3563fa8df023d7f9fa0bdc0fcdca4076730506ffeaa12eb76059b2586571ff9a9f09e8be94ffc303e218";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ms/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ms/firefox-67.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "13dfec3a0d9b4702c2b4a36930b026147503e96f529d6dbb572a63c23bfeeebfb6b32c5e3dd164d8b958cf6dcd1f4723ad9559b55e739d0180663eefcc154c20";
+      sha512 = "5758f944f8ffbc464a24496e789eb228ec70fdf1196101a8880376fd04dcb03d3b197605d05cdef45eebdb4c1f48fe4741990fbe7f451c3d14497db748ab80d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/my/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/my/firefox-67.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "27331a17b984970c7dfcbbb70b52ca88415a98423a2e318fc09f47fcbc11a15e4d46b93f4c1ec98df5e05e57498697323e4512c3b351082ab0fee5a295ed61d8";
+      sha512 = "2cf077adc1d37b32c02cc2862fbdb243a5488a89dde7f353ee1f0d74e225cca63aa71d4ef18897ab949ca476b7ad9d6e0b54f686f981fd275180f7de04393398";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nb-NO/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nb-NO/firefox-67.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "6aa6cc3c22bc5a2e91fe299a9f8c031968d4cd8b746d7be8746a9406ca76c5fe267eb9c6b6534d4fd3f3a5b0bb58e5e89f83bb498a9cae60cddc1c1f8dd066ee";
+      sha512 = "6e4bf126c03a68ec324da82c840b586f2f64c58b4092b7c16df89529063703060b46d5e419aacb52b494c2125ec7c47fca4fcb31fe61d5385582996d2054c969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ne-NP/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ne-NP/firefox-67.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "c94e55287576a50f1e40c42bddb40f7a58bba53232503c8931c0e147950ca72ec26f5a988158530761eadbe50efbd78088373a97e093cbe58660def1613b7f3a";
+      sha512 = "fdb6d568053d6906ff04410a951cea2c82f4c580a56ead4af811f3a974305b03eed4fa03d733b6045cb4359a5ce8423b0cb44701d2b45c1055c12f809d64f4b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nl/firefox-67.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "0e2ced803ffe66a5a1265fcd386dc332b2e6f11e4bb8d3f73523f6264236a8e0c0734af57274f4daaee12b192464ff8391af5105fce973140b2b464097df888d";
+      sha512 = "88bfabe393482bb1a3945a945ac3388df79a9c1de386ccafcccd3d5590e9bcd0d105b8200c8bcfed06f3347dac39fc8c17248dfd342b455fd19373184271b18f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/nn-NO/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/nn-NO/firefox-67.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f164bebab52bcafbeb6421f554882895a4a437884a977a71a036e10e79095be25d70d62fd7de5f8b6f76b3fb123fe879f11afab57dc24b62f913000e1270c48a";
+      sha512 = "e51fae5d29e084b08828233df3b9e74a0b08bc3f1f6f77b7e13848f724ec98f9467213d712cf433928575a2f3a3fb3a8b1134eb0b1d777a8a41fc3eca80af5b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/oc/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/oc/firefox-67.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "dd5bae84f71c8658511145f0055dadf63e1398875ee35073d80d38f8d9d4312ab197fa64d36462caf6f9f3f8d9460f20069ddec603d3f265e3fc9f1f2ce000fe";
+      sha512 = "53fb6a39aa04fc0344de9c4c55b7d04ac081794cff9dfc53cec7bcd6ffaed84f3bb33d626c3e8d78860f1014d8e9a7ec365339745c06a8d9a1d01f570e1c8fed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/or/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/or/firefox-67.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "dbc8f653c70939f9fc7645470662f6f44571c61e3e4c2043f84589a5ef8f06a884f608a9808f0eda778fdd195e38c9e1f25e33a665d6fac05cbaea062ee76c80";
+      sha512 = "b06021935c6a9e3749f4470fcfd80c98271b1fd2be0938783d377a50313f91387bcaa5bee68bbe217a4af63c89dac639a00f1e3b2382b8d3352d5ba7067b69a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pa-IN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pa-IN/firefox-67.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "a0c22e1b7eeeaff10be4874acdb5dd9057b19196a1ecd73f606a8a5140490db099561d4aab125c90ea87a91a003bf560c26d94049a24ad256a4bf48698e3a4f8";
+      sha512 = "dd2bbedbd02941f6d555beac331da953f54fb2a8d7021d3308a9820aedf505b366917525863d8300ca95bddeb281a15a07b0ea7e866c9efbff63060b2991ddf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pl/firefox-67.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c25686924cab8e24cecdc86fd4e498b3a54e8616ed4ef5f465fbb1be4e8f9391580fb19fb0eac28faa958b2492edba5bc8e8a0a89c5f79f3e54524da386b6b0c";
+      sha512 = "ed450c305893c3af235fa3fc7ccd76abdcf4d3b7845307a98e64c0b864330925b30df66f93a630559c838fe6d919b6aed79d33704513020ac462b2dd81e812f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pt-BR/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pt-BR/firefox-67.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "add60a7e876bc5ed1e27c4a7fea269b2375aed4b50c27f09e73c71f2b454f9df31fbfce5275287ca12aa8772a585cf8d27107b99ddd8f4f7dc8afebc884c1c53";
+      sha512 = "274ebd3f02014253865cf85221e04a1a770837d34395f6f1320fff9f84d91b3d6d216b0de2e9f3756eaffeaa07af14b5cf0fc54c9e4877f2bc2b76ebd9cfc237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/pt-PT/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/pt-PT/firefox-67.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "cfe6e1110d1b2b426bd6c93ed75631d6e8ea80405339c9d3736d3e38df39d31b982ebc745c3120d840e21fbe2fd4aaf599f721859484c112197f52b0d7fa69fc";
+      sha512 = "a0505e46b48f6e474fd6cb73e77012c2dfc8e1b25a94d4c9ecb56117e73ef43685960c3bc9bea157f81d417c9e0352ea12340a7cf6367ebed42cf2eb790366fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/rm/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/rm/firefox-67.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "cf712dc160bce844cb586069ebb2566251054e552f52a3d88065f947e9e238f19bae8e0550e521b54b53cf3d3d0083afdba26cd5bd31b375f62ff8445886bdf9";
+      sha512 = "3b84e39e98b136cf69945c1888731e5d9e47374ca0e0e5b63612cd1b0f9b3080add05fa5a6921805f153810a633aab3b3c431766de4e4522c9f06ce4d6f634ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ro/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ro/firefox-67.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "8b62528602991eed10bb448b0f705180c32179e8cb863654e2cb506add0a2e0e1e052e832c584cd6bfacd951d42bc5d20989ebe1700e9dc077a18d0720a9a4d3";
+      sha512 = "6ccd439d5e9b564449998c43368a69a5d8db8a52d3bc4b4f680f3bf1430d4b5a5b7b49f62c13ac80f9acd925b93e078a1086649ddf7b3685700089e29e7ff102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ru/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ru/firefox-67.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "7905a139fc3d045c4abd6942843e70e8696d336693131eb0145c58ce764fee9825ed500c178244b90aa969be4a6d7b8ca67f40240eb426ed34515795da52a3a8";
+      sha512 = "d63d10a66f6a270dd3bcd12ab22af602a5f9a90558b3ddcfecbcc3e58c0497a48be68c92611c1fc0e58674a4664f9e7a0247072787e4227735cdb35578198758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/si/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/si/firefox-67.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "df75784f36ebc0af036ad33faa58d664dcda1d38ae65739ecadef86f96e3a2f3ca8951df12fdf5db68e3fdd5749fd8309008fdc75329dc270b86c267e8d7d1ea";
+      sha512 = "39d403829cc1982c64f544feebbbc476bc45866f9b72b0e95f8a9e6aab9437f1d7e4a02a33f155bf33dd128d1257acfe0ba196647cd32f73db18a80b8c67fcef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sk/firefox-67.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f3866c218c429b8ce888d576e7edc45a5737ac331a046df7d8dda890e0bbf26604cdb9775d90271d27f727e0122125ec96750cf4a768907521ce362bd26dffcf";
+      sha512 = "47a4638607acf215ebe2e01000f72089dcf269705525a4b866eddf32076a621461ffffae708177bdf52267e348101c06448de8c68814d8897fc044e367e749cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sl/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sl/firefox-67.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "a6d9c0865feca9c7be0c916fca5a1c95f7dcd9c719ccde1bc7fc7cf1d8fd3c200e63bbb077d51c2106b50f87aef5d25d7860e4b0ab17f4ea6bb4a123a7bad5d6";
+      sha512 = "fee01b2c327b2c67c44ee8bdd6de277a2f4c56e4626ad42fb4bd83e1b42eb8d21e5f4c189584c5e9df4b16749bbc85f52a0ad3751f4f998adb131844419412e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/son/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/son/firefox-67.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "db1e261dcf06c28dc012cc8481638c27b043e1f139fa279e4f5b386dfeb0f50bc622b4719eb2cb1303f51bfce269be9bc4cafa2a414615f0fc1ebd6988be5ebb";
+      sha512 = "72ecfbfca6a40830567e5b7d657d1bd015bd354a01042caa77f268496c500836aa9358707eb1e988ae8a33d7c20daa880adea6f4b4be3df7548f8aea9e41a767";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sq/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sq/firefox-67.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c22b22e4536f663bab35ae225708007fa3884e6989ba8d1718adc1d7ddf5b5a8d1978e6a3081c06b7c8f0ac85de76e1a5859a7bec1df48353dec1f53ce9bb962";
+      sha512 = "821eaaa3bf2cdb2077aca4ff6fe6380fef6e114e0ee91c262824a859ef04387d0c42723df4eda3422980b2e719a5ecffa660579a2f30d26874115dee39cdb0bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sr/firefox-67.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a199b82892a3c3d6828c1d56accef2c8e21989fd5b7827bab8d90d11d54fd950c71d3111e40994a06404609c70c7e2fec2b4501c3c3bb0f873be44cb1af5ea3d";
+      sha512 = "5c845bc0ccb92a1ca88f2b18f7a57e4372f3d8084898d432cdbe4386cf9cdb94d9c6d210d9c58a05688a0de59fdab3c4f50814f53d67632ee577d9e4b95da380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/sv-SE/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/sv-SE/firefox-67.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ab594ddd887ae833bf74dc6b70f4c0f25020261baa4f56182fc173a90af2991f103bfd197706a118cc0db418f31f78b392d6509fe788ca03510ce29a362f8349";
+      sha512 = "ffb3490701ec8dc6cba11f6f47cf744d55ea3a4a49d74a0af58c2cd9feaf3bfd95937c1cf401bd105a1ec31c089eec4f41c582d1a17d05dd4210346074d40d64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ta/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ta/firefox-67.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "12c52a221e1e5f797f9b5cbe09bd34d477f7aa041aeb7d8b20a45324a5c9ebf36358e5abab9eebd63f696877af8537a08d4f0ac0aa45521c950a87085840eb91";
+      sha512 = "4287b589b22da8bfee1e1112c1aed8f79b668c992d95ea3913def1eb9c57c1a1bc8e109f99f93b04e100b94303f0b379d6cb569f8d65f925ba6047aa82af9373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/te/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/te/firefox-67.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "9eeef96092912e2bf0208dd1eb6a6fc79a263db51da5085a800076aa58b9f3b8c5da01516f8f08a108e77f02280240fdbe3a20da4300f39c934c242dfa826186";
+      sha512 = "9f2def6472474500d38e2ed7325d22f5af44dadfd8aa713e456df47b38fb2ecbe9a1ef00f1b2e2a35b9e38f9098c532ad53dece54167eb23d0c78d73ceebb812";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/th/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/th/firefox-67.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "3f3be2d5171f4eefd24dc25098ac456786dea0d6b99bae5f7239ef00cc1fae2a09893999d22c9ed6a7c5caffb86193e4306e7a229b3e8d2935b4bb49f489ce06";
+      sha512 = "565e37686beedcb51d104d73b1b06a5efa1c651e3a701adcf26f44a692cbce4d3069a5a9f88217f95de5974943d292ecf2d2d39922ffeef07ebfcba984aac28f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/tr/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/tr/firefox-67.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "daf55b4a04ee9e4fbd71fb4c99a31b7f5b6d32024609b20c323d75a8ec3f76f88388b97fa61d314616dce50c58c1716a1b75269dd599e9d6c208daa6fbe7632b";
+      sha512 = "6c8901310a7352c2f65a65cf59ca8cebdc4db97d6f61f726a6e8b4c8ac21855ead17c5342681d8b8a04cb533d7f00d6891b4366ba846fe5688f633a098c5658b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/uk/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/uk/firefox-67.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "983addb3688266015fb6dd81f1b28d5e3e6be2c2e98a205ccb536a54e586f684d02977e23990c1637ea4115606345c40b622109e81d9d3c666358d05411a20b7";
+      sha512 = "1f1a3c6955c8b1fd38fb478428fd71ec3c4767cc1950531f28262caecc831c703e4257483e3530771fcc830d03e007476de48e6d36d550e59e2e51fbfb394388";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/ur/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/ur/firefox-67.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c73830b65aad9178232beb85232d51d99c45fd63c8edd0449a10cac28131d1c7ccea9957893fbd675481e3bf104c5d44176001086dd7b5f0185d2bcce16a3430";
+      sha512 = "d10a8381fc0a0cb249fd4fd1bd149368ed460bf2d9c92e28c3403b215dbbaab11bd98f8eec8c96d381ebc6721a3a261ae79ad4471c31ecbe3f5357aa859156f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/uz/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/uz/firefox-67.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "31e18f7dc6dd8f2d3e1776a6c1ce15a331c0d6c2e059404f64348452bcdcd7d9323c0922edb2b190816db03ef6d91d50c825e56ae0d6766061a5501bd7818cd7";
+      sha512 = "d46a56a1a272d1d803cb7910875829d25e0630d95befdd92dabbc77f470b65b5e0283738b91e3fbefa34a324131f37eb85fcc99a5a82be59a6c7363b07953f41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/vi/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/vi/firefox-67.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "11cbe72844a1b1f98231a4ab5a1e4037021a1a8a1ddd76dbb7819825ae40f2f9184b1de694ebaf751ce8f4814781dbb74033d186eaaa3cfbf19cfab2a98a3251";
+      sha512 = "b83b27030ffd3b8f59c0fee240b87c23af1ea04652587de62d50f29ea267a8e99024ce07449aa8a24ed565368574abcc483a059d8694a75b56370198fead8569";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/xh/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/xh/firefox-67.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "4790f698b72776309abcf65842caa79badc943fe65015eb0954c9c982870429f0eb66899c210069a41b464e15278f98e756ce27a2573db2568b38ad5baf9c575";
+      sha512 = "4e04a016a50152d533ac3c2957c7a8254b809e8642a771972b26844ff3cc541d9e016c079f56ce44a1474b8efcf1cfc69ee778cb55acdee7f8ac76a937d92edd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/zh-CN/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/zh-CN/firefox-67.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "68d2d7f8bf4c423f8c81e1fffd08e7753fe1cf3e22be95b6f1fa168dea23c7a04a13fa3406cd1f11cbccdb391e8da4a5ef9d32163b6318a445be8953bb7e75bc";
+      sha512 = "24da20d0c14062827db8cddeb4960390f0afc32e7cac1374282e13f0c8d1ddc14a0a5ad130a22083973da52f26b4a222c77ad7b604293bad6badd8b629649e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.1/linux-i686/zh-TW/firefox-67.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/67.0.2/linux-i686/zh-TW/firefox-67.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "01cbbe12dc54e4f23b124adfe825106054840b06b25f91f7c7540303808505c9d645db56172457bae6852c9c88831f3f4a068e06db404ea6f2db9a67f3c67e1f";
+      sha512 = "dbec0311c4709ebc28b4d13caa822cb4d93409369ce1bca883d70e16ec48447e1ced908ffaeac4d89c8b2313b24a223fa21b31666c82777a7ae33867c3a018d3";
     }
     ];
 }
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 2d21a4fa9b16..8ac9555bdd71 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -17,10 +17,10 @@ rec {
 
   firefox = firefoxCommon rec {
     pname = "firefox";
-    ffversion = "67.0.1";
+    ffversion = "67.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "1cbhlbgni08phqqiqlh1c29kl8b1w2sify4756bm4a01hmhfnhgwfa6v88vhzqy9h4c0045g8g4w14l2521k8w6rcijl1nvh14xdczf";
+      sha512 = "289bhd8ynanb2zpclzaqqyz4082w529kcf3fd7li3k4pn0ayvkxfv4kmmhfz4xxrwsx6f489ffcj9a48ckk1czi9kykvj3i6ni0mnhl";
     };
 
     patches = [
diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index cde919923d72..1c8d60fc709c 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "32.0.0.192";
+  version = "32.0.0.207";
 
   src = fetchurl {
     url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0n5m70mz1fa5pgpz1ldqgn6bkr4in5qjn79kb85127wmg8fddbz7"
+          "0v5dlqaapr29qyb2pm57yafnmxdxin7shn1xqsx2sc9xwmvmaw7v"
         else
-          "1q6pjmnw2h8k09va5x64ijmq0kmfb569rwcibwl0d8kylxi97b6v"
+          "0ygxcvn6srjg9clayfri86c64inwidp9qk25hbsbyr8m8gghpwqb"
       else
         if arch == "x86_64" then
-          "1h2ya3szq24dczv2izxy47kr2raiahxx7zvm49jlvlcp5cygxvjk"
+          "1y1c65vfsvapqsl2q6vm75m5jyksjwnfs6f6ijcpg0dmf5f4fypy"
         else
-          "084bv0m9w1v2s4bf5rgan40l1fajwfam3njvgm47ffyg6s0kg1kh";
+          "1h9samf24l0ix6188p940h7l989nwkzlrvv7qdxczj3p62zzvqfy";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 19c7d93b9a65..09e59b100f3f 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "32.0.0.192";
+  version = "32.0.0.207";
 
   src = fetchurl {
     url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0j5rzamyajkiblalqkimx29bwm7yg9m4nj9z7z8hahcywpf81yqg"
+        "0z08da6xhjvsxn9xymcnpphap2h0ydj784ms1f950l84rdl4qrr4"
       else
-        "0qnz383aggm07hbvyrnqphwhd5wp9xbairf908nk4i6ad8wg1x3r";
+        "0d2pxggrzamrg143bvic0qa2v70jpplnahihfa4q2rbvy0l3i2pq";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8891c59adb7a..5401b66f27cd 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -107,7 +107,7 @@ let
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0lgxwb9hll29sk7rpnraw9gfz7f9sb81gjsbxdnmm34y1vrabjv7";
+      sha256 = "160k5qdys6zy5cpsad2rm24ghfc2bd9b9gj3l0159di6hg21rk9k";
     };
   };
 in
diff --git a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
index f8c4d755dbbd..fb36d3729c05 100644
--- a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cni-plugins";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    sha256 = "1jmdjfwjgh6368wwdpfpjm708b0kl38cyc87wqp2f0y9mvvws8ni";
+    sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws";
   };
 
   buildInputs = [ removeReferencesTo go ];
diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix
index ba86e08be4fa..d1f4b4d21818 100644
--- a/nixpkgs/pkgs/applications/networking/gns3/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.20";
+  stableVersion = "2.1.21";
   previewVersion = "2.2.0b2";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
@@ -9,8 +9,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "0hs4qxas8xfwpn8c0w1l89aypqj3dy5wskyis8dq08p6h3kjis1g";
-  serverSrcHash = "06q5283mdafijbczd14whw8fqwhmkvvaa9r7q16m18d96mr1z8m5";
+  guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3";
+  serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4";
 in {
   guiStable = mkGui {
     stable = true;
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index bed5b17a5ce5..e1e851b13bbd 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    export BITLBEE_DATADIR=$out/share/bitlbee
     ./autogen.sh
   '';
 
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
 
     homepage = https://github.com/sm00th/bitlbee-discord;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.lassulus ];
+    maintainers = with maintainers; [ lassulus jb55 ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 76b9a8b24407..a48cd2cad0fb 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,7 +1,10 @@
-{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
+{ stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
 cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
 libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
-at-spi2-atk, libuuid }:
+at-spi2-atk, libuuid,
+darkMode ? false,
+darkModeCssUrl ? "https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css"
+}:
 
 let
 
@@ -96,7 +99,7 @@ in stdenv.mkDerivation {
     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',
+        url: '${darkModeCssUrl}',
         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}');
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index f906d4712f99..5d35da365734 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,11 +4,11 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.7.3";
-    sha256Hash = "0y0chdfxq75ydx8lz40yfpbx8ycm8vdkl5dvll6glxjq5m21kxf9";
+    version = "1.7.7";
+    sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "476826";
-    archPatchesHash = "1vnlvba60hxd5jlh0fvsa50xmb9xgcphdsx6j1ld7f12m7ik68zr";
+    archPatchesRevision = "480743";
+    archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7";
   };
 in {
   stable = mkTelegram stableVersion;
diff --git a/nixpkgs/pkgs/applications/networking/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix
index 9c1aa8f86f69..3719a69138c6 100644
--- a/nixpkgs/pkgs/applications/networking/insync/default.nix
+++ b/nixpkgs/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "insync-${version}";
-  version = "1.5.5.37367";
+  version = "1.5.7.37371";
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-        sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3";
+        sha256 = "1cm3q6y2crw6pcsvh21sbkmh1hin7xl4fyslc96nbyql8rxsky5n";
       }
     else
       throw "${name} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/nixpkgs/pkgs/applications/networking/ipfs/default.nix
index 7b4d40a5a633..54943533b85f 100644
--- a/nixpkgs/pkgs/applications/networking/ipfs/default.nix
+++ b/nixpkgs/pkgs/applications/networking/ipfs/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "ipfs-${version}";
-  version = "0.4.20";
+buildGoModule rec {
+  pname = "ipfs";
+  version = "0.4.21";
   rev = "v${version}";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
-  goDeps = ./deps.nix;
-
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "1xnjn4pcgknywfndrp2zwln3v1msaffhhfiym5mdz543rsxav0yp";
+    sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0";
   };
 
+  modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy";
+
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
     homepage = https://ipfs.io/;
diff --git a/nixpkgs/pkgs/applications/networking/ipfs/deps.nix b/nixpkgs/pkgs/applications/networking/ipfs/deps.nix
deleted file mode 100644
index 181b55d28d94..000000000000
--- a/nixpkgs/pkgs/applications/networking/ipfs/deps.nix
+++ /dev/null
@@ -1,2190 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/dgraph-io/badger";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgraph-io/badger";
-      rev = "1fcc96ec";
-      sha256 = "09sdr64ay8wbw4m8a7dppha357wx2395vpni554353v7b22gyk59";
-    };
-  }
-  {
-    goPackagePath = "bazil.org/fuse";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bazil/fuse";
-      rev = "65cc252bf669";
-      sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
-    };
-  }
-  {
-    goPackagePath = "github.com/AndreasBriese/bbloom";
-    fetch = {
-      type = "git";
-      url = "https://github.com/AndreasBriese/bbloom";
-      rev = "343706a395b7";
-      sha256 = "0pz4wph915gm2b0admq4bc5d2ir218s954z27gmc86l0rik13a5d";
-    };
-  }
-  {
-    goPackagePath = "github.com/Kubuxu/go-os-helper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Kubuxu/go-os-helper";
-      rev = "v0.0.1";
-      sha256 = "08v88ylhvv65hdqr2pp94qf2ncppzib5sx66fv432vhgkz00ddyr";
-    };
-  }
-  {
-    goPackagePath = "github.com/Kubuxu/gocovmerge";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Kubuxu/gocovmerge";
-      rev = "7ecaa51963cd";
-      sha256 = "0xbx83h44hsiidmr69sn4k0zn7bmbwcna76fn0akjb5il1r4bjyr";
-    };
-  }
-  {
-    goPackagePath = "github.com/Stebalien/go-bitfield";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Stebalien/go-bitfield";
-      rev = "076a62f9ce6e";
-      sha256 = "17iqkx2dyh6ykgapgvbyrm8c15qw24pspjhi3ww2sx4y0qhkycf4";
-    };
-  }
-  {
-    goPackagePath = "github.com/aead/siphash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aead/siphash";
-      rev = "v1.0.1";
-      sha256 = "01kd1z82sc4nh3nj9c25aryyp396s7jrqc2kz9d7qq1vy2hdbznc";
-    };
-  }
-  {
-    goPackagePath = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev = "3a771d992973";
-      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
-    };
-  }
-  {
-    goPackagePath = "github.com/blang/semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/blang/semver";
-      rev = "v3.5.1";
-      sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
-    };
-  }
-  {
-    goPackagePath = "github.com/bren2010/proquint";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bren2010/proquint";
-      rev = "38337c27106d";
-      sha256 = "1ws3hb27n4c4mfp2pfj9nc59ch6dv93333a83n7qazf74lhf8ixl";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/btcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/btcd";
-      rev = "306aecffea32";
-      sha256 = "130np0bfic9q7ga8a9y5gd3amy6mgfb7igd3lgicikjclfhiqwf4";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/btclog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/btclog";
-      rev = "84c8d2346e9f";
-      sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/btcutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/btcutil";
-      rev = "4c204d697803";
-      sha256 = "16s27k8xnvhlpv0ibs60sqgnyn3zhnvprv1647svmzs3rwcsqgvp";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/go-socks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/go-socks";
-      rev = "4720035b7bfd";
-      sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/goleveldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/goleveldb";
-      rev = "7834afc9e8cd";
-      sha256 = "0gy156sn2cy2maii3p058f7q60gjdbmba34i9qvk8msxlg7hlfjv";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/snappy-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/snappy-go";
-      rev = "0bdef8d06723";
-      sha256 = "00i5fsb1wf2dwal1jfwbpk9a7cbzjyg7rnz2xib3qfz9h82kd4jw";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/websocket";
-      rev = "31079b680792";
-      sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa";
-    };
-  }
-  {
-    goPackagePath = "github.com/btcsuite/winsvc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/winsvc";
-      rev = "v1.0.0";
-      sha256 = "0nsw8y86a5hzr2a3j6ch9myrpccj5bnsgaxpgajhzfk5d31xlw1z";
-    };
-  }
-  {
-    goPackagePath = "github.com/cenkalti/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenkalti/backoff";
-      rev = "v2.1.1";
-      sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
-    };
-  }
-  {
-    goPackagePath = "github.com/cheekybits/genny";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cheekybits/genny";
-      rev = "v1.0.0";
-      sha256 = "1pcir5ic86713aqa51581rfb67rgc3m0c72ddjfcp3yakv9vyq87";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/go-semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-semver";
-      rev = "v0.2.0";
-      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
-    };
-  }
-  {
-    goPackagePath = "github.com/cskr/pubsub";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cskr/pubsub";
-      rev = "v1.0.2";
-      sha256 = "0wr8cg5axrlz9xg33r9dqvkp5ix9q8h8c7qw78mj22qprwh3zj9f";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "v1.1.1";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath = "github.com/davidlazar/go-crypto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davidlazar/go-crypto";
-      rev = "dcfb0a7ac018";
-      sha256 = "1lir8slwykn0h5bg5lj22qsdg4kw09kcqlks974g1428d42rqlcp";
-    };
-  }
-  {
-    goPackagePath = "github.com/dgryski/go-farm";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgryski/go-farm";
-      rev = "3adb47b1fb0f";
-      sha256 = "04bkvr6xvfh83cn83gqzyxx45wbk3j1bdpgrck0b424x48z2x4jh";
-    };
-  }
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev = "v1.0.0";
-      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
-    };
-  }
-  {
-    goPackagePath = "github.com/elgris/jsondiff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/elgris/jsondiff";
-      rev = "765b5c24c302";
-      sha256 = "0jm1q0s531hmkqdx8jqphfpmzysn44aphkpwlzqwp3hkz89g4d4q";
-    };
-  }
-  {
-    goPackagePath = "github.com/facebookgo/atomicfile";
-    fetch = {
-      type = "git";
-      url = "https://github.com/facebookgo/atomicfile";
-      rev = "2de1f203e7d5";
-      sha256 = "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6";
-    };
-  }
-  {
-    goPackagePath = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev = "v1.7.0";
-      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
-    };
-  }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-check/check";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-check/check";
-      rev = "788fd7840127";
-      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev = "v1.2.1";
-      sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/mock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/mock";
-      rev = "v1.2.0";
-      sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "v1.3.0";
-      sha256 = "0dm1ip7742qz2k1cr6ywy0av6mpcxd2kc4ayfqi8cxz3ai7zhbdr";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev = "2e65f85255db";
-      sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/go-cmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-cmp";
-      rev = "v0.2.0";
-      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/uuid";
-      rev = "v1.1.1";
-      sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
-    };
-  }
-  {
-    goPackagePath = "github.com/gopherjs/gopherjs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gopherjs/gopherjs";
-      rev = "0766667cb4d1";
-      sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev = "v1.4.0";
-      sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
-    };
-  }
-  {
-    goPackagePath = "github.com/gxed/go-shellwords";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gxed/go-shellwords";
-      rev = "v1.0.3";
-      sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
-    };
-  }
-  {
-    goPackagePath = "github.com/gxed/hashland";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gxed/hashland";
-      rev = "v0.0.1";
-      sha256 = "1b921dh9i6zw7y8jfzwvrmdbhnwid12a5z1zjawslfq2vvsajwmm";
-    };
-  }
-  {
-    goPackagePath = "github.com/gxed/pubsub";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gxed/pubsub";
-      rev = "26ebdf44f824";
-      sha256 = "0q0r6bvimjxwi3yd0w2wjkx1x8m0d9pwi25b7n4s4g10h36rabjp";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/errwrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/errwrap";
-      rev = "v1.0.0";
-      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-multierror";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-multierror";
-      rev = "v1.0.0";
-      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/golang-lru";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/golang-lru";
-      rev = "v0.5.1";
-      sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
-    };
-  }
-  {
-    goPackagePath = "github.com/hpcloud/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hpcloud/tail";
-      rev = "v1.0.0";
-      sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
-    };
-  }
-  {
-    goPackagePath = "github.com/hsanjuan/go-libp2p-gostream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hsanjuan/go-libp2p-gostream";
-      rev = "v0.0.31";
-      sha256 = "0q4k1ahns9j061iajp8525330mwgbdv5mnyzldpg64r5c2igp9qf";
-    };
-  }
-  {
-    goPackagePath = "github.com/hsanjuan/go-libp2p-http";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hsanjuan/go-libp2p-http";
-      rev = "v0.0.2";
-      sha256 = "0pq80qvhm2f53gx438ws5nnj1r2ara48radzxc5br57scp2bjlgk";
-    };
-  }
-  {
-    goPackagePath = "github.com/huin/goupnp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/huin/goupnp";
-      rev = "v1.0.0";
-      sha256 = "12f7rigf1f4xh1an1qis61xkj5s1r8ygk48zahf3n4gaqxmgm7i6";
-    };
-  }
-  {
-    goPackagePath = "github.com/huin/goutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/huin/goutil";
-      rev = "1ca381bf3150";
-      sha256 = "0alhyacsfqic2wxyqn4gvk9wzjl4pkmy8rhvqjk84xsghgx5xf12";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/bbloom";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/bbloom";
-      rev = "v0.0.1";
-      sha256 = "0ji1dgxvg338wx2agh0ld9x6wwr6zc8zwjxs5mwdb99p56dc34nz";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/dir-index-html";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/dir-index-html";
-      rev = "v1.0.3";
-      sha256 = "1asd58w53i97jxk2r1asy8h5lgq0086lnjq3gi7fs20xvgv20bfy";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-bitswap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-bitswap";
-      rev = "v0.0.4";
-      sha256 = "0998qyxzp5frmkf5kjqxrhdwl4c0i7a2kh24rldix934afbmfz3r";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-block-format";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-block-format";
-      rev = "v0.0.2";
-      sha256 = "1j73r946z0gs98a2r1z7q3vkpk8v7wqwc68x8c3ngiff9sijq1kf";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-blockservice";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-blockservice";
-      rev = "v0.0.3";
-      sha256 = "1c2fnrqlvg16xf7jla1x38qi56yw61w1ms70kghhafmw008bgkvn";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-cid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-cid";
-      rev = "v0.0.1";
-      sha256 = "11hdrac0wf82m69fkpwby1mg2k7swmw884rv3250i0kymwi93lak";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-cidutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-cidutil";
-      rev = "v0.0.1";
-      sha256 = "00bdn7cg7rg8amh8zaqakf6phd14sn2z9kw73cscfhpyg9di1p9h";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-datastore";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-datastore";
-      rev = "v0.0.3";
-      sha256 = "147nnmgb2b4iiky4hsn5wn4hk0kp39xs1yj3blm2gxxxkmjqsdk4";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-detect-race";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-detect-race";
-      rev = "v0.0.1";
-      sha256 = "0rqb0q66d7z852j5mhlr025dz698c44w014g4mx587amr1rvwqna";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ds-badger";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ds-badger";
-      rev = "v0.0.3";
-      sha256 = "0bl7zh8gmas54577v501n17z1254f1yaggkgslz9qjz4rihq4wq1";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ds-flatfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ds-flatfs";
-      rev = "v0.0.2";
-      sha256 = "1z6z717pkv2yqb0wdhw73vir253305wkqcg5pln8km8kl2fjwwyi";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ds-leveldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ds-leveldb";
-      rev = "v0.0.2";
-      sha256 = "0x70z31g0l04lm6nsv1p0wnhdwqvck2pzy59ygfxk707n0x5vqpc";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ds-measure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ds-measure";
-      rev = "v0.0.1";
-      sha256 = "1ndb10x5g95g8kapfr116qa3cav2xcwwm4dppp99bi15kq1yk742";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-fs-lock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-fs-lock";
-      rev = "v0.0.1";
-      sha256 = "02mr83xkflf0sjrii11pd9k4a4545jggqgq6pdpsmkx2r3b01j2q";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-addr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-addr";
-      rev = "v0.0.1";
-      sha256 = "02f7vhf6kra7h58ny71zfb0k5q9mz6yplypnk36i6gv4fn5v9c5i";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-blockstore";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-blockstore";
-      rev = "v0.0.1";
-      sha256 = "0vw6i4n9xss21yri5wkj9pvzapm9yqgxh5l6vq2858n50xz72r31";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-blocksutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-blocksutil";
-      rev = "v0.0.1";
-      sha256 = "06bip9adk70i0g0hkf4aczvhkhd3s31x19668ls26dl62rq9h7di";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-chunker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-chunker";
-      rev = "v0.0.1";
-      sha256 = "19p8a4xfi62fj5nw7ad81yppn0slq3pddk0gb0c3zydaxcjkhzw6";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-cmdkit";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-cmdkit";
-      rev = "v0.0.1";
-      sha256 = "1aqdpszvibkm1h7p852ajzb9gjgsz5jlk4j2s9j8q1wbmz3vslms";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-cmds";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-cmds";
-      rev = "v0.0.5";
-      sha256 = "1b302hvah5scykcjn5al9a6jf7sygqi6snd664a6sxf2xgpwk0s8";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-config";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-config";
-      rev = "v0.0.1";
-      sha256 = "055igsi5bv312p2590dvpr9d290c4c0cwbzvwv52l7j60v79vlkc";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-delay";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-delay";
-      rev = "v0.0.1";
-      sha256 = "0a5acj622sk1hibnh893mya4h86nsy1dan0wlh9q444c04iqpviw";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-ds-help";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-ds-help";
-      rev = "v0.0.1";
-      sha256 = "173kmvyk2f5f1p30avb8nzvkcmq9xkdfpydavqw3bxg0yq0714ic";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-exchange-interface";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-exchange-interface";
-      rev = "v0.0.1";
-      sha256 = "12h4pj5g9d1j5gmd8gf774fqwkx0x5cm3pg7c81hi0f43x5lrmwn";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-exchange-offline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-exchange-offline";
-      rev = "v0.0.1";
-      sha256 = "0nlb5llmj9kjas2p5jqg2x3krk5jm40xd36k0g5l87c992dy7f0i";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-files";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-files";
-      rev = "v0.0.2";
-      sha256 = "12554whcmg60rgnzyd7673hgxnrs1j176lw8839wf260pjq6rs39";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-flags";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-flags";
-      rev = "v0.0.1";
-      sha256 = "0pf9nq0n6nlfxbfhn9v46a2s7kkkwmvl04si8ihz08nahanb13r6";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-posinfo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-posinfo";
-      rev = "v0.0.1";
-      sha256 = "0hh88i9sk5h53z2xx2nwxrpcx0r0jhlb5sq54x5qyhp5mjfqbyi2";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-pq";
-      rev = "v0.0.1";
-      sha256 = "05q7b7g49ni59c6593v51kkkd6ppc2ipkfsx05qbfg8md9r7a93x";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-routing";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-routing";
-      rev = "v0.0.1";
-      sha256 = "15vvvc0z5sbyhmwl3nfrpziiy3gsivb02xcalsz6mxvam68xy4x5";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipfs-util";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipfs-util";
-      rev = "v0.0.1";
-      sha256 = "1j87wqxh8ap5qqvnhnhz3zg6fn50axnnd69wqg287hh36xcpy6ss";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipld-cbor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipld-cbor";
-      rev = "v0.0.1";
-      sha256 = "0zppzca1ar8pqrzi68ysx4ih1mnhlyrg046xwj7sggr4aki1fh5j";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipld-format";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipld-format";
-      rev = "v0.0.1";
-      sha256 = "0lb4wp30jlamk604bagzf28zf2hm2b4lxnayqvq7rh0jxhbdb61d";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipld-git";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipld-git";
-      rev = "v0.0.1";
-      sha256 = "0d5kl3kvam1hv589cg9cg1dkjyanzp727zrnzyjnrysv3fk8yv66";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-ipns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-ipns";
-      rev = "v0.0.1";
-      sha256 = "1r9531v35336sf36s8pzi3jiyqd22ld9p7xpaznzmp57ygwfxlwj";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-log";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-log";
-      rev = "v0.0.1";
-      sha256 = "0r3pk46g9vjjb9ljaxda18w488xa9vyj30g23y9vprknkd9dqfgw";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-merkledag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-merkledag";
-      rev = "v0.0.3";
-      sha256 = "0j7dgca9vyhj6ra074cddblcjkxh1c1k51krch09lqxxjwasgg60";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-metrics-interface";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-metrics-interface";
-      rev = "v0.0.1";
-      sha256 = "09xc71175sfnqlizkbw066jagnbag9ihvs240z6g6dm2yx3w5xgy";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-metrics-prometheus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-metrics-prometheus";
-      rev = "v0.0.2";
-      sha256 = "1z1zwjj0a3gyzs4r25b9kl7z3kmsqp3jskvy7x02a3v1dlr3nkfp";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-mfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-mfs";
-      rev = "v0.0.4";
-      sha256 = "13jjxbfjl6wd89nxqibvp8q3hd2vzh0vpfhp3vrbapghkzp08rbb";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-path";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-path";
-      rev = "v0.0.3";
-      sha256 = "019zpy92k2rilkhn928jf91d8y3x8cxcw04mc2pxv5ja29nkyc91";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-todocounter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-todocounter";
-      rev = "v0.0.1";
-      sha256 = "1nsf56hh6n2y3m14b1ismcpsyi65ffxa5i6ks6il9qppm21mm5nx";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-unixfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-unixfs";
-      rev = "v0.0.4";
-      sha256 = "0fbqqi9h2xalnyc58ppaiyac3qd6hb4ycn46wwnr7idp0z7wxl5j";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/go-verifcid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/go-verifcid";
-      rev = "v0.0.1";
-      sha256 = "06ii8934s52d9n1lvzx29didh667pm2i7qdag443vqn0ilmkjvh9";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/hang-fds";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/hang-fds";
-      rev = "v0.0.1";
-      sha256 = "0axgmx1vcqsvys4vhqfrixfss2vk3qly1cqlm0aqrlhscggflkn4";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/interface-go-ipfs-core";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/interface-go-ipfs-core";
-      rev = "v0.0.6";
-      sha256 = "13sr18vzsfsik1nnkdcmi7afagbcnzh95mxzlbss366x802g8d8q";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/iptb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/iptb";
-      rev = "v1.4.0";
-      sha256 = "0nfiqf1k114ydp6c37yq4qn6j3bmw94wvc096vfljq8493jr8jvv";
-    };
-  }
-  {
-    goPackagePath = "github.com/ipfs/iptb-plugins";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ipfs/iptb-plugins";
-      rev = "v0.0.2";
-      sha256 = "10kyvjhmlvza3xlmfvwhndscjm6807pmk9nld7d2660mvh18w626";
-    };
-  }
-  {
-    goPackagePath = "github.com/jackpal/gateway";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jackpal/gateway";
-      rev = "v1.0.5";
-      sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1";
-    };
-  }
-  {
-    goPackagePath = "github.com/jackpal/go-nat-pmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jackpal/go-nat-pmp";
-      rev = "v1.0.1";
-      sha256 = "0sr23mcxbv9f65is4p1amb5yn026p7cfamlwpb2f8q218idwy3zk";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-cienv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-cienv";
-      rev = "1bb1476777ec";
-      sha256 = "0mk04dk572gdd0y63vark0362y42w7kbwdlmmw9bg78qmmiikjb3";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-context";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-context";
-      rev = "d14ea06fba99";
-      sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-is-domain";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-is-domain";
-      rev = "v1.0.2";
-      sha256 = "1cf4qmlg54975z5j7njyqsq0vr8gsxzg85c5iys08nr3cizr7551";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-random";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-random";
-      rev = "123a90aedc0c";
-      sha256 = "0kgx19m8p76rmin8s8y6j1padciv1dx37qzy7jkh9bw49ai3haw3";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-random-files";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-random-files";
-      rev = "31b3f20ebded";
-      sha256 = "0d52wwzgxxh2a1bwmixfa6nfhhqdq6l9g4s6kmsdnc6kqf38c818";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/go-temp-err-catcher";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-temp-err-catcher";
-      rev = "aac704a3f4f2";
-      sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc";
-    };
-  }
-  {
-    goPackagePath = "github.com/jbenet/goprocess";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/goprocess";
-      rev = "b497e2f366b8";
-      sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
-    };
-  }
-  {
-    goPackagePath = "github.com/jessevdk/go-flags";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jessevdk/go-flags";
-      rev = "1679536dcc89";
-      sha256 = "15jgsymwg0wjslxrw391sw7qzwwjcnjxiiksq84z7ng9sqy96c1c";
-    };
-  }
-  {
-    goPackagePath = "github.com/jonboulle/clockwork";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jonboulle/clockwork";
-      rev = "v0.1.0";
-      sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
-    };
-  }
-  {
-    goPackagePath = "github.com/jrick/logrotate";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jrick/logrotate";
-      rev = "v1.0.0";
-      sha256 = "0srl6figwjqpi3nbp7br8sxpmvh4v8lzbny1b4lar4ny0156p5nl";
-    };
-  }
-  {
-    goPackagePath = "github.com/jtolds/gls";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jtolds/gls";
-      rev = "v4.2.1";
-      sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h";
-    };
-  }
-  {
-    goPackagePath = "github.com/kisielk/errcheck";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/errcheck";
-      rev = "v1.1.0";
-      sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
-    };
-  }
-  {
-    goPackagePath = "github.com/kisielk/gotool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/gotool";
-      rev = "v1.0.0";
-      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-    };
-  }
-  {
-    goPackagePath = "github.com/kkdai/bstream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kkdai/bstream";
-      rev = "f391b8402d23";
-      sha256 = "1hd9caz0yf3r8kciw2pqwrsr8z4w0rhbqv1z7iq08d0542s05j3z";
-    };
-  }
-  {
-    goPackagePath = "github.com/koron/go-ssdp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/koron/go-ssdp";
-      rev = "4a0ed625a78b";
-      sha256 = "11d1xf07xs4j7qbxpndxbrfk2zk48k9fa3cxnhfb5lh24bd4sa0f";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/pretty";
-      rev = "v0.1.0";
-      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/pty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/pty";
-      rev = "v1.1.1";
-      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/text";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/text";
-      rev = "v0.1.0";
-      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-addr-util";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-addr-util";
-      rev = "v0.0.1";
-      sha256 = "1kjdk5214l8gna7f4hvb0iwmmlzsfccjankkxjmil80ibhcvjw60";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-buffer-pool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-buffer-pool";
-      rev = "v0.0.1";
-      sha256 = "1239hkhckgx1fzd43k56q3c0283p1mjl8w7i2j4xymvs6f6q6ygi";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-conn-security";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-conn-security";
-      rev = "v0.0.1";
-      sha256 = "0z1zw0aq5jcks0vcdm5zxjyz9z6c6jklm0s74gc2m7jfs2jj2r5r";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-conn-security-multistream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-conn-security-multistream";
-      rev = "v0.0.1";
-      sha256 = "19slvlmapzs952gfn4aym4dg0l49x0vpn5v696vf80v2k00ipa32";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-flow-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-flow-metrics";
-      rev = "v0.0.1";
-      sha256 = "04zrwl579qkhiw3b655cw7lnlp2yvq1xl3f1rkxnhx8llwsy3x49";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p";
-      rev = "v0.0.12";
-      sha256 = "04hm36fi45jpq5zjl1a7jlyq82adwwrgvvgnkllppq2zg85mlvvi";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-autonat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-autonat";
-      rev = "v0.0.4";
-      sha256 = "03523s4kdwswgfnwly5ynld2lny142j8xl6mr88vni4xn7pijn1l";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-autonat-svc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-autonat-svc";
-      rev = "v0.0.5";
-      sha256 = "0plph1nnh0ig9d54hizpiyhfrlrwhb1ylx6pry5jcppgpxngi79c";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-blankhost";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-blankhost";
-      rev = "v0.0.1";
-      sha256 = "1q29b880l95811ara95187y9pmqq542bxh50cg0ykwzfj94xgla4";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-circuit";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-circuit";
-      rev = "v0.0.4";
-      sha256 = "1bnwjf3p5r8ng360l2fjx0szdiwm2yfiifjkwflin00hx0gzyq7d";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-connmgr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-connmgr";
-      rev = "v0.0.1";
-      sha256 = "07kvnhavr4k1birgqp9c4y0yl1ii3pl1cc8pn4dzci87krachz2z";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-crypto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-crypto";
-      rev = "v0.0.1";
-      sha256 = "0wgq0ayg1656gvmi4d1nwgq7dbnyyb30xp3z571q495mmq483fbk";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-daemon";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-daemon";
-      rev = "v0.0.6";
-      sha256 = "0pq6557ykbi3a8pasvm9zlhdysrq6h1fj48z4imv2gq30nmy3l6l";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-discovery";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-discovery";
-      rev = "v0.0.1";
-      sha256 = "06h621llfx7bmkcnrkkxb3j85221albf18ig8mbh9c8wrpmsi438";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-host";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-host";
-      rev = "v0.0.1";
-      sha256 = "102qyl7qkmq8p1gpxbfi5z2lrd8mysji28fx25ma4h312ci96rqz";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-interface-connmgr";
-      rev = "v0.0.1";
-      sha256 = "107khappq5w48p17s22cp7djd5ii1bbg968wsa9bq9znzxdkzm43";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-interface-pnet";
-      rev = "v0.0.1";
-      sha256 = "1kqxm4rpcss2ajfnc3gzww4ng5pjj5qc0szr5x2vz15vvx2kp9bi";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-kad-dht";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-kad-dht";
-      rev = "v0.0.7";
-      sha256 = "1nbq4240vnd3sfmiy8ry6pwnnf2k7hnwn1ln32mgqq32dywx664r";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-kbucket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-kbucket";
-      rev = "v0.1.1";
-      sha256 = "0pgy89mp9r23axs8gapnkzks89q7539l2g46r6ffyd4a675qampg";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-loggables";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-loggables";
-      rev = "v0.0.1";
-      sha256 = "15whxhipm06fnd8ky7gxf59bvbw2wxl44g0v2dbnbr2j9a2n5ivv";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-metrics";
-      rev = "v0.0.1";
-      sha256 = "14wvnmcwr40iwbpvfwdcbb6cff7rcrhqf42z32aqjhisp32irn1x";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-nat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-nat";
-      rev = "v0.0.4";
-      sha256 = "179d5jj4sznjns9p17gmrd86pf7ba7k4qq5kiv17ra4b666kd88f";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-net";
-      rev = "v0.0.2";
-      sha256 = "0cfi57hvkz6yhi2nw63p2p7fnaw91zrcphxmchk2a4xn5rnwgjak";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-netutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-netutil";
-      rev = "v0.0.1";
-      sha256 = "1zzkfddfmja6dsk8nxybi5cccd2v38sahp8xx676a38g3ydvqvs6";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-peer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-peer";
-      rev = "v0.0.1";
-      sha256 = "0hixdbj47njyzj885fzm9dlylw21g406yqxfidag2qrn06b2qicl";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-peerstore";
-      rev = "v0.0.2";
-      sha256 = "1asfl9sp3mi5pg9gpy45wvsc8hpdf48i7ml37sh5sjmn30aj4f6i";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-pnet";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-pnet";
-      rev = "v0.0.1";
-      sha256 = "1gh2hw0dbywwp7vr4n9xws8nxraa00rigzxa86g8nf50n9cdq2cr";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-protocol";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-protocol";
-      rev = "v0.0.1";
-      sha256 = "18fhmhfsdzw7dd618y4344qka08zq4b5jzpdgxbglar9dkkralg7";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-pubsub";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-pubsub";
-      rev = "v0.0.1";
-      sha256 = "1n67ajql9527mzrc06jk4rb3xb63vmlnzx6i4aywcfn66pjg9kmh";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-pubsub-router";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-pubsub-router";
-      rev = "v0.0.3";
-      sha256 = "1cjscq213ky11vzdalcfnkqkj2s53npymzjvv6ahn34c6bidan4s";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-quic-transport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-quic-transport";
-      rev = "v0.0.3";
-      sha256 = "0kiisb35fvblg4xaz188by4rn90chynzm94f83prqq7h9y9b3s5s";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-record";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-record";
-      rev = "v0.0.1";
-      sha256 = "131zjkplylwam3gnw8f9lfvjgzi8xbjhb2qf57fys4c89pz868mg";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-routing";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-routing";
-      rev = "v0.0.1";
-      sha256 = "09mm12abdzy6k1dw3ix8v2c8w3warc52jazvwwwvwhlq924jzdp0";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-routing-helpers";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-routing-helpers";
-      rev = "v0.0.2";
-      sha256 = "0lxpf1vzhapj2q18wv5g7kkqhnwz1b08lyxjp57qa33z5j4jclgw";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-secio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-secio";
-      rev = "v0.0.1";
-      sha256 = "1v51whaww3bv14kl7gpapq6ld6m6v7w9cipkflh8czpgrs096yyq";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-swarm";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-swarm";
-      rev = "v0.0.2";
-      sha256 = "0v75wb96rddjxd8faqri076xba5ffqg4bpddw16k4bw8kk2b46w0";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-transport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-transport";
-      rev = "v0.0.4";
-      sha256 = "0pgyxzb489xzcm9q11br6sgsz166cw65xhfcksy3yy5n0c1c6mvb";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-libp2p-transport-upgrader";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-libp2p-transport-upgrader";
-      rev = "v0.0.1";
-      sha256 = "0czy16zvbz2k9jn8w7iddf7xph3bn054abxybjxm4dhp7g83mf65";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-maddr-filter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-maddr-filter";
-      rev = "v0.0.1";
-      sha256 = "039qj86k4dam6kch52kcdk5dsg36gfrfwambqjg1nv2xaq8j1hx8";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-mplex";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-mplex";
-      rev = "v0.0.1";
-      sha256 = "1f0h2hmh4c0xvv1fsjciyc8v7sn0ymanr9my2smr6z1nar7nziqn";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-msgio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-msgio";
-      rev = "v0.0.1";
-      sha256 = "1my8w8k7c3mz2aazsg45q7nlr4ywmix6jspri2sv7fqrs1kjxrjm";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-nat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-nat";
-      rev = "v0.0.3";
-      sha256 = "19ihybcpmz2wpi6mk3rhgjbv4cgiiang92d9ym3xw7y3iv8mlzc0";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-reuseport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-reuseport";
-      rev = "v0.0.1";
-      sha256 = "1qbxhycckjv7mazg06llbx9708f1z4453yaxxp4641gwcrbns7zk";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-reuseport-transport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-reuseport-transport";
-      rev = "v0.0.2";
-      sha256 = "14lqhdkx5nmrvislim7qlvnx78dnfngxvcrll9d851r04p703qrn";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-stream-muxer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-stream-muxer";
-      rev = "v0.0.1";
-      sha256 = "1swqw77jn00a7cl3lb7x5wyybhv4mkqk36z407ihid44gds7djqh";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-tcp-transport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-tcp-transport";
-      rev = "v0.0.2";
-      sha256 = "0qrl4mgs16wnc0dnwg3x2k3mlv9grzl8maclbkq22vqk34c5in4y";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-testutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-testutil";
-      rev = "v0.0.1";
-      sha256 = "1jmqk6cyp52fgmayx0dwas27rswrvn9lpsiv6bnabhz1gvb91ahp";
-    };
-  }
-  {
-    goPackagePath = "github.com/libp2p/go-ws-transport";
-    fetch = {
-      type = "git";
-      url = "https://github.com/libp2p/go-ws-transport";
-      rev = "v0.0.2";
-      sha256 = "1j321z8m82a43v70jmglh2v0hv1wmgsizr5zrlgwqsx3wsih9phx";
-    };
-  }
-  {
-    goPackagePath = "github.com/lucas-clemente/quic-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lucas-clemente/quic-go";
-      rev = "v0.11.1";
-      sha256 = "1vhswcbiyaq94rwc6vd8vl13x3lfwilpfw7kqx7bflxj7zvvd18y";
-    };
-  }
-  {
-    goPackagePath = "github.com/marten-seemann/qtls";
-    fetch = {
-      type = "git";
-      url = "https://github.com/marten-seemann/qtls";
-      rev = "v0.2.3";
-      sha256 = "0b9p7bwkm9hfg1mb565q4nw5k7xyks0z2xagz5fp95azy2psbnfg";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-colorable";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-colorable";
-      rev = "v0.1.1";
-      sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "v0.0.5";
-      sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "v0.0.4";
-      sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
-    };
-  }
-  {
-    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "v1.0.1";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath = "github.com/mgutz/ansi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mgutz/ansi";
-      rev = "9520e82c474b";
-      sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "v1.1.4";
-      sha256 = "17apnm7q5v7bhmpvrk3rbi0gjqk8z3cwkm90q1dfzrfvbvp71z5d";
-    };
-  }
-  {
-    goPackagePath = "github.com/minio/blake2b-simd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/minio/blake2b-simd";
-      rev = "3f5f724cb5b1";
-      sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
-    };
-  }
-  {
-    goPackagePath = "github.com/minio/sha256-simd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/minio/sha256-simd";
-      rev = "2d45a736cd16";
-      sha256 = "1hfhpy8fczd0mnwvxkp2nk3dydv1nzqx59ig8ajqjraq6kli66p5";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "v1.1.0";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath = "github.com/mr-tron/base58";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mr-tron/base58";
-      rev = "v1.1.0";
-      sha256 = "00w28mhinf8dvzrh71dijryfhrggi7j9wqiiyddpk41ixx3rmfy4";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-base32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-base32";
-      rev = "v0.0.3";
-      sha256 = "1f4pjnqw4687p8l7vr1qaq6g6i9pcr80fc4pk2kpgrcwzpd1lprg";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multiaddr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multiaddr";
-      rev = "v0.0.1";
-      sha256 = "1r1w4036bpi97xb70833bpdpdhqm5gl6m8fllfdxqbg10ab1a938";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multiaddr-dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multiaddr-dns";
-      rev = "v0.0.2";
-      sha256 = "1fnv7lbd7q1kssaxp2fgrvj9dhn5aiqspd4090iqwys5hjr1xvmf";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multiaddr-net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multiaddr-net";
-      rev = "v0.0.1";
-      sha256 = "1075xs6gbiblfbwgf84yvg1nrywmvvrrxzqa8wp9j75zyakab81p";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multibase";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multibase";
-      rev = "v0.0.1";
-      sha256 = "083adnq79pyxhngv91saygh076196qin1nw1vppz7nk04zw4aymg";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multicodec";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multicodec";
-      rev = "v0.1.6";
-      sha256 = "08wnxhb4rd7rln2mzxnhv3csy19l9qgf5dx3437x4zsgkaqabb96";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multihash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multihash";
-      rev = "v0.0.1";
-      sha256 = "1aw4ra22g3l98bk7c3h1n968vi5a3gk528g4byj3xig76r0r731n";
-    };
-  }
-  {
-    goPackagePath = "github.com/multiformats/go-multistream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiformats/go-multistream";
-      rev = "v0.0.1";
-      sha256 = "1k79w7zd92cs9sjvsr31vi6n3j30xqz83mb3a3pqva11wl1gbnlz";
-    };
-  }
-  {
-    goPackagePath = "github.com/onsi/ginkgo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/ginkgo";
-      rev = "v1.7.0";
-      sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
-    };
-  }
-  {
-    goPackagePath = "github.com/onsi/gomega";
-    fetch = {
-      type = "git";
-      url = "https://github.com/onsi/gomega";
-      rev = "v1.4.3";
-      sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
-    };
-  }
-  {
-    goPackagePath = "github.com/opentracing/opentracing-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing/opentracing-go";
-      rev = "v1.0.2";
-      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev = "v1.0.0";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/polydawn/refmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/polydawn/refmt";
-      rev = "df39d6c2d992";
-      sha256 = "07hj5wimwgwj8xzzbvk0y7d6fmqf44d7fjicp1digh4kvjsbg3dz";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "v0.9.2";
-      sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "5c3871d89910";
-      sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev = "4724e9255275";
-      sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "1dc9a6cbc91a";
-      sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab";
-    };
-  }
-  {
-    goPackagePath = "github.com/rs/cors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rs/cors";
-      rev = "v1.6.0";
-      sha256 = "12j838rj6xl9y1xqs1mnh9zkc3dkpn94iqkp6jkdkxw631aa94dr";
-    };
-  }
-  {
-    goPackagePath = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev = "v1.0.5";
-      sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
-    };
-  }
-  {
-    goPackagePath = "github.com/smartystreets/assertions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/smartystreets/assertions";
-      rev = "b2de0cb4f26d";
-      sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
-    };
-  }
-  {
-    goPackagePath = "github.com/smartystreets/goconvey";
-    fetch = {
-      type = "git";
-      url = "https://github.com/smartystreets/goconvey";
-      rev = "a17d461953aa";
-      sha256 = "1942lhpv7c16dq27wjj2cjxsgra5lpsnxn52a9zvj8d0nip8nhq6";
-    };
-  }
-  {
-    goPackagePath = "github.com/spaolacci/murmur3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spaolacci/murmur3";
-      rev = "f09979ecbc72";
-      sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "v1.0.1";
-      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/objx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/objx";
-      rev = "v0.1.0";
-      sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "v1.3.0";
-      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
-    };
-  }
-  {
-    goPackagePath = "github.com/syndtr/goleveldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/syndtr/goleveldb";
-      rev = "v1.0.0";
-      sha256 = "042k0gbzs5waqpxmd7nv5h93mlva861s66c3s9gfg1fym5dx4vmd";
-    };
-  }
-  {
-    goPackagePath = "github.com/texttheater/golang-levenshtein";
-    fetch = {
-      type = "git";
-      url = "https://github.com/texttheater/golang-levenshtein";
-      rev = "d188e65d659e";
-      sha256 = "0dmaxmwz2vx2v51hybjpcwz260apaq3v8gm84ran38fcs8xl529c";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "v1.20.0";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath = "github.com/warpfork/go-wish";
-    fetch = {
-      type = "git";
-      url = "https://github.com/warpfork/go-wish";
-      rev = "5ad1f5abf436";
-      sha256 = "1jns04jdb07f695ipf0pfal2k7ss47jxgdi2ahqmskzglb26zm62";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/base32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/base32";
-      rev = "c30ac30633cc";
-      sha256 = "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/cbor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/cbor";
-      rev = "63513f603b11";
-      sha256 = "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/chunker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/chunker";
-      rev = "fe64bd25879f";
-      sha256 = "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-ctrlnet";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-ctrlnet";
-      rev = "f564fbbdaa95";
-      sha256 = "1ni4fb9bbaiicy8yd9w8i442v94k59czlmpvjqg0y5am67x73gxk";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-keyspace";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-keyspace";
-      rev = "5b898ac5add1";
-      sha256 = "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-logging";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-logging";
-      rev = "0457bb6b88fc";
-      sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-notifier";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-notifier";
-      rev = "097c5d47330f";
-      sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-smux-multiplex";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-smux-multiplex";
-      rev = "v3.0.16";
-      sha256 = "0y696zqrbdyvz9gkxd9armhxa82z2fg0wpm8yqp7swyxdsg15f8k";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-smux-multistream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-smux-multistream";
-      rev = "v2.0.2";
-      sha256 = "0sbxmn56fx1py6nijk9prkm4rqswynsw68frvlm11w5m57szi5pj";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-smux-yamux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-smux-yamux";
-      rev = "v2.0.9";
-      sha256 = "046nx0d9974shd6y3ic2dznij0yzaijp6z6g46kpa4iwf2w41jwk";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/go-sysinfo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/go-sysinfo";
-      rev = "4a357d4b90b1";
-      sha256 = "0s6yjp9incc579wbbga33vq0hcanv8j2xh9l90ya0r4fihz39jiq";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/mafmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/mafmt";
-      rev = "v1.2.8";
-      sha256 = "0sr602pbxid3ncfd8v0dgjd1a79qg3k4bzniq811jjdq9zm9jccv";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/mdns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/mdns";
-      rev = "ef14215e6b30";
-      sha256 = "17hid8s9asqyqgbw20wp4ip5sy03b5sayzld2i09w9l42217502q";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/multiaddr-filter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/multiaddr-filter";
-      rev = "e903e4adabd7";
-      sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/tar-utils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/tar-utils";
-      rev = "8c6c8ba81d5c";
-      sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/timecache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/timecache";
-      rev = "cfcb2f1abfee";
-      sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s";
-    };
-  }
-  {
-    goPackagePath = "github.com/whyrusleeping/yamux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/whyrusleeping/yamux";
-      rev = "v1.1.5";
-      sha256 = "08a4v0akdxg16g6mi32ixsldjbg3pp3j4x0xicaxc4fd6cfmi1wv";
-    };
-  }
-  {
-    goPackagePath = "go4.org";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go4org/go4";
-      rev = "ce4c26f7be8e";
-      sha256 = "0lzvmspdqqf251lrgawnss2wn3bnd3pj89xjxlvpgg6q0853580j";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "8dd112bcdc25";
-      sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "c95aed5357e7";
-      sha256 = "0b1vjnzd67sp9lggs0yn9qfgp6f5djqgx40lyncd7j720q04kk2h";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev = "42b317875d0f";
-      sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "b6889370fb10";
-      sha256 = "01c1ag1qr95iksp38rypfbrlk6sdqjhk7jgj3qf342ndhvqb08sa";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "90fa682c2a6e";
-      sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/xerrors";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/xerrors";
-      rev = "a5947ffaace3";
-      sha256 = "1bgn7j704mf891qcwcbqzr5sq9ar7z2a81887k8pp0b1g2giwgfz";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/genproto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev = "11092d34479b";
-      sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/airbrake/gobrake.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/airbrake/gobrake.v2";
-      rev = "v2.0.9";
-      sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/check.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/check.v1";
-      rev = "788fd7840127";
-      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/cheggaaa/pb.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/cheggaaa/pb.v1";
-      rev = "v1.0.28";
-      sha256 = "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/fsnotify.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/fsnotify.v1";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
-      rev = "v2.1.2";
-      sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/tomb.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/tomb.v1";
-      rev = "dd632973f1e7";
-      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.1";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
-    };
-  }
-  {
-    goPackagePath = "gotest.tools";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gotestyourself/gotest.tools";
-      rev = "v2.1.0";
-      sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k";
-    };
-  }
-  {
-    goPackagePath = "gotest.tools/gotestsum";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gotestyourself/gotestsum";
-      rev = "v0.3.3";
-      sha256 = "0wkh49yixvh5y1z96sanjfyvd7c63pvryz605lz0hzdbvcwciy7i";
-    };
-  }
-]
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
index e4585f345ea2..e5d8c728a196 100644
--- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -5,11 +5,11 @@
 
 buildGoModule rec {
   pname = "aerc";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchurl {
     url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";
-    sha256 = "0wx9l097s51ih4khk231f9fs3vw55an8l2jx3q13v7y20522wgnk";
+    sha256 = "0rpwjjnaq8mj619ajzyl3kad7sysbz87qz2ds0jyy7kvyzv6r7zb";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ buildGoModule rec {
       ${stdenv.lib.makeBinPath [ w3m dante ]}
   '';
 
-  modSha256 = "1h0vr01s2y0k3jjigz0h8ngjv1mhk6kw8mdisp5pr017jbhijfsi";
+  modSha256 = "0p8lp6xwg6jacrnxzw3q73mqxy9wzj5vs0k1saa48ardqd2f7b00";
 
   meta = with stdenv.lib; {
     description = "aerc is an email client for your terminal";
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 282a9c806dc9..337f26a84053 100644
--- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
 {
-  version = "60.7.0";
+  version = "60.7.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ar/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ar/thunderbird-60.7.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "07f3c9310e46fb43bab84c892c06aae11a33f0b7cf14730a92c9292d3e51bce9a1d37707ee819c8ba9fb8b9e78bf2089772684405a8276ac32676b2585c7bc32";
+      sha512 = "2e7e68ee9dadae963416d8a3915a77dab88c7d6bc27669b424bc47a7be8862849a45d95f94903fdfcc83009bd30b4051779c8115f39c94823e5599cd33f444f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ast/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ast/thunderbird-60.7.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "75967b7e98bd7d3b1d1ddb01aa5950d3d7bda77001bc0d8eb5d30a9bf617eb4fd36d6870c774943c41de9ba784f969fa0ffcfe5787331f3b721a1adbabee4e27";
+      sha512 = "1f5b8030913202d1625bd3afa3b98c81be8ab2fedc76beac094b6be06c65be05c20aa3065e7b16ea7921e5684fe2fdb50c1b5f983d0db6e95dc7b515bc197e9f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/be/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/be/thunderbird-60.7.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "78d8a8052bdebce1680d7a68ad3c0a0f8f4e3a0aa789ebc3874e58aa4eaa177feace8874b0bf7ad9d846673fb43e2356e7deefaa0a93dcf7db9c8d393ffc4508";
+      sha512 = "60a6e42f125dc41bc534993330900ed7f95fb7857e3d84e2bf7d824dd510086cc64b2e1adca739f78a3a057ab2469edde97887f80bb98849ea9d3b9302884146";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/bg/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/bg/thunderbird-60.7.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "228182664420439f0847746db29764a50f85607589600d48e79c4f9ba63912750ebda16c24c31a8b8f11dd0f02c0f493d6c2ca3a56dfc2cd8f2c0621b809092d";
+      sha512 = "27421dbe6ed43c2b4ff4b8ae71f801a2c7480043d524fcebf5590b71d173f04b7ddb2bfb8a44d591b33329e67628287efa9f8e80f576fd278991de0837aa93c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/br/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/br/thunderbird-60.7.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7eed1bee8424f0d6cb26636fffe16da398406902e791c3e346c74a405feff23f158df8a0790064022977469605001aac2ea484e93e803134f8c063da40e9b2ae";
+      sha512 = "5765f2c836a10dbbf95f4223caefadf6e2053a606a5e686499780b29bc2c831f8418254721403bdaff037f79290835d76ebcea3f8a0dc2a6ddfc07985a44b3ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ca/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ca/thunderbird-60.7.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e9071b7f54db240cfdf91b64aec9170a94b2b753d7b7b04dedfa1335f41829db09e6623d6b44186d552b85aedbfe57cacacd7bf68605a488ed8a5d667769c3d2";
+      sha512 = "e4d81a7d84b56cab1ecfeb65907cbeff592b05aea4693bd6ca926261017c5af51c66c6fb20e8e241433b7e93467652ce9b778045a6be33e5c2960c820430ce69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/cs/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cs/thunderbird-60.7.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "2366449d58ab72cc59b0abd5bd4c279e3d1e95668b834b4d49a606338206197434f78ec911b6c69301916754f813c137a89ae7fabf1bbfba1273bf4ead1ba1a3";
+      sha512 = "3e4385dba45439216c18959305ce9f624b1b70a7d45c9213a40f27a47b049bd2074955f92c79a831afaa26a550975bada6f100511fbdbd34ac10b1fffbcafb71";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/cy/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/cy/thunderbird-60.7.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "dcc268a8bb5fe9be6a3ddcb4cd25cf341db58e9ad2837d15ec949dc737edfeda3fdb17368237b58a33ffe1b41ede2496ad06c1fee46f9d59468138e3bd2292d1";
+      sha512 = "44f1d34d3ae6ab32c1b3bd1996caa829a1bcbadeff269d0a4d6fd8e3c07aaa3fd8d83505301bdbfe583e67f6432f4898746bec4f7173a6b84319d7f71ad4d87a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/da/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/da/thunderbird-60.7.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1d027329c79b9fe335fa9243e6aefd9f5a8f15e8280db3ab449478dd435bdec6d4020c03e22c124a3505aca4908bf35f8b3203a637a508b747f83e4d0fb24de6";
+      sha512 = "36cf0afc3ac6473454dae00d0e474fdcd3a3bb68c5d52ce5c325fad4bf1209b85d9a8052f92ec5499df670e3fc8661a69edb3763c8e1b581be951b78c4d4bc82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/de/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/de/thunderbird-60.7.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "51436c4e59dbda6eff921800f65d9181983e3fdc86def4f0d358ff616f646a58c84581376e37a4db180a80535d71da6c75be790419e66fb6b9c949a52f8973c9";
+      sha512 = "b84ea8f5f0e382971db974ae6946c962c1ca1a208de420386a77b4bde6537ac943705299257540f51360fe6b1386873814fc5fc091cdbc3125f811748840f777";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/dsb/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/dsb/thunderbird-60.7.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "6316491fc7cc1160456adf586679939ce52f12321b260c137808e7ea4d52ce4251e373d65e8e9bb0462282735a45e557c2e800a3fc0cff7b91a0dbee4b8ecd96";
+      sha512 = "4a02fd4a5c462189ab8ffe4b20164cec70bf996ab7a1e91e6920d18b8c44acb82dc6e4cdd8771e852e4f9a1bb07006dca2905175b2dc658a29c61cdebb5c2d17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/el/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/el/thunderbird-60.7.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "1185db88183bf22d788639ae8b57ae348a54f2ab20562d9f9ad3990ca64d989f7009387a02ebe5bc8121ce2aa8bb5f6eb2d1ff5ecf8cd7bc76af14f02c8fd365";
+      sha512 = "6ed1cdb0a0f46639b532956b646781e4004d2f8ae5cdfb1ec5e73fa184396ff315ffb776025f769445f569dd5a7c3f6adb5bc9985204bab780003b36a7388d3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/en-GB/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-GB/thunderbird-60.7.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "085d55a9333d147829f15b7452b59dee2743999270b79f56957ab813d10a8e36242215eedb8db34a2fa8b213c58b4c8bb503c7251dc144fa4ea20c5417dbedad";
+      sha512 = "76360b7252ddf0a869142af52dfb7c8dfa9706bf950396b1443cdfca7fa53d754b3e9bfb1192645eec5c59c53df4ec386aa64e1db88f8739aff9394c18c50abe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/en-US/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/en-US/thunderbird-60.7.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "0bf5bbbaf76c1dd304eda6ad175f3fdc4fbe9f56ed11bac4b6855f13c2cbd5ddd635c364d8f9660542a20d4bf8d3a8b18b4398280d15ad47afc4fa88d321d5bb";
+      sha512 = "6006ea1defd1b8cd6e99c66d51f7b598cd700804243f8f7ecb8ae1e611f9a6fbc5b2edc2c5672ac3547b0f9d88083eeae619a2b2ed68afa74742550c5c399576";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/es-AR/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-AR/thunderbird-60.7.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e1212f10b58d13d3376f72df61e1609fba269adc698e55bc3f19624a5004286b417d3181708dc80806a02d910167cd4f63e5d4adb3b2f7cdedcfdd140ed482d4";
+      sha512 = "b9884c2cf73c87294b9ddbaf327eb0d5ecd6e37c6d43382b5df957354563d82737b4eafb1611d39e7226c3633a9df099f465ad58d956c006390ac8950090daf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/es-ES/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/es-ES/thunderbird-60.7.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "136859c06b23f07fad831925f3a990b1bbfe955083f96b767482d496bb054b63d31eaab3361e5edc1d226a1a38296599cdaa1980839b3d0feadfb93c511aa10b";
+      sha512 = "cf341748e26d3769fcba61ad56a31c27afedcad2c800cbfbee10670f1286ff2b280313aac0d6a2fd60912df6e2679825ca09f0e84fa5f3aec1816cd839f5f7de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/et/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/et/thunderbird-60.7.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "4562561e5a317ce632e9323096c4ba83c9ac5183e6e42cbcd9475965166392390ece9a370f6f9fe46d3d19fd0d65596bee6519e4060b49bdcac01996c47e0a18";
+      sha512 = "cd3a63ce48ea634f107da110a9d934296f79e225921df7f675abc1b58af6b04a387fc31db08ab5ea23b0a33bc2c557ebd5ca8eb20f11146458bfee64221ad90d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/eu/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/eu/thunderbird-60.7.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4601b91b694f76654ea5ea3c932b3bb56f99096144a2c4e6dd5ab369ba0c9bf30044fe7490d67f50c9308b1223cd887e22f8cbbd1f35ba3e769d2b2e1e230b67";
+      sha512 = "8897270f4d27435a1f0722e896159da7c83f1fa1f47332ac8af8ec0446a194bb84ecee39f1a32305e84db04e98ca1c035df52ea24d15faf2ec44a8b84732ad8a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fi/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fi/thunderbird-60.7.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "39f949f4d71f8ad64ccaaef6b61797f1b8da5fd2e3bd80ec6110bc994806413e4617ba375c973a47819d2c8ae774f01941c5fc9698585b276d805c525bd91abf";
+      sha512 = "826f0be321eb2ea3bd9d95ccf2142a4e34d1d54ef352d25493649d12b15bfd158bcebf92a8563e8fb5601e4bca77db8c58522df09c7f5f521e5fa756aa776e24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fr/thunderbird-60.7.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ab281a68685555afbcfad63f6ea55aee413696b50cfba1563de7767a824fc22d00e39dcae04b6383e3b7da57ae23ffb09d49739ac78c69a59d2becd9ce22dd23";
+      sha512 = "0f0f3baff25d35d06575b18baa11ccabe10cc6103d765410b901009d91bba2258c03a5de94f2a128e563ea6ca97cb2525841ffabc2331119a88e62145a913978";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/fy-NL/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/fy-NL/thunderbird-60.7.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "042ea959bf071f7f5b62ffdccd13739c4c0defdf9de3bfd19bec695e89b18aca35f4bbb4938de424834309dbb2a0d3f45c32461b6e517f7c9c4740f38f2d02b7";
+      sha512 = "b817f3997a5aa64b3ad0ca3d7a8e4f7a18af133a6f3ccd3d45bde0f4013521cdb331700526ce79e0f68db5c19c3f1f6b6e38ba935caf95a77a4d65938d64c200";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ga-IE/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ga-IE/thunderbird-60.7.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "1da90daff6d3eb7473dd44e7878cfacc807e495a0028802b04adf61992134179cf7afdc8c1c3fb9336120639efed2969cf197cc29a41591598b486aec20b9a9b";
+      sha512 = "64235f4ac1b5352e7e4edf424966027656f899d96c078249d14ef16d4b30434511d3ff68d00433ea773e89c70b4dc6e4ba02f8ac5e4a670a8dfe5cd0b5c16dfe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/gd/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gd/thunderbird-60.7.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "21197c08e9f27bcc30b4f579c1005caf458f0e1cbcc564ca270885c215aac18e17eae485dd5d2ab756013fea24af36b919e65d100d88db43570ab690be7e2679";
+      sha512 = "5c3758a83f17e0cce2bc527b3b4e6755de2b129618b9088ebef0aaded1aec90f411a4aafcd6a054937d5d568f587715dbb431bac5930828247ab9fa886ec6d74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/gl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/gl/thunderbird-60.7.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "12db9c89338c80f063408167b2d91a8361236b220cdddec141d7dcf6518f8ef39105c32dada76f3a326d09e1dca7e4ea134827154546840cbfb8ac18e9bec351";
+      sha512 = "41ebbef4d3f3648c733f29df7d9a0d70201d7d519f3a3773384d4eec4e837b0c90590587e87535eff3bda773dcbeed7f3bb184229d142b7ff732595be370625d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/he/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/he/thunderbird-60.7.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "be5eef2e90af44623554359960ae0f9da3c54484643ab8ceaa72c0b000c7cb17693be8e865a6964ad3b356906c1872fc2315a601531faf16ebd7c356ac3f8110";
+      sha512 = "59811ce89c58526bf2f55156028bce6f2d62a99bb634615444b05632e2c72857fcb65e2dafd9c308191c525130b7d2f261e0fe3767a1b3549c6c5cbbb78ce303";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hr/thunderbird-60.7.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "48f8d55811632b650a1be62125ba3b56b144e422c0b410a2ad5ee4ff1a779c0a6c8d6f8d6c754bfa907a9c7aa22f0a5484cbc624247db89ef7ffe624d9a939cc";
+      sha512 = "c35202e12965bd8fb66d6aa5f97817a0977a0093879a661fda854beb68657945b1798bab8a2a357ed6d8c9f0322992d2f79e25cdba15cd3aa584a7069ae7639b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hsb/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hsb/thunderbird-60.7.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "bd38e36a1de618e692298ebd0d8593bddd2f80d36420af091a44974187042d47eb5cb8d1ea908855e5ce832b305e156470f0ad13ab6cf60acb066a4e3fa209d5";
+      sha512 = "ff85e93741a03b17482084e00539893bffd910ea9036616cea193cb86d5c4f9a7e55a8cd7c8de74b55d05236e9e061a06a3a6d5a0adc0df44f79f230baea7e19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hu/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hu/thunderbird-60.7.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "40e992503afd3c10fccda0b2892194e97df0f165b808d953293cc6c5d9c472af45dcf4aacf65eab9bcd052282d46bb1fd6d108f057c7ce8e5e22b902baa56d53";
+      sha512 = "2a6da2d7b7c8504ad90753d874738ef2306fd422b6a7540159e703babbf7d953a427acb51ccf556d54de42c816402ec7e41d1e2452b663822333837e0217558d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/hy-AM/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/hy-AM/thunderbird-60.7.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "18213aaf5bf8d761209c325305722bbbf8355c09856ce95d6b613c51cf824d6c53881355391ccca8cdf6f02e8f1e0c486219e1eb832124d313cc3115adea4927";
+      sha512 = "43fb0ebf562034c21baa1f1f9712bc1bf0f9908215cee4666cdaf48dec3030d0c93f45954d42e1ce6dea9afb29d913f2f0a082f48aab7a66f747c95fe33784e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/id/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/id/thunderbird-60.7.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "31790666d7cbf9571d32f6d372a3026fc7295004c14282557bf809ac1601242caac511d20ee8bdd04d8d63f864c300179b6d1a79cb8cc3aabfefb8088c88768c";
+      sha512 = "054035a6faf23cf27b8a926971f87534b31c08dcae1d09e7508481077019d6e7899a7276f31728e3d6912a0050e5e014b09fcdcf236cee544d57851a4b27528c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/is/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/is/thunderbird-60.7.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a790b49f9bc055ab302e369bf69f8353354d1ee1ae50a8666a1c6ebd48d500275cfeef16eadc0330710865dc3b5e4ec8577c973b80e581f03a2dd2f05f299663";
+      sha512 = "3d411dbcb9b8f9532c6fff06324fdc2a7a7a139adb3c6c50938ee7c75ec4eadb757e9717d2b12a60147c85b1a8741d8e7114c3d74ba700be317a5537fb603081";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/it/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/it/thunderbird-60.7.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "1ba1218036387f697420000b80ed33276a0535e3914ad10d993ec0f2aa9efd312b13027a77816eba129c59303d2dbe80e48b523313d3f1dfced8dd20f23e3f95";
+      sha512 = "07bfb76c346551d50b2dfefa12bf82425b52216c76b18477096b4fbebc5aee01f521d2c3f4cae7495a6db22dc4fa6d7b63fe2e1c061e9d011421dc7132073a23";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ja/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ja/thunderbird-60.7.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "a627ec7cac46179cb77e9b234de657cc6817a05adb55632b52a5d316be0fbee6a7475bc06a06b691650088376de4da1e7c2754de0cea3c7d21d47a4298c1f6be";
+      sha512 = "1a53ce62a0211f4589bfec9cced50ca527216a8ee0566a5cd4f18ec234428ad1a51e64a4af0ca32e38f2b69d506c24c63b28f0ce0f169277dc801376c459a4a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/kab/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kab/thunderbird-60.7.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "51282592eefdfc6249d48409c4210ded53306474c238785cf1fed7e55681b165e99493c5d3e4c1261c4bdeb5071f4a7d6fc32f0f243c41c749e67859449e6f55";
+      sha512 = "a43d9e81775d3a3ef2de8e5a1e0d2009821421db7b3c80b0f37d2cc2ca760e6eec6895cb4719e92eb4962ac23616a750e2f57d03b6ba3e43a031a3539dd02733";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/kk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/kk/thunderbird-60.7.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1ab662dc20156e6f1d90a73528e904b9361eea1d89f3b55ef67541c29f4620244b1e3dd61c795663f109452a98aebf436af4a8aa376b6a751f9a046d0e9d5ab2";
+      sha512 = "e373785cf2baa36d8425c5c3eb9dc0d432d47e603864d3c7593594f78cde2284b7a9dcddb69413b9d41a410252f461fa79c56c5c138e29b3b946ac6c3b70d3c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ko/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ko/thunderbird-60.7.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b3135bf41e32d4a431bb385b5e473c94810a65c8703810352a32bc6ae2665427636cb70c4c0c29bd3c85d68a89af1d9c5edef290d35c8b4f0adcd196d4e97084";
+      sha512 = "e14b3486c7c96f3ea228c74d666ff8af8f1960341b6ecc565369696635439ad4aec16e023584a89a063a87ead625acf69131d739760e3733c1ba1d390d6d8d09";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/lt/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/lt/thunderbird-60.7.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "acf6fe072deeb711480c571506ea96b96bbb2c0fdf85ed66bf03a800e1305682cb34daa2e44530c1c57ef59664e13c01584816453449486f595e38610956c15c";
+      sha512 = "aa8da2ad1da3b7249e5e2a93bfd2c3816c1dd0a1c34dbe462e9d8a1b4dd15f817eb9bbe9a50f20c106e40c60e79713c1ebc83416ed4c317e73fb7a98063a5b20";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ms/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ms/thunderbird-60.7.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8a74dfba38c2228e00ba3503fa6a05a0b4e4aba68c034e0711bc8f68c00efdeec816e0de6e6aea325427f8b6f790eb2b157df795a0d67e800beacd6fa572fe38";
+      sha512 = "d44b4b966c88a13af94193b0927648dd212209b91295a44fcb61515104e0336b0e3c3ecdb38e533b3e105349d20d766e78bb98f296e4a324885201e73c3c4555";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nb-NO/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nb-NO/thunderbird-60.7.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "49116d9ac9f9fe322b56a5908e1727c53ca5351f60ba9b7ec1f453580e0be85efa84cc467e901aa269fe266d39860b313173a36f08ac6c6420032b3fec11a823";
+      sha512 = "c3b934f025651525d1df9e3bcccdf3df18ea6975ff6e162f4d2782bf9f0654621df2be5d9e98011f3c3af48299f0cb943674305e9cb6b0a46926568ae76e981b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nl/thunderbird-60.7.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "091e81383130fab108de72f71794fbf9eeb08106367f64c5b0fd9ba48dd2363890c2dbfe2c0aec4d44feaad6b55cdaad8844c4291cb1d9d12f2ba0341c259ad9";
+      sha512 = "4187e7382e3aef4a0e4769fad1cef5e314cf5fef9f8e89ad1448dc41aa26dfb96f4dbe4578b05b437d1c4c21478e151a165463e4bbc6743990113d3458e30673";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/nn-NO/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/nn-NO/thunderbird-60.7.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "1384adc5a57fb5d4fb4fff055c94b81fa5430872f687ad339a76120604e4898cc9621ba21f366498f79323e8f3b7b0d1d2c44bcb35894019ee4797fe4b563976";
+      sha512 = "9743ad8576c6f648d03911d6c4c7b9abd945ed4d3114e70669adf1849a338eac4f9794f87111a66b58c84cce8135c5e00b55f157abe73aaf7e26e8aa3e957789";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pl/thunderbird-60.7.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "088e52c4fed03ccd663f6942c41203adf33e39272f3b6be5e4884e417586620f4eb732d861dfd6325ca63ee11c2e7412bf8eae1a7eec841237fd966f0422d377";
+      sha512 = "57178babba87a9cee46763e30131221011ede4ba8ad449c6a5f6a7930dbd73d01fc65480de012da0290732f22d970177440dc591d5101340ad8cc9d404b1ab24";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pt-BR/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-BR/thunderbird-60.7.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "d0a45e4b826d19d25f703dbf37a718dadb1fd2ec61e25457e306e08ba1f066fdbc48d2032b395c62ebde82280db0e9c519157e8e4b12bc28bf5cf49087760f0a";
+      sha512 = "3a7914fbce5b9365da8d74162cae4dd5fdc061094f0cec1b603650277314900b90f3e07d0a5cfbdf35f0005072eaa6857b5b0bf6fe6beb9da527fb450c829861";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/pt-PT/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/pt-PT/thunderbird-60.7.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "7a4f314d5dbd09ba3b7908d57dfb4719ec1a63ff5ff7edd0cb00e1f0bd96009c2870b0c18ca973210c57cce7d8fc76d4d8dc54b7235652e8f33f468dd58b5026";
+      sha512 = "b04b8be13234512967451a31b922c3ec67264f6c6e127c0f364038a9e4ba216fc38e4df4acee03a486c820ab56bcdc1fce983f95f21d82ebf3757b6de523fa86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/rm/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/rm/thunderbird-60.7.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "239c248c11b3f3a8c1d95ea9e3c973d965b2dfd8fd0790ee5aa85947db1295374e56b9cd1379e54e139fbac7b8c51e201b592d7b371ed72181011ae78f49b275";
+      sha512 = "aae5046694a3739988cbe230bce4114f79f2c0e7904a84ad623018e24663ac83978a41a41a5a1bc0095efdc532c9db07498c91a95ff03613f27d95a29a1697fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ro/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ro/thunderbird-60.7.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "5be62fbf84bd4e5f4eb24edd620269288aa09e0a65836c0dfdaee28d90a68375dab44d1e5c988704fc82efeab6d060e343b623b01de28e967b91390c54aedb91";
+      sha512 = "ae9eff34d48fd101406fd0ebc33f2d76f1b9b460a5b28527819aded93a35aa1f2b3c8f9fe853c50e7afb3d555ef86fa7882b39ab99935077c46bd8b702ea279d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/ru/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/ru/thunderbird-60.7.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "da9da528081d70ac504f61ae7668150e1a33acd159bf2f984805b7e76fd3e556cc6982b2d9596c621c533817c2cdd5e5ef28b42f362137908df1af097ae54f88";
+      sha512 = "9ce34ff4bb8537824d4704c4a4b6be5f1e4a37f0397e93f8ba818ba7e2940ca0e6e5cc624bcf9dbe3107177b20c488e4a2f2a05436cf6895635903ae3f5259e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/si/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/si/thunderbird-60.7.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "1ec7e7b376b8d1ad9d25b753f785c05fcfd8f46d50b8f9ef8a73600726ba056411d4e2cbca5cef3e8eb7fa9531be7828af30aecd10842ef0d46b7ffd09b6c95d";
+      sha512 = "894e09e0b5fca60b8719f9823f101176f7ba711d155594e897ec792a4d61bb3081a7cd579db83b04415d2355e01494de7295b4ede78e8de34a6b24e1de01c527";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sk/thunderbird-60.7.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "598a8eca2a14a9c76b098355bc735c641763762dde312e5a47e8448bf0ae5fe2c78061c727a7e097073fd0d05e121fa1f4fcecbafdf02adb5c9c18a92e5ada47";
+      sha512 = "a14777a08a8ed419d95a8d7f55f3b06b854a8eefa356a2231e83d0890342ba001795788e73823da1a138670d56eab5aae62d5380e37e24778df43b93d1377fa5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sl/thunderbird-60.7.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "724cae2a2437e337ca5142916e6072e43a5f329100ae3e72c258cf7efabeafbcd10c8c6ae0fe1e507afdfda23492e5d8a4f54f373bfef9025e5663b8bae291ee";
+      sha512 = "9b1f7de6a1968658fa53812aec1f0eb0d6b447b8d1319d9bce97df4f8b0f816f39304362ef65db6e21fe439e7ce6d055e319fba538ccf052a19930b9ded1106c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sq/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sq/thunderbird-60.7.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "317b776ea77f7232327e7bab54f27b2e47ada0f6ea7df42c42ef89ce2df0d9c3a24b752c08e46a8c246df5a44b7e34c7591e01bd63ec3cde7f537083dc1f8304";
+      sha512 = "db248c15d017d2cd54cd0703c8a927ad135870bc2eb5006f04c03460ec9b3887278561da0682f8e2760195ce41b51dc337609d17b2ed1bb2871e62025e58645d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sr/thunderbird-60.7.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "768f31cc6ef0adc40253f60c312cdd8033e1fe5515f007ac18db6e37da79d2ef70ff208786cc738e31ed1ca75d5745b9de845f22eeb4bd3b4c8f7f7aff074af5";
+      sha512 = "dadcb57443931d18e8f109a17e6e43f9c87232d16b92f5cdf5f9965ec5fa3625cb10d7d499a03b9aab8c882fb23a7dd444a187d6469c82d7912fd012a701e8bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/sv-SE/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/sv-SE/thunderbird-60.7.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "93951ffef37d547bb13143863c417f3717a4a6d54498852bcbd729f20a422d5a05233161d6970bce20f6992dfa07032d779160659b21e9e858505649ee2b3b6b";
+      sha512 = "31b53c38b7c1c5b101c67aa8e387febde4dc6c1a1760875fab77e284873a653fe6e0548a2057673a7aad270158542b501c10599adf4ae415907e973d256bd806";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/tr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/tr/thunderbird-60.7.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "c4a5510ecd6a2c98ef335b2862ec8b5123fcc1c88e3be72788f5863219abd20a639d7843faa19331ecdda6dab0365f21abb927e8fcdaf42ee4f36aaa37577fe5";
+      sha512 = "9c7c48ddde7254252b4ee6b423e8d171fa3cb08a2f3d5adff122f49769f24145f33fe6714a109b15f62a8c06381ba6e4fe1bafee27b6c79ab7b5fdb4deee5f5a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/uk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/uk/thunderbird-60.7.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "54854f5b2c237b0545e062bfce142d9ac5f0353f0e2ce066faadb77e40bf62b1468c537852d486fee610096886d1ffc815948037a8a7fe911133f15ab1e47a70";
+      sha512 = "a603f3be6439172027afdb3d31ddae7e7a61f9d1553f553d06e34fefec981afbdd889ed9a4083719a98b9e212ac14b5d2188c6e5846f9d05e9b2761a80d88254";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/vi/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/vi/thunderbird-60.7.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "85203efbb6e8f19135e61a4f297e7556592783d8e254f63c12687b77224af75b5c4d9a0aedd1c50dfd178a0cae865d980d958a8ef6c01b6932322c60ea052a4e";
+      sha512 = "1a7a0b2372b2fbdf45f60d2b9ad1a3fabda76c94ebbca83a9ff4935c18bc932fdff7b556d9716845ad8905d10a14e97bda4f9ade8668abd8b1a3d37416e55b2f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/zh-CN/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-CN/thunderbird-60.7.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "536759160596e2c893114a7f5dc094325b695fec33543d32feb5b92e244079e9c64a22635b84b5587a7bb34c613041664ad7303fc39b8d25a510bd248d38d124";
+      sha512 = "0e7afce0ad5e9553a93aec222b8731552fffe8fd104a172e8255d9e5158a8addadfc2ba3654ac34f1946b71645ca72e993009a87e422bf47d8e4c2cf6e77927a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-x86_64/zh-TW/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-x86_64/zh-TW/thunderbird-60.7.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "b63e819eae2b5aa71ac13fc875dce504effadd7e00bc46eb6b5c539c34d569d33da4895caa37a424b79d082a8b3693ba41908bd49d4914937c2d2a123a2feea2";
+      sha512 = "42dccbd9e10c817e220209e6a0feb53133f6eb6de3c3412d4b638f6e7ee13aedbe155b131164454f78b7080bc6eefba5cf9dd06124e05e60355c3a6e01d1c920";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ar/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ar/thunderbird-60.7.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "57acb34987d0d098bf8dcb43d44460f2ebf29a88d4b5377cf889681a50a71195fa81c4920d7fd69c76295a7c41fadc94790e858de53182e5257260817318f49c";
+      sha512 = "782798baa1f2028ad4a4fd9b635177792594a950e70298b6d669429ff9065fb7b10a1fd8f41de95ecc00e2d187d711b7b7a4913ce24229c0a74e37c8edcff5c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ast/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ast/thunderbird-60.7.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f538b3fdff93c7d19962c76e5fb7dba635fb8d2b14b760e39b024e04d878d475cc9f5dd317931f69a92cf8e79e62b32f9d1230d7876b4a5647233111f256d522";
+      sha512 = "9b60ad7ae495d2ab1d80750f6f0d5b76833c1c1d761be4704727967ac98e86877252f620a2f9e350aeeb44448b8f239df40bbc23e25ba2c9002249fd4f940d89";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/be/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/be/thunderbird-60.7.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a2e97e6393f9aa24e7d99d8f200019279bd7535982670cc7841411d9f8eedce1b0b7a17c272792097053d50974f8ea092019c1a2a86dfc781ad13f49166c35a9";
+      sha512 = "ba8737f9a5315964186c132380fb0189149ec6291e5eef8c2e775bda5ecf3a8fd1f3ae8e42ede3dab52790d54e99da283397213df7bbe09147a22c97b4d53217";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/bg/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/bg/thunderbird-60.7.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "5936686f7e62aff1475e6ef7600112b83316befa54a9befb34edadc5a2a03e5a4dbf2fb92b3b86b2a4c56296fbad50ab60922006638ccbd705225f6737231ecb";
+      sha512 = "23177755d75ff8c3bf485f983065d2fa6ca2a05f13d61c85aff6713462cc547bcd9db5713c8344ea29033cc628cba95779787850f43f0a1ecb77273e64020535";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/br/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/br/thunderbird-60.7.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "58153a303b6a76da23621f9503acb1ae7afcbc8fe68b4dd7d02a8cfcb95e3e5f86e8b3f6f6dd2812ae9781831d6b311c111e0a129d22a7bf83b7e15ebb44cf88";
+      sha512 = "c0c28eef08437fa044145cedb79b225836ec2084038d40f0e011a6fc26ebc432d36de98c8572b4c9b03cafd8968f9e0b255dcbc75236e39029e496352880de2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ca/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ca/thunderbird-60.7.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "fd3f289257574191c25e0ae5adc099f95c8c757dc881e8b85404d2df91069f09e6e8e1edbc7326824b55c8d7e10356e2e95f8d27fd741b0ce650cf32120d423b";
+      sha512 = "016cb59f63fcf89b9501d625d1b923caca67ec0619ce7e00ceb023e11ab2ccf2d14cbbf9b9b02899d1b3815c74a1168cce3e16f3ce8cf96d71e6ec09c0f7873d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/cs/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cs/thunderbird-60.7.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3d9f97fc839a33ead139e47aebd248dd947ee80c217c065c6714198f3438f5675611d27bfe26e52537bcf595a3e4dbabedd95ec3fac98cdd541da7af05cd82dc";
+      sha512 = "ff1c10f07a4dd7ec757ea7256796f0a8e2dc8e9d75107d6fda76a773cd15094fef28786208bfe2aa8ca8a2ac1bb889ccd55953309b2d870a706d4595f189ebfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/cy/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/cy/thunderbird-60.7.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "08b3a7ca0b49cdcc347f04cab508cb037c603eb255074c3c32ee06caa9f15f64038aaea2f96837beb414bafbc8b41e699edf4811eb7ef823c481b37c275d46a1";
+      sha512 = "75fee7596cf3cb44fcb38f071e258991acb63d15ea7460e36feec80b0a73cca882748c71b9e4b6b064beb4f23f608f1369e47cbf28cc2e511dcef32b1e429ceb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/da/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/da/thunderbird-60.7.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "6b9c8d18358d771b039e4d2dba999c18d7b8ef70ed74cd4be50325d3506015ba9f3795e9b489f0e99169a02db8daf5a91481aab0c43412f4ad6db93e03fa0ca8";
+      sha512 = "90ba57c2fd2c03556d895050797de75149d63ce13379e5a9d616962e5af61e859d460abe3f2519b26d4b60e0b7d91545b206cd91b928fc96df0c3714b407ca5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/de/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/de/thunderbird-60.7.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "55c741a9b849a2b7a8df800967c6ed17cdc805d7827137099fda1466c4677eb630fbeac9e28d1b92eee82521352f43bb77412f896e5d9ef21d9bf16e35a55898";
+      sha512 = "c61dfc96c0e1152c58a897648ca2030bc0a9a9d0112b9b2bab955583251650cb38b9c6a19b7095f4b855c5d1e8257500d13b2605c71629ad22a184bdd8fd6b80";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/dsb/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/dsb/thunderbird-60.7.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "bc96d4452f5b4aba09e30f65bd9298b267fc5b6982ea126d31bb3af22cd55bc9f29040b08d8580000f15b17f4fdc5b160f109145a458d5fdd8b7b6120ae6873f";
+      sha512 = "58645095374ed4f20fd9c78874a48a30c512d501ab8207e8228e0af9a1f187ae54a93631e02f6349e7da9e7b530c9dac31fd395a65ae93fa17d44e28a643471a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/el/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/el/thunderbird-60.7.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "c448c0fd389e9fb6a7ac1771ba2481c69af6c5549044e958bac258ee71d3e0a80a1ad60fd80e33fd7d96ee0e5921338b067d7d87281f354950db2816f185477b";
+      sha512 = "4ccddcfb3968fccc67be15e2c7364b5977e1dce72c8fc6111e95f2deb04d9ae5f00e3f0ae744d8ece9166701fc3c0774e3df4538883e320b0a5346c8a5d798f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/en-GB/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-GB/thunderbird-60.7.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "29c181d15234088c4e823f9681f8205a910190a493779733e587f0ce5eb304dad367b72b635541d509f2f5ab1bf7cbcaaccdf70047f372ea9f15c33605078778";
+      sha512 = "18ec0528569863e997bb65d88411448bc592991dcdad7cc0f20feec1cd054fde83e756149edca994f1a6de8c74a837a778d943af7bd75e26067965b3dabc729c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/en-US/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/en-US/thunderbird-60.7.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "631d84e772069bfe192f7db3fde5113595201b56340b8284fbd3c26c58ce67e93c2e52bdbe95c8378fa1b99f6d26d4ba6d2cc5851321251dc84c5d375773824c";
+      sha512 = "7525d96dfa29f001491bfae13cba51a70de91980df8d2e7eed3d869f36a32a34dde76e7ef9bcee544090505f9918c7c6062b863e1f4d76875eb9fb3ff9c1f4f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/es-AR/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-AR/thunderbird-60.7.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b1af2b1a40167ba7a75f833b64f0d27f9be48ec91880884ef33f931fa439084f6ebd77eaeaff19140d50c4da256325fca17385de032a05ebf0b1d0716ac80ea4";
+      sha512 = "565bf893dc422e46f7ffd2442aba9fec77cec284b3fb18ae5ad26e33d82d576aa0308453f29f8eed06b482038d4a663076809abbee03bb5ed7e63efb889be550";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/es-ES/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/es-ES/thunderbird-60.7.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "1f0452f271eb218d9370f627a7e1ca0b392e8979f26cc4396c159adde26a6f70779851e6d91787c5274a401402f1b924f72bb1add5b6d90c5442d32e86cf8c1e";
+      sha512 = "1c76bc4a8830ca332e768bdfdba5eb8f45919ca87fe278e7ed488f537633ac3e89f5759adef0ff53c48dae6e09174ae92828ade1645f75fd3e60f188a64c6b56";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/et/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/et/thunderbird-60.7.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "1dac4826026c051fa38a96287c5a5d5849679681994b584e08ce4143b229503d2912db520c6ddebd081e4d3a799fd692935436cb6816c1ff6a61bf40240d904b";
+      sha512 = "fae17d629afc4c5db4fc5cf33bb52119424de6daba00834894c5619f430d23f520bf115a471e22efe6aef2d3d66e0a9c5d5a6bbd369fc9a8e7e6dd65777082f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/eu/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/eu/thunderbird-60.7.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "3417239cb9b16b49a97df31008c7768e9fdc3d6197cc84d8bf360e2ff64c7d81f11e52e530b65d54e3a1ef4a1253c6c53c9baec8ffc915a4ae4d33e9abfd6d7f";
+      sha512 = "1ed16b53bb56893620b8a8294d7d03396845b051cc2883b3fa54f0b2bca138e49bb9f91668b8656805a139521536a7138074e73a4ebc02ff2b47ce653994a6c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fi/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fi/thunderbird-60.7.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3e31ccddca9537a2ddef98e4444a85eeb37227ef5da301d6aecc3abe714cd84aba33b926a7fdc8e5d6c3b72082d9457c0f2362aa5775d7cf354e2fc6600fcd2a";
+      sha512 = "b1dc117410aa600c14f3a163c6f08424ec7fe82b63d82469f5b59badf70cf954240dbec6b016d7446ff7465738279594e70fbcfc97410382db29ec4a09fadeb8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fr/thunderbird-60.7.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "813887a9db572f588b769c91061886547e813e8fb9761df26294d27af6eab75d1befc1950b890c3eb0a166b6e46d36bc55a2baecc96a4d33ae1a670c28cea0f3";
+      sha512 = "a0b4448fbbf9d35756167d939c3125913edbd42ddb250716bb335fe50101af2edb6e60c344c3d730c5f4030b1849f89e12b0da27d910fd7891cebab36c1c8511";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/fy-NL/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/fy-NL/thunderbird-60.7.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "ee9621ddc0eb0195fa5a4ca0b982eb9805fe470a098e81e0a0620169ef13081654200573943d429cb2a9ed8de61aa361e5fbc6ae35498bfee8de31192d8a9944";
+      sha512 = "afd95c42ffe67293ff9953751ab56cba121bf2db6acca45a9cd46cfd3c3b06e0a81c6938afb6ca5583d199b7572bd62008e64a8a38bf54f19fc34bcffa55b356";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ga-IE/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ga-IE/thunderbird-60.7.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "2e017ce8473ed99b573546aee5ec901c29243a9b4412ea594ce94f244c41edbc614eb902859289ce61d9e25edf0eb534c9bef1c00f3dd67c9515ff24caf6eeaa";
+      sha512 = "6e8cd471fbf8d835496907bdc8d48aa244457d87ffedfd40c8780d23ea15a04279165b1c17940eed6333d6a77c8f6e379ba0b2d3486ce2a5b05d5d0694196234";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/gd/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gd/thunderbird-60.7.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e49cd177caa27b072b08f71e7127a67e96ccc5960c6900e6f43cf47c0e78000f7f03e543243ca316834dc7c887fa0dc5675fa5f304430b0a8435c3be4cb95e92";
+      sha512 = "a657fb0427d39e136391ebf529a6f068165c352ece5fb5a6e4da083aa3992a706bfcd2ec2b6c2ee4a7b2a97d9bc8341b15b710239d9c9120ce5cd4bd8fe64641";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/gl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/gl/thunderbird-60.7.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "23aa10200e5e96b969db0d1e5c82b3cd78504d2742ebb09fb5910f0d68aef08f09d278954c3612bc980bd820a290b28184de65b229c3edc228db8c6b77d335d1";
+      sha512 = "cc18bc97e42f65a1e4eed02f10272f437cbd93362217932be4a8c3d2dd2fde5244e0e702f0c595b4a5bf6f4761643011f00b5c01bc8f25026f1e7d59abeff26a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/he/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/he/thunderbird-60.7.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ff21a536979886895db1e18bde93baf13447f240cf1d64a6018941b22cfdc206b0afaf7e02fa76f778e44d1ab333351bfcfdee475d24f37ea270a5eb500b099b";
+      sha512 = "6971b2f28d4ae587b0b7e1762722ba9792f1c706bea7f762c678368e909fd945aa3727dbf31aab200050bc8e34c9e3d2acee07da69e8a9236b85f7f204033bda";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hr/thunderbird-60.7.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "9e9f91262e633b6bd51cd349450c2078bfcb49e10c1bb63bdd0ce71cb63ba7aa35481547030638f5e2ad810959217887a69ffd99453cae03e20763ed71e66263";
+      sha512 = "1aecf1633bc2624ce52a628a45c990f9be954cf8f4716570357e954644b8511ca1fa71f122e8e721aa534d0c9ea5f781b4888120945a363336c34bfde3c4fd52";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hsb/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hsb/thunderbird-60.7.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "3205a0d1d96cf0f6dd1cafc08e3ff4f9fe14ed2917dee0209e1088a8aeddd74c59bb413d1ac32650e9829890ccf5b860b3a71f9dd92d35be7b26f201bcadc1a5";
+      sha512 = "4322855b3336866b25ad3ddcc89d7c1639d7ede55453d125a6d12b8c8ac182ddb1ec6848d82ecb0e97ae364de19f8a4035a19dd61bd24a8569bde6f550edb098";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hu/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hu/thunderbird-60.7.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "03fb2b6cf147af43ef8621201c75e35767378d72b67d9e3460818ee38a78a35d62ac404685ed0a212da055632f6787402663e5c87f4cc2e827ad23fdd7c54793";
+      sha512 = "10465d78a56c97f40e33c20ac8ee5d8da36ec24499b19a0f0fc1562f6e8d1e9a5044fe973faf3dfb535d8ade8aef6c0c04a8fe4506cd611fd7fcd385e8d44a40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/hy-AM/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/hy-AM/thunderbird-60.7.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "20d87f045b7969783c44c82701dbdcdf29fec9a2fa905ed0e00d824174c38425044983ac8b0507e5c8e5ce6c2489528ab0da880e06b85ae45f78be9a4a48c5d8";
+      sha512 = "4f12139618373a3880c3e74757f176dbdf7b6ade765fe7f6fdb607408742522a7552f4d56b5a8bf675cde0846d5b5966b16a3a5a119a68378ad480f3aa660610";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/id/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/id/thunderbird-60.7.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "24a68981c39b12c50a2b7454624d548196bdcc0979367169978e782a7f83121f8bb097dd117173a8d3a75cce79c5d40c607048547687240f0e8408525ee66101";
+      sha512 = "a791e693a38bd4d6b50f1701a63f2ca4916d17d65929753cee484adc63308907076024baac55f11cd38cf8d2eac4bc74fda8f557e71b2538b5b3cd8c24b90212";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/is/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/is/thunderbird-60.7.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "4f7dba2a9a04ded46d8812983368631bf9528def3dc03dd06804394c20c6760ca268c8638ae1813558dfe48220ce680a2a6a177817ae81e5719f34d310830b30";
+      sha512 = "46b4ea38c84392143f08aa7a3d6cb82faf405afbecc8fbd4b1483499b8367a9c84b8f27d9e491537b07c73bfd39f3db716b06549bc7d655ba15e2e9f5b13ad96";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/it/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/it/thunderbird-60.7.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "af3cf72dd486d6bdc585d06cc4f32438c7868f378e3ce2910da08c58f20f4e7d4c9012231f73cd95a2df22e1badfc23070b9cae5694889c562285c6587fafc91";
+      sha512 = "93f6b101dbaf46712c258efe2a7840c4c751bfa04610b80d010e75fe803e49fad3429168aba284a437273596db03da034da0fdf9a8356ce71e918def88f3ae49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ja/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ja/thunderbird-60.7.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "20169d2f4887ba49d41f2fd608d4842ad076705910bf720009bd2408d386ebac7ede2c0d52392f49e9c0f4b7403806716ba7dd150ad142a1649005a6d51a5da8";
+      sha512 = "4c9378f96da151fd45c030e7cd0a4ad0107776be947db1a75e105c30f360e4a81500e7c4da00d45bc11d2f7991d2542949e6cd6f62e54eaace90a4e1bfe283a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/kab/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kab/thunderbird-60.7.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6be43761a03541cb8c8fc61513745abe9263e9cf2b47dff191742bb1fb6fc6001b7d60ce80e1af85daf6016810064ce532be11f82cfe8ef352ecd0722cc983b1";
+      sha512 = "53fff9c63884aa8995d2b7ab5235efc318402f67735e7e2b5eb7be0f1a6a0164325deceb677c9d71cd1cdbd90831c7cf848ec92425d4879bf68d157580a07043";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/kk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/kk/thunderbird-60.7.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "31386ac56cf93b3f9aaea18973b5629f8afc1ed44f7fce3ae09ea9dd11a344ba4ada59422f8501984325ddf7906d2f70d69cbd5c6ddc8a768797d22232524423";
+      sha512 = "e319c8e8bcb93463de43c7d0ecd9014b71054669d17fe4f4a28fb1a7459a81fc538345a4780c652ec5fbf253fa6ac07dd9470fdce9898fca9bf6d77c9265db4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ko/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ko/thunderbird-60.7.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a241269e84ca52dbd00e073e8227f108028f2bef27f083d3d4c1fe76b4cb05231598bcb88726406b61168ca855ea995e13858fd7c193b8e346e8e6c7bd2b4fc3";
+      sha512 = "d59888bd895c5cf1805ad6357d2a3d4379fc003102bc32ad60f1c7afa88f1522652e606dfc337ae70e2bcb37697c743202ffcf61e7f0e5ed5f3fb64f4e7ba06e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/lt/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/lt/thunderbird-60.7.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "1f222a2ad3c583020957eab49ec2a6f3230880e8cf5b38be19b7e29b9eb593606f6b3a3a162d47c809ff3da1c7000f599e5ba0fd921340a442bd262f9c02cde3";
+      sha512 = "8c5fcfb2b5eef2f9e7b108113254fb1f8cd9283f43756b29360d371ecb99f2064203b499aaa7cc74f2fee925bbeca9d7ac04b68a24ed1c88cab8df28f6a9ef5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ms/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ms/thunderbird-60.7.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "faa2fb605a446e79b3f0c75d5c695de56c5404aa3921bd6684c6e385cb97089c43f33db7611d824173d4df9bf98001a76495a68324d87d52e8b4de58eb701a5c";
+      sha512 = "130ccc3359cb5fb77c8c02b9cfd0b7f61b02ff413eb4df303e4f956b844ff5320e465fac7d71a7f88b3f184f13f1d0ee68f46c1eddfca5278281a6e85c1ccb53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nb-NO/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nb-NO/thunderbird-60.7.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e1b6d917391561dfac0b36f9a305135659dd96e52cfc9a1080beb3c671a00f37cccbb39de02e790a87f0efef86ec8a8c0b8351184d44c5cbff5c5ba9862ac03d";
+      sha512 = "3b022f593bd9e00caa09577a244b629704f0a3e9f95153f7562c6a03c20dae0a0d0fad799a45f7aad0f231da4622815019f48f7ca2144c7926db78b2a010789a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nl/thunderbird-60.7.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "957caacf6a84c9d4454fe7b708c5b798c32296ccf2a1aaebcb02645065fb10a2f6f098a0f14661ccd4f9ae665e7ffe62fba40df7aa3d00e63606ff2d97a00c45";
+      sha512 = "35f3359afefdccb7099fd04a244818fbb33ba9d43bc537be4e72b4a2e41ec2da91536dded43fd2536fdca09d47755954cd79e2cd8bd1b4c3022748ed1502e8f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/nn-NO/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/nn-NO/thunderbird-60.7.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "5d0017b8485e7236ce23c64d1b8aa30d3c8f0d938bf6d98a4413b0abecf6bfb05c2a0975410432702f967e7261b028dbd89c4580d661f438c7c0f9a3181b7845";
+      sha512 = "85fac4e963e10e436b8302b1c27caf9c0cf2b34cf09d5e9341b03c69a49f0ab6166180c4646922d428203d99ee30002ff7120298b08ea2178f760c84ebd283c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pl/thunderbird-60.7.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "22231f71381381c358bfabbf62970b8ba69d6f72d0d3a13ac1bd04f870cea53cca9d937b28e8f456f5aee80b3967af5d13fea40177d8715008fb4ce84aa90f3f";
+      sha512 = "b839166bb3a8e40acbccd405ebb3c86908c853cbc65e78bb1378dbbc32505893101a9bbc338104325a50bcaea2febd6fdb1fb17f8be400278dfff4fd431c0abf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pt-BR/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-BR/thunderbird-60.7.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "53110bc399a63da962617e11f209aad895fa5254be955d70ac70d3bd70676dee695e7ff485255edc2107928ed169118fc50c149966b475fcdd5868a453710db2";
+      sha512 = "6c7857c76085493ea7763f655c9c4f65a055e2209f61bd572f87cc316fb71841b52073333c8d755a3afd73f584516ee11a82787363ea90ab58721a18b3cb1cc0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/pt-PT/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/pt-PT/thunderbird-60.7.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "05935c86b294444e296befb13803dec0b4b848e08324346dbd43a1c22e66cda226d0db5317a2c857cc799e6d9d0433c29594a529ba8a7ce3c371729bfdc7651e";
+      sha512 = "b87fc704c9c9997fb98cb1197e0796c8cef6303b0b33074966c5f6a6d2a134dee1e72e295c4f3b53cbaeaf7ccb9013f9fa5fbe1492785b7a98163d570d9628b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/rm/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/rm/thunderbird-60.7.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4567ae5e584f65946209d5ebfad07db68c11211737e446d96ecb3eed2ae55902600eaf1dab7d870b7ea00c38d87045ef45ebe3e78a416070b93206f0ce9a18cf";
+      sha512 = "184e1b99163c93a41fc7d7776c6ff8b3becb9e2d81caff173bf423833766af5c6894035826baf6f3cbe3c001cbc004ce4c3eae3b854b42e24ecc5e1efcb17451";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ro/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ro/thunderbird-60.7.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "fc323ca7ab5fb0d259a941ba4f1c49f998fbdacf9679185bc4f17665d092aede662d2ac7793a451b81ab24e968c8ea7a0ea391ee69b1d646831927fcc35af833";
+      sha512 = "ba590d9dce8868f0e12be8c5988d5449531447cd19dc79222f54c697d7b2c1d8074abbd77c959cf16105e831e2f52df8bf8092c2580ad16e86e094da11c7501a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/ru/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/ru/thunderbird-60.7.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0f656f500decb22f1e84f1f92d8e5faa4a702ec3858a759dcc303ed0caec50dcf3711da15803dd7c5cac2111653e49276f8935f99d7b75e385dbb0cf9512003c";
+      sha512 = "26631ffe2bd843bb6a70c04235e337faeef6b8282ab019b237813d7c49f867029ff7315aed2df68966c37cd49d8f3531c32c4527774efe91c97f7fa40b1dc054";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/si/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/si/thunderbird-60.7.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "768c011614527977ab446e0e9ac42f90f1bb91d2d1e3ee5e5e91a31e6085e12dbd37542080b964724e4c65a1cad25be7998137740f2bc6cd82cc2d1b9056fd75";
+      sha512 = "74c89177b532300875d4c092fa97dca0b529cb30215a1c8afc1036b1dacba4bc053fe4bcbff7d58cbc5989b76731e2bc6bd8cda6af6a563c19ada4214b6c26ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sk/thunderbird-60.7.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d648a5a20a1c0e4d6f50368fb57000e99b7868b1c4bab8861b2bea73e8b0ec2b9912f41e16ee272d49a6ced36c1e61ba267ba41b136255e3c5aacc15952fa3a2";
+      sha512 = "66bfa099cbddf76150e61464600111e9541e9310e11527604c60ae727d69fb954398aafee73602c215a8f27b5be601d0e5433cb5ccf9680259fafa86d142824a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sl/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sl/thunderbird-60.7.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ab9923acfcbc5c327a6f7cadbacbf680f1db10a27bbae270824b7ff4673805b20ff76c3fc694acfdf1ac2e537bf4f08d9599b1bdb4a2824eb98d264ca8a9bfeb";
+      sha512 = "de71ae24a9cff67566029a86c1c36e0091e206cd360282d8b2658794a333834a32a37f047592e9db918e8e6ed98c5e16851ecaac083de4e4fbfc07d5ff1d6f5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sq/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sq/thunderbird-60.7.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "fd6b788ea87a04185162d8bad64c5ac4d649e1c9a89b1eaf1e9cba704827a0d8e70e29cef4e18dd3f63307cde959561ff9cee880650cc9476b31f2f8c0ebe450";
+      sha512 = "b865dffab78f42f979e1177f7a784929a34e5e3d564b37dd20eccc99d3bc09141205d239f8a39780eba96959ef225af25b06badbb251543b8b718c9d98ccf2f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sr/thunderbird-60.7.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1edaea6e10b22ad82eca06a5c6f69a9a4cc515c32cde425735e7da371046ecdb6fec3be63212fe7747cda54661874a41dc1f7579ca0ccf8991fc459e3f813b2e";
+      sha512 = "69e530bfe403a982f7fbde5518fc42dae6328f6f4296562c15461af69cdadce29744acc403b8246f974f5a2d2261f525cd2d3f6ad3eef98ccac474798fd7b80e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/sv-SE/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/sv-SE/thunderbird-60.7.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3d895759ce8005718d3348058e6b9146d2cbab42ea9bab63446c0f91177ab1d52a84199fe4c0ef4cb5da4994db7239d97b7befddcf5155cd4a53b5fd91b250ad";
+      sha512 = "51dd55f015a206d4de382a320833900860b040d687516f07a2f40562d426cda9e6ac8ffe966bd59ea034ad0a97a1b60ac4ae150496c587bcb717e0813f31f5ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/tr/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/tr/thunderbird-60.7.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "36d5dd40de1824b97615353b002febcfcacceefd4af189313920292229511ef83049839fbe5fa18a3ae87b922c750da774f69f8cde79b77c57d4aabd14053229";
+      sha512 = "37e449b319ce21de7ab51db81f4ce21daa35d3c778ef4fed2c621f257175e20808e8b08027efa52221144f9467fd6b22873bc752dd253f75e2fc598eb4f2a842";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/uk/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/uk/thunderbird-60.7.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "ddceab3f336e9f0edf36a057e1805f41eba3308fe7ad06a135a7cc1a27d59229d9481535eda33aeb2db23c5b074d6bb83e02233645570f8ef4afef697210fa02";
+      sha512 = "a9924015e3bfcb1429066411b51f7c698fd572d6280ba69485514fbf51b4c7c5c6be5a7fc96c1c3645cf84dd25ecbac805754805f6e8c7c62df103177cf11d54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/vi/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/vi/thunderbird-60.7.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b660eee5eabfd65602d110168c81b6ba99d45f1ffb02e8a037bde6d47513f90b88f160b4125fbd91d3057bd35e1e9b743a715385b796aa2873f4906e3e44321b";
+      sha512 = "47652f46d7d7f47278d9d5bde0939059832da321d14021c68d7d5b2d1610aef12adb162415e49246d76b8d19cfc51b3ce5c5d357c047aa2479790b260463935b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/zh-CN/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-CN/thunderbird-60.7.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4d4e4d032623835297ca5e43bcd9a058794c3568f4918a6c984c39b8f0998a1f9b412fbb96047c1f5e9bc7bd69253f4636bea81fb6e61031c66ba4e5f229f5e9";
+      sha512 = "a6865c12d8fce0d76f32be09109244cc28d6ec3f72a1f95f1438b2d2622ef0b2ee0b6723904ea71078baea3e2571a047ef6852f49b146450a8e95a9ce72421de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.0/linux-i686/zh-TW/thunderbird-60.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.7.1/linux-i686/zh-TW/thunderbird-60.7.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0bdd9c9bd11544abb6230fc94bfa49e2f1ffccf8a5684a5326a7b38880870e847841e0c81dcc33b969fe4327c6a2d51ba3313306842cb8ecc084222444f2ac4b";
+      sha512 = "8caf6f74208bcbdef69f74fb766ffad582da65fc5304d42f2f67d1d91d167960d4fc83443c1de3e8ff19ae1e085b8ddda791925a71f6e173f10aa4b4e2b01e76";
     }
     ];
 }
diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d08ccc0ad606..0a3c4789cf2d 100644
--- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -24,11 +24,11 @@ let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "60.7.0";
+  version = "60.7.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "0l773bl9kkrz905rm4ipsic5ykkrw2lmg3i9c5vxpc0j1qgmz3p3x5db1kbk2yy2i5hx9lkn5szhgjf71d7dgvf7935z67d5djqnhk0";
+    sha512 = "25dgbshgfmalxyah9rrgrxi4n0bmj0agcllz2hzv37w7makkl7qpf4wr859ykymmmvawcs8n747ppq9x73gn32bw88bjyxv2bn4l78q";
   };
 
   # from firefox, but without sound libraries
diff --git a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
index 6e37a87dc9f1..f3c7f8ccf18a 100644
--- a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "synapse-bt";
-  version = "unstable-2019-05-26";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "Luminarys";
     repo = "synapse";
-    rev = "4a6e6c33b4c36eca89d216906d615797ba9a519e";
-    sha256 = "0110y3lkzfhgvmdg6q71jyp5q9jjp2bzdb6cwnkp8c734c2k1gfw";
+    rev = version;
+    sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
   };
 
   cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";
diff --git a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
index 4caa9ae63f75..9cd6083f40cc 100644
--- a/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/nixpkgs/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} :
+{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig
+, enableCredssp ? (!stdenv.isDarwin)
+} :
 
 stdenv.mkDerivation (rec {
   pname = "rdesktop";
@@ -11,18 +13,19 @@ stdenv.mkDerivation (rec {
   };
 
   nativeBuildInputs = [pkgconfig];
-  buildInputs = [openssl libX11 libgssglue];
+  buildInputs = [openssl libX11]
+    ++ stdenv.lib.optional enableCredssp libgssglue;
 
   configureFlags = [
     "--with-ipv6"
     "--with-openssl=${openssl.dev}"
     "--disable-smartcard"
-  ];
+  ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp";
 
   meta = {
     description = "Open source client for Windows Terminal Services";
     homepage = http://www.rdesktop.org/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     license = stdenv.lib.licenses.gpl2;
   };
 })
diff --git a/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/nixpkgs/pkgs/applications/networking/syncplay/default.nix
index 4f4eaf302455..c8610d80ca78 100644
--- a/nixpkgs/pkgs/applications/networking/syncplay/default.nix
+++ b/nixpkgs/pkgs/applications/networking/syncplay/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, python3Packages }:
+{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
   name = "syncplay-${version}";
   version = "1.6.3";
 
   format = "other";
 
-  src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.6.3.tar.gz;
-    sha256 = "151p1njlp3dp3pfr3l3m6ia5829zvjyjh4p45j6rgnicbh8sqrgs";
+  src = fetchFromGitHub {
+    owner = "Syncplay";
+    repo = "syncplay";
+    rev = "v${version}";
+    sha256 = "03xw44lxdk1h9kbvfviqzpmxxld6zvp07i0hvdm1chchyp0a109h";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pyside twisted ];
+  propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls;
 
   makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://syncplay.pl/;
     description = "Free software that synchronises media players";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
index 462e6fbb7a04..91b12d8a33c3 100644
--- a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
+++ b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-cli-${version}";
-  version = "8.2.0";
+  version = "8.5.0";
   
   src = fetchzip {
     url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
-    sha256  = "0lcyyay2fyywcn096y33d77r6fpvwggv5qdkky5qy16lh6rfx1lm";
+    sha256  = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
     extraPostFetch = "chmod go-w $out";
   };
   
diff --git a/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/nixpkgs/pkgs/applications/office/gnumeric/default.nix
index 87aaf85d950c..5845536e72ed 100644
--- a/nixpkgs/pkgs/applications/office/gnumeric/default.nix
+++ b/nixpkgs/pkgs/applications/office/gnumeric/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) python pygobject3;
 in stdenv.mkDerivation rec {
   pname = "gnumeric";
-  version = "1.12.44";
+  version = "1.12.45";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0147962c6ybdsj57rz95nla0rls7g545wc2n7pz59zmzyd5pksk0";
+    sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
   };
 
   configureFlags = [ "--disable-component" ];
diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index 2a4a049daa5a..2429f2dc8b50 100644
--- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb
+, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -345,24 +345,25 @@ in stdenv.mkDerivation rec {
     make slowcheck
   '';
 
+  nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ];
+
   buildInputs = with xorg;
-    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
+    [ ant ArchiveZip boost cairo clucene_core
       IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk2
       hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base glib mariadb
+      gst_all_1.gst-plugins-base glib mysql.connector-c
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
-      mdds bluez5 libcmis libwps libabw libzmf libtool
+      mdds bluez5 libcmis libwps libabw libzmf
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
       librevenge libe-book libmwaw glm glew ncurses epoxy
       libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
     ]
     ++ lib.optional kdeIntegration kdelibs4;
-  nativeBuildInputs = [ wrapGAppsHook gdb fontforge ];
 
   passthru = {
     inherit srcs jdk;
diff --git a/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix b/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix
new file mode 100644
index 000000000000..1a41a28a19aa
--- /dev/null
+++ b/nixpkgs/pkgs/applications/science/biology/cd-hit/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+  version = "4.8.1";
+  pname = "cd-hit";
+
+  src = fetchFromGitHub {
+    owner = "weizhongli";
+    repo = "cdhit";
+    rev = "V${version}";
+    sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i";
+  };
+
+  propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick perlPackages.Storable ];
+
+  nativeBuildInputs = [ zlib makeWrapper ];
+
+  makeFlags = [ "PREFIX=$(out)/bin" ];
+
+  preInstall = "mkdir -p $out/bin";
+
+  postFixup = ''
+    wrapProgram $out/bin/FET.pl --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/plot_2d.pl --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/clstr_list_sort.pl --prefix PERL5LIB : $PERL5LIB
+  '';
+  meta = with stdenv.lib; {
+    description = "Clustering and comparing protein or nucleotide sequences";
+    homepage = http://weizhongli-lab.org/cd-hit/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
index 5fc71c9fc6ba..4b580a6cf52e 100644
--- a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "8.4";
+  version = "9.0";
   fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
-    sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
+    sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
   };
 
   nativeBuildInputs = [ perl procps fftw.dev ];
diff --git a/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix b/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix
index 4e86d1d917f8..c91443bf64a5 100644
--- a/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/nixpkgs/pkgs/applications/science/electronics/pulseview/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pulseview-0.4.0";
+  name = "pulseview-0.4.1";
 
   src = fetchurl {
     url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
-    sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
+    sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/nixpkgs/pkgs/applications/science/logic/z3/0001-fix-2131.patch b/nixpkgs/pkgs/applications/science/logic/z3/0001-fix-2131.patch
deleted file mode 100644
index 0b21b8fffd40..000000000000
--- a/nixpkgs/pkgs/applications/science/logic/z3/0001-fix-2131.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From c5df6ce96e068eceb77019e48634721c6a5bb607 Mon Sep 17 00:00:00 2001
-From: Nikolaj Bjorner <nbjorner@microsoft.com>
-Date: Sun, 10 Feb 2019 10:07:24 -0800
-Subject: [PATCH 1/1] fix #2131
-
-Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
----
- src/api/python/README.txt    | 10 +++-------
- src/api/python/setup.py      |  2 +-
- src/ast/recfun_decl_plugin.h |  2 +-
- 3 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/api/python/README.txt b/src/api/python/README.txt
-index 9312b1119..561b8dedc 100644
---- a/src/api/python/README.txt
-+++ b/src/api/python/README.txt
-@@ -1,8 +1,4 @@
--You can learn more about Z3Py at:
--http://rise4fun.com/Z3Py/tutorial/guide
--
--On Windows, you must build Z3 before using Z3Py.
--To build Z3, you should executed the following command
-+On Windows, to build Z3, you should executed the following command
- in the Z3 root directory at the Visual Studio Command Prompt
- 
-        msbuild /p:configuration=external
-@@ -12,8 +8,8 @@ If you are using a 64-bit Python interpreter, you should use
-        msbuild /p:configuration=external /p:platform=x64
- 
- 
--On Linux and macOS, you must install Z3Py, before trying example.py.
--To install Z3Py on Linux and macOS, you should execute the following
-+On Linux and macOS, you must install python bindings, before trying example.py.
-+To install python on Linux and macOS, you should execute the following
- command in the Z3 root directory
- 
-         sudo make install-z3py
-diff --git a/src/api/python/setup.py b/src/api/python/setup.py
-index 2a750fee6..063680e2b 100644
---- a/src/api/python/setup.py
-+++ b/src/api/python/setup.py
-@@ -178,7 +178,7 @@ setup(
-     name='z3-solver',
-     version=_z3_version(),
-     description='an efficient SMT solver library',
--    long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compiliation, or installation, please submit issues to https://github.com/angr/angr-z3',
-+    long_description='Z3 is a theorem prover from Microsoft Research with support for bitvectors, booleans, arrays, floating point numbers, strings, and other data types.\n\nFor documentation, please read http://z3prover.github.io/api/html/z3.html\n\nIn the event of technical difficulties related to configuration, compilation, or installation, please submit issues to https://github.com/angr/angr-z3',
-     author="The Z3 Theorem Prover Project",
-     maintainer="Audrey Dutcher",
-     maintainer_email="audrey@rhelmot.io",
-diff --git a/src/ast/recfun_decl_plugin.h b/src/ast/recfun_decl_plugin.h
-index 0247335e8..b294cdfce 100644
---- a/src/ast/recfun_decl_plugin.h
-+++ b/src/ast/recfun_decl_plugin.h
-@@ -56,7 +56,7 @@ namespace recfun {
-         friend class def;
-         func_decl_ref       m_pred; //<! predicate used for this case
-         expr_ref_vector     m_guards; //<! conjunction that is equivalent to this case
--        expr_ref            m_rhs; //<! if guard is true, `f(t1…tn) = rhs` holds
-+        expr_ref            m_rhs; //<! if guard is true, `f(t1...tn) = rhs` holds
-         def *               m_def; //<! definition this is a part of
-         bool                m_immediate; //<! does `rhs` contain no defined_fun/case_pred?
- 
--- 
-2.19.2
-
diff --git a/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/nixpkgs/pkgs/applications/science/logic/z3/default.nix
index 8c1c0ca23024..14f75fb68b5e 100644
--- a/nixpkgs/pkgs/applications/science/logic/z3/default.nix
+++ b/nixpkgs/pkgs/applications/science/logic/z3/default.nix
@@ -1,20 +1,16 @@
 { stdenv, fetchFromGitHub, python, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  name = "z3-${version}";
-  version = "4.8.4";
+  pname = "z3";
+  version = "4.8.5";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
-    repo   = "z3";
-    rev    = name;
-    sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
+    repo   = pname;
+    rev    = "Z3-${version}";
+    sha256 = "11sy98clv7ln0a5vqxzvh6wwqbswsjbik2084hav5kfws4xvklfa";
   };
 
-  patches = [
-    ./0001-fix-2131.patch
-  ];
-
   buildInputs = [ python fixDarwinDylibNames ];
   propagatedBuildInputs = [ python.pkgs.setuptools ];
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 5bfd74344e8c..b3941809fb4c 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
 , docbook_xsl, pkgconfig, luajit
-, groff, gzip, bzip2, xz
+, coreutils, gnused, groff, docutils
+, gzip, bzip2, xz
 , python, wrapPython, pygments, markdown
 }:
 
@@ -35,6 +36,9 @@ stdenv.mkDerivation rec {
 
     substituteInPlace filters/html-converters/man2html \
       --replace 'groff' '${groff}/bin/groff'
+
+    substituteInPlace filters/html-converters/rst2html \
+      --replace 'rst2html.py' '${docutils}/bin/rst2html.py'
   '';
 
   # Give cgit a git source tree and pass configuration parameters (as make
@@ -57,6 +61,10 @@ stdenv.mkDerivation rec {
     cp cgitrc.5 "$out/share/man/man5"
 
     wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
+
+    for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
+      wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}'
+    done
   '';
 
   meta = {
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
index c76b82ffe6d4..3acfd4bc4001 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.21.0";
+  version = "2.22.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc";
+    sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@@ -96,7 +96,9 @@ stdenv.mkDerivation {
 
   postBuild = ''
     make -C contrib/subtree
-  '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + (stdenv.lib.optionalString perlSupport ''
+    make -C contrib/diff-highlight
+  '') + (stdenv.lib.optionalString stdenv.isDarwin ''
     make -C contrib/credential/osxkeychain
   '') + (stdenv.lib.optionalString withLibsecret ''
     make -C contrib/credential/libsecret
diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json
index 1b296e1f4121..a9da7e30036a 100644
--- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json
+++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json
@@ -1,12 +1,12 @@
 {
   "ce": {
-    "version": "11.10.4",
-    "repo_hash": "02rvf5ikahydswjldzg99k8han051ap7v8h9mcjgrr4xmj301hxm",
-    "deb_hash": "0sigpp5lhg4pl88gsgf7dq2k7mi2wgaz0vdsl25c97w1daw7a60c",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.4-ce.0_amd64.deb/download.deb",
+    "version": "11.10.5",
+    "repo_hash": "00bkdylcnz171jf8di05ygviplqzssazrfaqpwmbqwdjab2ax4yr",
+    "deb_hash": "1zsg4fhpl07pz76i4yynk38xs7cp9w4jcryxk7larbr25m48q4rb",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.5-ce.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ce",
-    "rev": "v11.10.4",
+    "rev": "v11.10.5",
     "passthru": {
       "GITALY_SERVER_VERSION": "1.34.1",
       "GITLAB_PAGES_VERSION": "1.5.0",
@@ -15,13 +15,13 @@
     }
   },
   "ee": {
-    "version": "11.10.4",
-    "repo_hash": "06nf94k0ay9kmx060j387hydyf6crv0f1pjb691r3y6s713m6php",
-    "deb_hash": "1g0mlyzm2ikpblmy529wg6az5biiqczpr3kyp2mk4yjkdvg59jjp",
-    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.4-ee.0_amd64.deb/download.deb",
+    "version": "11.10.5",
+    "repo_hash": "0nla908l3513r87i3x2fa87j48wgykzpf7cqxddnahk98m0wgxvi",
+    "deb_hash": "02ri9b4xd77wqjnd49h5n77aylrb5xlq6xa26xn39kl326isaj41",
+    "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.5-ee.0_amd64.deb/download.deb",
     "owner": "gitlab-org",
     "repo": "gitlab-ee",
-    "rev": "v11.10.4-ee",
+    "rev": "v11.10.5-ee",
     "passthru": {
       "GITALY_SERVER_VERSION": "1.34.1",
       "GITLAB_PAGES_VERSION": "1.5.0",
@@ -29,4 +29,4 @@
       "GITLAB_WORKHORSE_VERSION": "8.5.2"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/applications/version-management/rcs/default.nix b/nixpkgs/pkgs/applications/version-management/rcs/default.nix
index df1739aea572..862b9eacd628 100644
--- a/nixpkgs/pkgs/applications/version-management/rcs/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/rcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ed }:
+{ stdenv, fetchurl, fetchpatch, ed }:
 
 stdenv.mkDerivation rec {
   name = "rcs-5.9.4";
@@ -10,10 +10,51 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ed ];
 
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    # This failure appears unrelated to the subject of the test. This
+    # test seems to rely on a bash bug where `test $x -nt $y` ignores
+    # subsecond values in timetamps. This bug has been fixed in Bash
+    # 5, and seemingly doesn't affect Darwin.
+    ./disable-t810.patch
+
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
+      extraPrefix = "";
+      sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
+    })
+
+    # Expected to appear in the next release
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
+      sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
+    })
+  ];
+
   doCheck = true;
 
+  checkFlags = [ "VERBOSE=1" ];
+
+  checkPhase = ''
+    # If neither LOGNAME or USER are set, rcs will default to
+    # getlogin(), which is unreliable on macOS. It will often return
+    # things like `_spotlight`, or `_mbsetupuser`. macOS sets both
+    # environment variables in user sessions, so this is unlikely to
+    # affect regular usage.
+
+    export LOGNAME=$(id -un)
+
+    print_logs_and_fail() {
+      grep -nH -e . -r tests/*.d/{out,err}
+      return 1
+    }
+
+    make $checkFlags check || print_logs_and_fail
+  '';
+
   NIX_CFLAGS_COMPILE = [ "-std=c99" ];
 
+  hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format";
+
   meta = {
     homepage = https://www.gnu.org/software/rcs/;
     description = "Revision control system";
@@ -27,6 +68,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch b/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch
new file mode 100644
index 000000000000..745f1868a369
--- /dev/null
+++ b/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch
@@ -0,0 +1,10 @@
+--- rcs-5.9.4-orig/tests/Makefile.in	2015-01-22 19:40:36.000000000 +0900
++++ rcs-5.9.4/tests/Makefile.in	2019-04-16 20:04:30.557626000 +0900
+@@ -1372,7 +1372,6 @@
+  t803 \
+  t804 \
+  t805 \
+- t810 \
+  t900 \
+  t999
+ 
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile
index 952dd8bda4d5..343c7b3a5470 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem "bundler", ">= 1.5.0"
 
-gem "rails", "5.2.2.1"
+gem "rails", "5.2.3"
 gem "rouge", "~> 3.3.0"
 gem "request_store", "1.0.5"
 gem "mini_mime", "~> 1.0.1"
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
index 215704e5b38e..671d2bb4ac1f 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
@@ -1,19 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2.1)
-      actionpack (= 5.2.2.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2.1)
-      actionview (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -21,26 +21,26 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actionview (5.2.2.1)
-      activesupport (= 5.2.2.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2.1)
-      activesupport (= 5.2.2.1)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.2.1)
-      activesupport (= 5.2.2.1)
-    activerecord (5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -56,16 +56,15 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
+    childprocess (1.0.1)
+      rake (< 13.0)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
     css_parser (1.7.0)
       addressable
-    csv (3.0.6)
+    csv (3.0.9)
     docile (1.1.5)
     erubi (1.8.0)
-    ffi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
@@ -89,10 +88,10 @@ GEM
     mysql2 (0.5.2)
     net-ldap (0.16.1)
     nio4r (2.3.1)
-    nokogiri (1.10.2)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     pg (1.1.4)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     puma (3.12.1)
     rack (2.0.7)
     rack-openid (1.4.2)
@@ -100,27 +99,27 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2.1)
-      actioncable (= 5.2.2.1)
-      actionmailer (= 5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      activestorage (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.2.1)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -132,17 +131,17 @@ GEM
     redcarpet (3.4.0)
     request_store (1.0.5)
     rmagick (2.16.0)
-    roadie (3.4.0)
+    roadie (3.5.0)
       css_parser (~> 1.4)
-      nokogiri (~> 1.5)
+      nokogiri (~> 1.8)
     roadie-rails (1.3.0)
       railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
     rouge (3.3.0)
     ruby-openid (2.3.0)
-    rubyzip (1.2.2)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
+    rubyzip (1.2.3)
+    selenium-webdriver (3.142.3)
+      childprocess (>= 0.5, < 2.0)
       rubyzip (~> 1.2, >= 1.2.2)
     simplecov (0.14.1)
       docile (~> 1.1.0)
@@ -160,9 +159,9 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.19)
@@ -186,7 +185,7 @@ DEPENDENCIES
   pg (~> 1.1.4)
   puma (~> 3.7)
   rack-openid
-  rails (= 5.2.2.1)
+  rails (= 5.2.3)
   rails-dom-testing
   rbpdf (~> 1.19.6)
   redcarpet (~> 3.4.0)
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix
index 82a994478cd2..1f3c4a832fbe 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bundlerEnv, ruby }:
 
 let
-  version = "4.0.3";
+  version = "4.0.4";
   rubyEnv = bundlerEnv {
     name = "redmine-env-${version}";
 
@@ -15,7 +15,7 @@ in
 
     src = fetchurl {
       url = "https://www.redmine.org/releases/${name}.tar.gz";
-      sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac";
+      sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
     };
 
     buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix
index 53c2d73b6e93..34e459111f8a 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix
@@ -3,28 +3,28 @@
     dependencies = ["actionpack" "nio4r" "websocket-driver"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871";
+      sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw";
+      sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx";
+      sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   actionpack-xml_parser = {
     dependencies = ["actionpack" "railties"];
@@ -39,55 +39,55 @@
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb";
+      sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   activejob = {
     dependencies = ["activesupport" "globalid"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3";
+      sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   activemodel = {
     dependencies = ["activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65";
+      sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   activerecord = {
     dependencies = ["activemodel" "activesupport" "arel"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v";
+      sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   activestorage = {
     dependencies = ["actionpack" "activerecord" "marcel"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n";
+      sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   activesupport = {
     dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb";
+      sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -124,13 +124,13 @@
     version = "2.18.0";
   };
   childprocess = {
-    dependencies = ["ffi"];
+    dependencies = ["rake"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+      sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "1.0.1";
   };
   concurrent-ruby = {
     source = {
@@ -160,10 +160,10 @@
   csv = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd";
+      sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b";
       type = "gem";
     };
-    version = "3.0.6";
+    version = "3.0.9";
   };
   docile = {
     source = {
@@ -181,14 +181,6 @@
     };
     version = "1.8.0";
   };
-  ffi = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
-      type = "gem";
-    };
-    version = "1.10.0";
-  };
   globalid = {
     dependencies = ["activesupport"];
     source = {
@@ -334,10 +326,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
+      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
       type = "gem";
     };
-    version = "1.10.2";
+    version = "1.10.3";
   };
   pg = {
     source = {
@@ -350,10 +342,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.1.0";
   };
   puma = {
     source = {
@@ -393,10 +385,10 @@
     dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9";
+      sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   rails-dom-testing = {
     dependencies = ["activesupport" "nokogiri"];
@@ -420,10 +412,10 @@
     dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6";
+      sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
       type = "gem";
     };
-    version = "5.2.2.1";
+    version = "5.2.3";
   };
   rake = {
     source = {
@@ -478,10 +470,10 @@
     dependencies = ["css_parser" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx";
+      sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.5.0";
   };
   roadie-rails = {
     dependencies = ["railties" "roadie"];
@@ -511,19 +503,19 @@
   rubyzip = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+      sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.3";
   };
   selenium-webdriver = {
     dependencies = ["childprocess" "rubyzip"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs";
+      sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy";
       type = "gem";
     };
-    version = "3.141.0";
+    version = "3.142.3";
   };
   simplecov = {
     dependencies = ["docile" "json" "simplecov-html"];
@@ -589,18 +581,18 @@
     dependencies = ["websocket-extensions"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
+      sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
       type = "gem";
     };
-    version = "0.7.0";
+    version = "0.7.1";
   };
   websocket-extensions = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
+      sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   xpath = {
     dependencies = ["nokogiri"];
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock
index 888175335a7a..21296d343b44 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -57,7 +57,7 @@ GEM
       addressable
     docile (1.1.5)
     erubis (2.7.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
@@ -88,7 +88,7 @@ GEM
     pg (0.18.4)
     protected_attributes (1.1.4)
       activemodel (>= 4.0.1, < 5.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rack (1.6.11)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
@@ -135,7 +135,7 @@ GEM
       railties (>= 3.0, < 5.1)
       roadie (~> 3.1)
     ruby-openid (2.3.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix
index 12f3d18a32c5..c97bf5127dc8 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bundlerEnv, ruby }:
 
 let
-  version = "3.4.10";
+  version = "3.4.11";
   rubyEnv = bundlerEnv {
     name = "redmine-env-${version}";
 
@@ -15,7 +15,7 @@ in
 
     src = fetchurl {
       url = "https://www.redmine.org/releases/${name}.tar.gz";
-      sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh";
+      sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
     };
 
     buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix
index 87b0b0b4f7ad..4ef4bd404270 100644
--- a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix
+++ b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix
@@ -166,10 +166,10 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+      sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.1";
   };
   globalid = {
     dependencies = ["activesupport"];
@@ -342,10 +342,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.1.0";
   };
   rack = {
     source = {
@@ -504,10 +504,10 @@
   rubyzip = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+      sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.3";
   };
   selenium-webdriver = {
     dependencies = ["childprocess" "rubyzip" "websocket"];
diff --git a/nixpkgs/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix
index a2ba36640ad5..f9b5c4c01965 100644
--- a/nixpkgs/pkgs/applications/video/makemkv/default.nix
+++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.14.3";
+  ver = "1.14.4";
   builder = ./builder.sh;
 
   # Using two URLs as the first one will break as soon as a new version is released
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
     ];
-    sha256 = "1d1b7rppbxx2b9p1smf0nlgp47j8b1z8d7q0v82kwr4qxaa0xcg0";
+    sha256 = "0vmmvldmwmq9g202abblj6l15kb8z3b0c6mcc03f30s2yci6ij33";
   };
 
   src_oss = fetchurl {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
     ];
-    sha256 = "1jgyp6qs8r0z26258mvyg9dx7qqqdqrdsziw6m24ka77zpfg4b12";
+    sha256 = "0n1nlq17dxcbgk9xqf7nv6zykvh91yhsjqdhq55947wc11fxjqa0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix
index 7f1233a4e04e..c9fc11e889df 100644
--- a/nixpkgs/pkgs/applications/video/vlc/default.nix
+++ b/nixpkgs/pkgs/applications/video/vlc/default.nix
@@ -26,11 +26,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "3.0.6";
+  version = "3.0.7";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q";
+    sha256 = "05irswyg9acflxzy4vfyvgi643r72vsvagv118zawjqg1wagxdaw";
   };
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
new file mode 100644
index 000000000000..4ef02af106e3
--- /dev/null
+++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, glib
+, glibc
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+  project = "conmon";
+  name = "${project}-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = project;
+    rev = "v${version}";
+    sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib systemd ] ++
+    stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+
+  installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/containers/conmon;
+    description = "An OCI container runtime monitor";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vdemeester saschagrunert ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
index 51dd2b1e6dfa..2e7b476443fd 100644
--- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
@@ -41,15 +41,10 @@ buildGoPackage rec {
   buildPhase = ''
     pushd go/src/${goPackagePath}
 
-    # Build conmon and pause
+    # Build pause
     go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
       -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
 
-    pushd conmon
-    ../bin/crio-config
-    popd
-
-    make -C conmon
     make -C pause
 
     # Build the crio binary
@@ -60,7 +55,6 @@ buildGoPackage rec {
     install -Dm755 bin/crio $bin/bin/crio${flavor}
 
     mkdir -p $bin/libexec/crio
-    install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor}
     install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
   '';
 
diff --git a/nixpkgs/pkgs/applications/virtualization/lkl/default.nix b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
index d870e2466167..40503ab89d70 100644
--- a/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
+{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
+, buildPackages }:
 
 stdenv.mkDerivation rec {
   name = "lkl-2018-08-22";
@@ -40,7 +41,12 @@ stdenv.mkDerivation rec {
   #   crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
   hardeningDisable = [ "format" "fortify" ];
 
-  makeFlags = "-C tools/lkl";
+  makeFlags = [
+    "-C tools/lkl"
+    "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+    "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix b/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix
deleted file mode 100644
index dfc3cc353165..000000000000
--- a/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }:
-
-with lib;
-with builtins;
-
-stdenv.mkDerivation rec {
-  pname = "conmon";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner  = "containers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib ];
-
-  installPhase = ''
-    install -D -m 555 bin/conmon $out/bin/conmon
-  '';
-
-  meta = {
-    homepage = https://github.com/containers/conmon;
-    description = "An OCI container runtime monitor";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ vdemeester ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix
new file mode 100644
index 000000000000..722566ea2e9e
--- /dev/null
+++ b/nixpkgs/pkgs/applications/window-managers/neocomp/default.nix
@@ -0,0 +1,85 @@
+{ stdenv
+, fetchFromGitHub
+, asciidoc
+, docbook_xml_dtd_45
+, docbook_xsl
+, freetype
+, judy
+, libGL
+, libconfig
+, libdrm
+, libxml2
+, libxslt
+, libXcomposite
+, libXdamage
+, libXext
+, libXinerama
+, libXrandr
+, libXrender
+, pcre
+, pkgconfig
+}:
+let
+  rev   = "v0.6-17-g271e784";
+in
+stdenv.mkDerivation rec {
+  name    = "neocomp-unstable-${version}";
+  version = "2019-03-12";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "DelusionalLogic";
+    repo   = "NeoComp";
+    sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg";
+  };
+
+  buildInputs = [
+    asciidoc
+    docbook_xml_dtd_45
+    docbook_xsl
+    freetype
+    judy
+    libGL
+    libconfig
+    libdrm
+    libxml2
+    libxslt
+    libXcomposite
+    libXdamage
+    libXext
+    libXinerama
+    libXrandr
+    libXrender
+    pcre
+    pkgconfig
+  ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"
+    "ASTDIR=${placeholder "out"}/share/neocomp/assets"
+    "COMPTON_VERSION=git-${rev}-${version}"
+  ];
+
+  postPatch = ''
+    substituteInPlace src/compton.c --replace \
+      "assets_add_path(\"./assets/\");" \
+      "assets_add_path(\"$out/share/neocomp/assets/\");"
+    substituteInPlace src/assets/assets.c --replace \
+      "#define MAX_PATH_LENGTH 64" \
+      "#define MAX_PATH_LENGTH 128"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage        = https://github.com/DelusionalLogic/NeoComp;
+    license         = licenses.gpl3;
+    maintainers     = with maintainers; [ twey ];
+    platforms       = platforms.linux;
+    description     = "A fork of Compton, a compositor for X11";
+    longDescription = ''
+      NeoComp is a (hopefully) fast and (hopefully) simple compositor
+      for X11, focused on delivering frames from the window to the
+      framebuffer as quickly as possible.
+    '';
+  };
+}
diff --git a/nixpkgs/pkgs/build-support/appimage/default.nix b/nixpkgs/pkgs/build-support/appimage/default.nix
index c17274295c96..de0e05f8da74 100644
--- a/nixpkgs/pkgs/build-support/appimage/default.nix
+++ b/nixpkgs/pkgs/build-support/appimage/default.nix
@@ -133,6 +133,11 @@ rec {
       xorg.libXt
       xorg.libXmu
       xorg.libxcb
+      xorg.xcbutil
+      xorg.xcbutilwm
+      xorg.xcbutilimage
+      xorg.xcbutilkeysyms
+      xorg.xcbutilrenderutil
       libGLU
       libuuid
       libogg
diff --git a/nixpkgs/pkgs/build-support/build-pecl.nix b/nixpkgs/pkgs/build-support/build-pecl.nix
index d08f8822d751..a1030e3b34fa 100644
--- a/nixpkgs/pkgs/build-support/build-pecl.nix
+++ b/nixpkgs/pkgs/build-support/build-pecl.nix
@@ -1,4 +1,4 @@
-{ stdenv, php, autoreconfHook, fetchurl }:
+{ stdenv, php, autoreconfHook, fetchurl, re2c }:
 
 { pname
 , version
@@ -17,7 +17,7 @@ stdenv.mkDerivation (args // {
 
   inherit src;
 
-  nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
+  nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
   buildInputs = [ php ] ++ buildInputs;
 
   makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix
index 57e40069003a..ae000c2daefc 100644
--- a/nixpkgs/pkgs/build-support/docker/default.nix
+++ b/nixpkgs/pkgs/build-support/docker/default.nix
@@ -75,7 +75,7 @@ rec {
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.
   tarsum = runCommand "tarsum" {
-    buildInputs = [ go ];
+    nativeBuildInputs = [ go ];
   } ''
     mkdir tarsum
     cd tarsum
@@ -165,7 +165,7 @@ rec {
         };
         inherit fromImage fromImageName fromImageTag;
 
-        buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
+        nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ];
       } ''
       rm -rf $out
 
@@ -297,7 +297,7 @@ rec {
     runCommand "${name}-granular-docker-layers" {
       inherit maxLayers;
       paths = referencesByPopularity closure;
-      buildInputs = [ jshon rsync tarsum ];
+      nativeBuildInputs = [ jshon rsync tarsum ];
       enableParallelBuilding = true;
     }
     ''
@@ -335,7 +335,7 @@ rec {
     uid ? 0, gid ? 0,
   }:
     runCommand "${name}-customisation-layer" {
-      buildInputs = [ jshon rsync tarsum ];
+      nativeBuildInputs = [ jshon rsync tarsum ];
       inherit extraCommands;
     }
     ''
@@ -380,7 +380,7 @@ rec {
   }:
     runCommand "docker-layer-${name}" {
       inherit baseJson contents extraCommands;
-      buildInputs = [ jshon rsync tarsum ];
+      nativeBuildInputs = [ jshon rsync tarsum ];
     }
     ''
       mkdir layer
@@ -535,7 +535,7 @@ rec {
             os = "linux";
           });
           impure = runCommand "${baseName}-standard-dynamic-date.json"
-            { buildInputs = [ jq ]; }
+            { nativeBuildInputs = [ jq ]; }
             ''
                jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
             '';
@@ -556,7 +556,7 @@ rec {
           inherit uid gid extraCommands;
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
-        buildInputs = [ jshon pigz coreutils findutils jq ];
+        nativeBuildInputs = [ jshon pigz coreutils findutils jq ];
         # Image name and tag must be lowercase
         imageName = lib.toLower name;
         baseJson = configJson;
@@ -653,7 +653,7 @@ rec {
             os = "linux";
           });
           impure = runCommand "${baseName}-config.json"
-            { buildInputs = [ jq ]; }
+            { nativeBuildInputs = [ jq ]; }
             ''
                jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
             '';
@@ -671,7 +671,7 @@ rec {
                   extraCommands;
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
-        buildInputs = [ jshon pigz coreutils findutils jq ];
+        nativeBuildInputs = [ jshon pigz coreutils findutils jq ];
         # Image name and tag must be lowercase
         imageName = lib.toLower name;
         imageTag = if tag == null then "" else lib.toLower tag;
diff --git a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix
index 404cea7532bf..d9e44afb68df 100644
--- a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix
+++ b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix
@@ -19,8 +19,11 @@ rec {
     https://kent.dl.sourceforge.net/sourceforge/
   ];
 
-  # SourceForge.jp.
-  sourceforgejp = [
+  # OSDN (formerly SourceForge.jp).
+  osdn = [
+    https://osdn.dl.osdn.jp/
+    https://osdn.mirror.constant.com/
+    https://mirrors.gigenet.com/OSDN/
     https://osdn.dl.sourceforge.jp/
     https://jaist.dl.sourceforge.jp/
   ];
diff --git a/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh b/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh
index f4a865e96687..3e900d0704cf 100644
--- a/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -4,11 +4,14 @@
 # /usr/bin/env gets special treatment so that ".../bin/env python" is
 # rewritten to /nix/store/<hash>/bin/python.  Interpreters that are
 # already in the store are left untouched.
+# A script file must be marked as executable, otherwise it will not be
+# considered.
 
 fixupOutputHooks+=(patchShebangsAuto)
 
-# Run patch shebangs on a directory.
-# patchShebangs [--build | --host] directory
+# Run patch shebangs on a directory or file.
+# Can take multiple paths as arguments.
+# patchShebangs [--build | --host] PATH...
 
 # Flags:
 # --build : Lookup commands available at build-time
@@ -29,9 +32,7 @@ patchShebangs() {
         shift
     fi
 
-    local dir="$1"
-
-    header "patching script interpreter paths in $dir"
+    echo "patching script interpreter paths in $@"
     local f
     local oldPath
     local newPath
@@ -40,7 +41,10 @@ patchShebangs() {
     local oldInterpreterLine
     local newInterpreterLine
 
-    [ -e "$dir" ] || return 0
+    if [ $# -eq 0 ]; then
+        echo "No arguments supplied to patchShebangs" >0
+        return 0
+    fi
 
     local f
     while IFS= read -r -d $'\0' f; do
@@ -62,7 +66,7 @@ patchShebangs() {
             # - options: something starting with a '-'
             # - environment variables: foo=bar
             if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
-                echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+                echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >0
                 exit 1
             fi
 
@@ -95,7 +99,7 @@ patchShebangs() {
                 rm "$timestamp"
             fi
         fi
-    done < <(find "$dir" -type f -perm -0100 -print0)
+    done < <(find "$@" -type f -perm -0100 -print0)
 
     stopNest
 }
diff --git a/nixpkgs/pkgs/data/fonts/hanazono/default.nix b/nixpkgs/pkgs/data/fonts/hanazono/default.nix
index cc219b74179d..29c982ed8aea 100644
--- a/nixpkgs/pkgs/data/fonts/hanazono/default.nix
+++ b/nixpkgs/pkgs/data/fonts/hanazono/default.nix
@@ -5,7 +5,7 @@ let
 in fetchzip {
   name = "hanazono-${version}";
 
-  url = "mirror://sourceforgejp/hanazono-font/68253/hanazono-${version}.zip";
+  url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip";
 
   postFetch = ''
     mkdir -p $out/share/{doc,fonts}
diff --git a/nixpkgs/pkgs/data/fonts/jost/default.nix b/nixpkgs/pkgs/data/fonts/jost/default.nix
new file mode 100644
index 000000000000..ecada2eda7b7
--- /dev/null
+++ b/nixpkgs/pkgs/data/fonts/jost/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchzip}:
+
+let
+  version = "3.3";
+in fetchzip {
+  name = "jost-${version}";
+  url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+  '';
+
+  sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/indestructible-type/Jost;
+    description = "A sans serif font by Indestructible Type";
+    license = licenses.ofl;
+    maintainers = [ maintainers.ar1a ];
+  };
+}
diff --git a/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
index cc2ec0d641f8..1b63223f0bf6 100644
--- a/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix
@@ -5,7 +5,7 @@ in
 fetchzip {
   name = "kochi-substitute-naga10-${version}";
 
-  url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2";
+  url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2";
 
   postFetch = ''
     tar -xjf $downloadedFile --strip-components=1
@@ -25,7 +25,7 @@ fetchzip {
       this font may not be sold commercially. See kochi-substitute for the free
       Debian version.
     '';
-    homepage = http://sourceforge.jp/projects/efont/;
+    homepage = "https://osdn.net/projects/efont/";
     license = lib.licenses.unfreeRedistributable;
     maintainers = [ lib.maintainers.auntie ];
   };
diff --git a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
index 11cd73e52372..6ed540121a2c 100644
--- a/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
+++ b/nixpkgs/pkgs/data/fonts/kochi-substitute/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       versions of the fonts, which remove some non-free glyphs that were added
       from the naga10 font.
     '';
-    homepage = http://sourceforge.jp/projects/efont/;
+    homepage = "https://osdn.net/projects/efont/";
     license = stdenv.lib.licenses.wadalab;
     maintainers = [ stdenv.lib.maintainers.auntie ];
   };
diff --git a/nixpkgs/pkgs/data/fonts/migmix/default.nix b/nixpkgs/pkgs/data/fonts/migmix/default.nix
index 986751645e3c..9507819fe497 100644
--- a/nixpkgs/pkgs/data/fonts/migmix/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migmix/default.nix
@@ -6,19 +6,19 @@ stdenv.mkDerivation rec {
 
   srcs = [
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${version}.zip";
       sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${version}.zip";
       sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${version}.zip";
       sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${version}.zip";
       sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch";
     })
   ];
diff --git a/nixpkgs/pkgs/data/fonts/migu/default.nix b/nixpkgs/pkgs/data/fonts/migu/default.nix
index 3b03460125fa..57fbf1a830fc 100644
--- a/nixpkgs/pkgs/data/fonts/migu/default.nix
+++ b/nixpkgs/pkgs/data/fonts/migu/default.nix
@@ -6,19 +6,19 @@ stdenv.mkDerivation rec {
 
   srcs = [
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1p-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${version}.zip";
       sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1c-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${version}.zip";
       sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1m-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${version}.zip";
       sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm";
     })
     (fetchzip {
-      url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-2m-${version}.zip";
+      url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${version}.zip";
       sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2";
     })
   ];
diff --git a/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix
index 9be8eea16fbb..03bc8a0db4da 100644
--- a/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -5,7 +5,7 @@ let
 in fetchzip rec {
   name = "mplus-${version}";
 
-  url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
+  url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
 
   postFetch = ''
     tar -xJf $downloadedFile --strip-components=1
@@ -17,7 +17,7 @@ in fetchzip rec {
 
   meta = with lib; {
     description = "M+ Outline Fonts";
-    homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html;
+    homepage = "https://mplus-fonts.osdn.jp/about-en.html";
     license = licenses.mit;
     maintainers = with maintainers; [ henrytill ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
index b13dcf9b422e..590ca396bc67 100644
--- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "papirus-icon-theme-${version}";
-  version = "20190501";
+  pname = "papirus-icon-theme";
+  version = "20190521";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
-    repo = "papirus-icon-theme";
+    repo = pname;
     rev = version;
-    sha256 = "1sdzbvlzzg42vqahjqcsj6v87y1xhchw7bgiv8jgwd2n4l3gg2zy";
+    sha256 = "192s14bf2ni46jkiifbsl82qy1miy8fnxs2fpqwf6s6jlv9x4zxs";
   };
 
   nativeBuildInputs = [ gtk3 ];
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     description = "Papirus icon theme";
     homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme;
     license = licenses.lgpl3;
-    platforms = platforms.all;
+    # darwin gives hash mismatch in source, probably because of file names differing only in case
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix
index 78f660ae4431..0eb3dbefe41b 100644
--- a/nixpkgs/pkgs/data/misc/hackage/default.nix
+++ b/nixpkgs/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/85d71d5231521c70b961570dbbee953253fb379b.tar.gz";
-  sha256 = "1mdp2ivnx7wvd63bq1li9gpsm5sv1s167crv1jjlqw578lbi8hv7";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz";
+  sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b";
 }
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
new file mode 100644
index 000000000000..253a67b04ec7
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch
@@ -0,0 +1,323 @@
+From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
+Date: Mon, 13 May 2019 00:09:42 -0300
+Subject: [PATCH 2/2] Use XDG to look for mime cache
+
+---
+ .../shutil/mimesappsmanager.cpp               | 230 ++++++++++--------
+ .../shutil/mimesappsmanager.h                 |   6 +-
+ 2 files changed, 125 insertions(+), 111 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+index c9e53630..7a21df51 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile()
+     return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json");
+ }
+ 
+-QString MimesAppsManager::getMimeInfoCacheFilePath()
++QStringList MimesAppsManager::getMimeInfoCacheFilePath()
+ {
+-    return "/usr/share/applications/mimeinfo.cache";
++    QStringList paths;
++    for (const QString dir : getMimeInfoCacheFileRootPath() )
++       paths.append(dir + QDir::separator() + "mimeinfo.cache");
++    qDebug() << "getMimeInfoCacheFilePath: " << paths;
++    return paths;
+ }
+ 
+-QString MimesAppsManager::getMimeInfoCacheFileRootPath()
++QStringList MimesAppsManager::getMimeInfoCacheFileRootPath()
+ {
+-    return "/usr/share/applications";
++    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++    qDebug() << "getMimeInfoCacheFileRootPath: " << paths;
++    return paths;
+ }
+ 
+ QString MimesAppsManager::getDesktopFilesCacheFile()
+@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile()
+ 
+ QStringList MimesAppsManager::getDesktopFiles()
+ {
+-      QStringList desktopFiles;
++    QStringList desktopFiles;
+ 
+-      foreach (QString desktopFolder, getApplicationsFolders()) {
+-          QDirIterator it(desktopFolder, QStringList("*.desktop"),
+-                          QDir::Files | QDir::NoDotAndDotDot,
+-                          QDirIterator::Subdirectories);
+-          while (it.hasNext()) {
+-            it.next();
+-            desktopFiles.append(it.filePath());
+-          }
+-      }
+-      return desktopFiles;
++    foreach (QString desktopFolder, getApplicationsFolders()) {
++        QDirIterator it(desktopFolder, QStringList("*.desktop"),
++                        QDir::Files | QDir::NoDotAndDotDot,
++                        QDirIterator::Subdirectories);
++        while (it.hasNext()) {
++          it.next();
++          desktopFiles.append(it.filePath());
++        }
++    }
++    return desktopFiles;
+ }
+ 
+-QString MimesAppsManager::getDDEMimeTypeFile()
++QStringList MimesAppsManager::getDDEMimeTypeFile()
+ {
+-    return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list");
++    QStringList paths;
++    for (const QString path : getMimeInfoCacheFileRootPath())
++       paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list"));
++    qDebug() << "getDDEMimeTypeFile: " << paths;
++    return paths;
+ }
+ 
+ QMap<QString, DesktopFile> MimesAppsManager::getDesktopObjs()
+@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps()
+         MimeApps.insert(key, orderApps);
+     }
+ 
+-    //check mime apps from cache
+-    QFile f(getMimeInfoCacheFilePath());
+-    if(!f.open(QIODevice::ReadOnly)){
+-        qDebug () << "failed to read mime info cache file:" << f.errorString();
+-        return;
+-    }
+-
+     QStringList audioDesktopList;
+     QStringList imageDeksopList;
+     QStringList textDekstopList;
+     QStringList videoDesktopList;
+ 
+-    while (!f.atEnd()) {
+-        QString data = f.readLine();
+-        QString _desktops = data.split("=").last();
+-        QString mimeType = data.split("=").first();
+-        QStringList desktops = _desktops.split(";");
+-
+-        foreach (const QString desktop, desktops) {
+-            if(desktop.isEmpty() || audioDesktopList.contains(desktop))
+-                continue;
++    //check mime apps from cache
++    for (const QString path : getMimeInfoCacheFilePath()) {
++        QFile f(path);
++        if(!f.open(QIODevice::ReadOnly)){
++            qDebug () << "failed to read mime info cache file:" << f.errorString();
++            return;
++        }
+ 
+-            if(mimeType.startsWith("audio")){
+-                if(!audioDesktopList.contains(desktop))
+-                    audioDesktopList << desktop;
+-            } else if(mimeType.startsWith("image")){
+-                if(!imageDeksopList.contains(desktop))
+-                    imageDeksopList << desktop;
+-            } else if(mimeType.startsWith("text")){
+-                if(!textDekstopList.contains(desktop))
+-                    textDekstopList << desktop;
+-            } else if(mimeType.startsWith("video")){
+-                if(!videoDesktopList.contains(desktop))
+-                    videoDesktopList << desktop;
++        while (!f.atEnd()) {
++            QString data = f.readLine();
++            QString _desktops = data.split("=").last();
++            QString mimeType = data.split("=").first();
++            QStringList desktops = _desktops.split(";");
++
++            foreach (const QString desktop, desktops) {
++                if(desktop.isEmpty() || audioDesktopList.contains(desktop))
++                    continue;
++
++                if(mimeType.startsWith("audio")){
++                    if(!audioDesktopList.contains(desktop))
++                        audioDesktopList << desktop;
++                } else if(mimeType.startsWith("image")){
++                    if(!imageDeksopList.contains(desktop))
++                        imageDeksopList << desktop;
++                } else if(mimeType.startsWith("text")){
++                    if(!textDekstopList.contains(desktop))
++                        textDekstopList << desktop;
++                } else if(mimeType.startsWith("video")){
++                    if(!videoDesktopList.contains(desktop))
++                        videoDesktopList << desktop;
++                }
+             }
+         }
++        f.close();
+     }
+-    f.close();
+ 
+-    const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath();
+-    foreach (QString desktop, audioDesktopList) {
+-        const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+-        if(!QFile::exists(path))
+-            continue;
+-        DesktopFile df(path);
+-        AudioMimeApps.insert(path, df);
+-    }
++    for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) {
++        foreach (QString desktop, audioDesktopList) {
++            const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++            if(!QFile::exists(path))
++                continue;
++            DesktopFile df(path);
++            AudioMimeApps.insert(path, df);
++        }
+ 
+-    foreach (QString desktop, imageDeksopList) {
+-        const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+-        if(!QFile::exists(path))
+-            continue;
+-        DesktopFile df(path);
+-        ImageMimeApps.insert(path, df);
+-    }
++        foreach (QString desktop, imageDeksopList) {
++            const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++            if(!QFile::exists(path))
++                continue;
++            DesktopFile df(path);
++            ImageMimeApps.insert(path, df);
++        }
+ 
+-    foreach (QString desktop, textDekstopList) {
+-        const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+-        if(!QFile::exists(path))
+-            continue;
+-        DesktopFile df(path);
+-        TextMimeApps.insert(path, df);
+-    }
++        foreach (QString desktop, textDekstopList) {
++            const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++            if(!QFile::exists(path))
++                continue;
++            DesktopFile df(path);
++            TextMimeApps.insert(path, df);
++        }
+ 
+-    foreach (QString desktop, videoDesktopList) {
+-        const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
+-        if(!QFile::exists(path))
+-            continue;
+-        DesktopFile df(path);
+-        VideoMimeApps.insert(path, df);
++        foreach (QString desktop, videoDesktopList) {
++            const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop);
++            if(!QFile::exists(path))
++                continue;
++            DesktopFile df(path);
++            VideoMimeApps.insert(path, df);
++        }
+     }
+-
+     return;
+ }
+ 
+ void MimesAppsManager::loadDDEMimeTypes()
+ {
+-    QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat);
+-    qDebug() << settings.childGroups();
++    for (const QString path : getDDEMimeTypeFile()) {
++        QSettings settings(path, QSettings::IniFormat);
++        qDebug() << settings.childGroups();
+ 
+-    QFile file(getDDEMimeTypeFile());
+-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+-        return;
+-    }
++        QFile file(path);
++        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
++            continue;
++        }
++
++        // Read propeties
++        QTextStream in(&file);
++        QString desktopKey;
++        while (!in.atEnd()) {
+ 
+-    // Read propeties
+-    QTextStream in(&file);
+-    QString desktopKey;
+-    while (!in.atEnd()) {
++          // Read new line
++          QString line = in.readLine();
+ 
+-      // Read new line
+-      QString line = in.readLine();
++          // Skip empty line or line with invalid format
++          if (line.trimmed().isEmpty()) {
++            continue;
++          }
+ 
+-      // Skip empty line or line with invalid format
+-      if (line.trimmed().isEmpty()) {
+-        continue;
+-      }
++          // Read group
++          // NOTE: symbols '[' and ']' can be found not only in group names, but
++          // only group can start with '['
+ 
+-      // Read group
+-      // NOTE: symbols '[' and ']' can be found not only in group names, but
+-      // only group can start with '['
++          if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) {
++                QString tmp = line.trimmed().replace("[", "").replace("]", "");
++                desktopKey = tmp;
++                continue;
++          }
+ 
+-      if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) {
+-            QString tmp = line.trimmed().replace("[", "").replace("]", "");
+-            desktopKey = tmp;
+-            continue;
+-      }
+-
+-      // If we are in correct group and line contains assignment then read data
+-      int first_equal = line.indexOf('=');
+-      if (!desktopKey.isEmpty() && first_equal >= 0) {
+-            QString value = line.mid(first_equal + 1);
+-            QStringList mimetypes = value.split(";");
+-            DDE_MimeTypes.insert(desktopKey, mimetypes);
+-            desktopKey.clear();
++          // If we are in correct group and line contains assignment then read data
++          int first_equal = line.indexOf('=');
++          if (!desktopKey.isEmpty() && first_equal >= 0) {
++                QString value = line.mid(first_equal + 1);
++                QStringList mimetypes = value.split(";");
++                DDE_MimeTypes.insert(desktopKey, mimetypes);
++                desktopKey.clear();
++            }
+         }
++        file.close();
+     }
+-    file.close();
+ }
+ 
+ bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2)
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h
+index 223c80aa..00a61302 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.h
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.h
+@@ -101,12 +101,12 @@ public:
+ 
+     static QStringList getApplicationsFolders();
+     static QString getMimeAppsCacheFile();
+-    static QString getMimeInfoCacheFilePath();
+-    static QString getMimeInfoCacheFileRootPath();
++    static QStringList getMimeInfoCacheFilePath();
++    static QStringList getMimeInfoCacheFileRootPath();
+     static QString getDesktopFilesCacheFile();
+     static QString getDesktopIconsCacheFile();
+     static QStringList getDesktopFiles();
+-    static QString getDDEMimeTypeFile();
++    static QStringList getDDEMimeTypeFile();
+     static QMap<QString, DesktopFile> getDesktopObjs();
+     static void initMimeTypeApps();
+     static void loadDDEMimeTypes();
+-- 
+2.21.0
+
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
new file mode 100644
index 000000000000..3ced15e7e5a4
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch
@@ -0,0 +1,89 @@
+From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
+Date: Sun, 12 May 2019 08:50:07 -0300
+Subject: [PATCH 1/2] Use qt library to determine where to look for application
+ files
+
+---
+ dde-file-manager-lib/shutil/fileutils.cpp     | 34 ++++++++++++-------
+ .../shutil/mimesappsmanager.cpp               | 11 ++----
+ 2 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp
+index ae8120d3..d6a0573a 100644
+--- a/dde-file-manager-lib/shutil/fileutils.cpp
++++ b/dde-file-manager-lib/shutil/fileutils.cpp
+@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path)
+  */
+ QStringList FileUtils::getApplicationNames() {
+   QStringList appNames;
+-  QDirIterator it("/usr/share/applications", QStringList("*.desktop"),
+-                  QDir::Files | QDir::NoDotAndDotDot,
+-                  QDirIterator::Subdirectories);
+-  while (it.hasNext()) {
+-    it.next();
+-    appNames.append(it.fileName());
++
++  const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++  qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs;
++  for (const QString &dir : desktopDirs) {
++    QDirIterator it(dir, QStringList("*.desktop"),
++                    QDir::Files | QDir::NoDotAndDotDot,
++                    QDirIterator::Subdirectories);
++    while (it.hasNext()) {
++      it.next();
++      appNames.append(it.fileName());
++    }
+   }
++  
+   return appNames;
+ }
+ //---------------------------------------------------------------------------
+@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() {
+  */
+ QList<DesktopFile> FileUtils::getApplications() {
+   QList<DesktopFile> apps;
+-  QDirIterator it("/usr/share/applications", QStringList("*.desktop"),
+-                  QDir::Files | QDir::NoDotAndDotDot,
+-                  QDirIterator::Subdirectories);
+-  while (it.hasNext()) {
+-    it.next();
+-    apps.append(DesktopFile(it.filePath()));
++  const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++  qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs;
++  for (const QString &dir : desktopDirs) {
++    QDirIterator it(dir, QStringList("*.desktop"),
++                    QDir::Files | QDir::NoDotAndDotDot,
++                    QDirIterator::Subdirectories);
++    while (it.hasNext()) {
++      it.next();
++      apps.append(DesktopFile(it.filePath()));
++    }
+   }
+   return apps;
+ }
+diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+index c6149702..c9e53630 100644
+--- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp
++++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp
+@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur
+ 
+ QStringList MimesAppsManager::getApplicationsFolders()
+ {
+-    QStringList desktopFolders;
+-    desktopFolders << QString("/usr/share/applications/")
+-                   << QString("/usr/local/share/applications/")
+-                   << QString("/usr/share/gnome/applications/")
+-                   << QString("/var/lib/flatpak/exports/share/applications")
+-                   << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications")
+-                   << QDir::homePath() + QString( "/.local/share/applications" );
+-    return desktopFolders;
++    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
++    qDebug() << "dde-file-manager getApplicationsFolders:" << paths;
++    return paths;
+ }
+ 
+ QString MimesAppsManager::getMimeAppsCacheFile()
+-- 
+2.21.0
+
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
new file mode 100644
index 000000000000..582760e6db2a
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch
@@ -0,0 +1,38 @@
+From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
+Date: Thu, 16 May 2019 19:00:52 -0300
+Subject: [PATCH 4/4] Use xdg to look for pixmap icons
+
+---
+ dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp
+index d6a0573a..e912e7c2 100644
+--- a/dde-file-manager-lib/shutil/fileutils.cpp
++++ b/dde-file-manager-lib/shutil/fileutils.cpp
+@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app,
+   }
+ 
+   // Last chance
+-  QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot);
+-  QStringList iconFiles = appIcons.entryList();
+-  QStringList searchIcons = iconFiles.filter(name);
+-  if (searchIcons.count() > 0) {
+-    return QIcon("/usr/share/pixmaps/" + searchIcons.at(0));
++  const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
++  qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs;
++  for (const QString &dir : dirs) {
++    const QString path = dir + QDir::separator() + "pixmaps";
++    QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot);
++    QStringList iconFiles = appIcons.entryList();
++    QStringList searchIcons = iconFiles.filter(name);
++    if (searchIcons.count() > 0) {
++      return QIcon(path + QDir::separator() + searchIcons.at(0));
++    }
+   }
+ 
+   // Default icon
+-- 
+2.21.0
+
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix
new file mode 100644
index 000000000000..44964b65c9d7
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -0,0 +1,251 @@
+{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock,
+  dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything,
+  deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn,
+  deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget,
+  ffmpegthumbnailer, file, glib, gnugrep, gsettings-qt, gvfs,
+  jemalloc, kcodecs, libX11, libsecret, polkit, polkit-qt, poppler,
+  procps, qmake, qt5integration, qtmultimedia, qtsvg, qttools,
+  qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5,
+  xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dde-file-manager";
+  version = "4.8.6.2";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1qw9slssvy6c4j9czyqrhlr3pq6hzxybb86darja2vka84zmvwip";
+  };
+
+  nativeBuildInputs = [
+    deepin.setupHook
+    qmake
+    qttools
+    pkgconfig
+    deepin-gettext-tools
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    avfs
+    dde-daemon
+    dde-dock
+    dde-polkit-agent
+    dde-qt-dbus-factory
+    deepin-anything
+    deepin-desktop-schemas
+    deepin-movie-reborn.dev
+    deepin-shortcut-viewer
+    deepin-terminal
+    dtkcore
+    dtkwidget
+    ffmpegthumbnailer
+    file
+    glib.bin
+    glib.dev
+    gnugrep
+    gsettings-qt
+    gvfs
+    jemalloc
+    kcodecs
+    libsecret
+    polkit
+    polkit-qt
+    poppler
+    procps
+    qt5integration
+    qtmultimedia
+    qtsvg
+    qtx11extras
+    samba
+    taglib
+    udisks2-qt5
+    xdg-user-dirs
+    xorg.libX11
+    xorg.libxcb
+    xorg.xcbutil
+    xorg.xcbutilwm
+    xorg.xorgproto
+    zlib
+  ];
+
+  patches = [
+    ./dde-file-manager.fix-paths.patch
+    ./dde-file-manager.fix-mime-cache-paths.patch
+    ./dde-file-manager.pixmaps-paths.patch
+  ];
+
+  postPatch = ''
+    searchHardCodedPaths
+
+    patchShebangs dde-desktop/translate_generation.sh
+    patchShebangs dde-desktop/translate_ts2desktop.sh
+    patchShebangs dde-file-manager-lib/generate_translations.sh
+    patchShebangs dde-file-manager/generate_translations.sh
+    patchShebangs dde-file-manager/translate_ts2desktop.sh
+    patchShebangs usb-device-formatter/generate_translations.sh
+    patchShebangs usb-device-formatter/translate_ts2desktop.sh
+
+    # x-terminal-emulator is a virtual package in Debian systems. The
+    # terminal emulator is configured by Debian's alternative system.
+    # It is not available on NixOS. Use deepin-terminal instead
+    sed -i -e "s,x-terminal-emulator,deepin-terminal," \
+      dde-file-manager-lib/shutil/fileutils.cpp
+
+    sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
+       dde-file-manager-lib/dde-file-manager-lib.pro \
+       dde-file-thumbnail-tool/common.pri \
+       common/common.pri
+
+    sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \
+       dde-file-manager-lib/dde-file-manager-lib.pro
+
+    fixPath ${dde-dock} /usr/include/dde-dock \
+      dde-dock-plugins/disk-mount/disk-mount.pro
+
+    # treefrog is not available in NixOS, and I am not sure if it is really needed
+    #fixPath $ {treefrog-framework} /usr/include/treefrog \
+    #  dde-sharefiles/appbase.pri
+
+    fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \
+      dde-file-manager-lib/dbusinterface/dbusinterface.pri
+
+    sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \
+      deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro
+
+    fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \
+      dde-zone/mainwindow.h
+
+    fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \
+      dde-desktop/translate_desktop2ts.sh \
+      dde-desktop/translate_ts2desktop.sh \
+      dde-file-manager/translate_desktop2ts.sh \
+      dde-file-manager/translate_ts2desktop.sh \
+      usb-device-formatter/translate_desktop2ts.sh \
+      usb-device-formatter/translate_ts2desktop.sh
+
+    fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp
+    fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp
+
+    fixPath ${deepin-terminal} /usr/bin/deepin-terminal \
+      dde-file-manager-lib/shutil/fileutils.cpp
+
+    fixPath $out /usr/share/dde-file-manager \
+      dde-sharefiles/appbase.pri \
+      dde-sharefiles/dde-sharefiles.pro
+
+    fixPath $out /usr/share/usb-device-formatter \
+      usb-device-formatter/main.cpp
+
+    fixPath $out /usr/share/applications \
+      dde-file-manager/mips/dde-file-manager-autostart.desktop \
+      dde-desktop/development.pri
+
+    fixPath $out /usr/bin \
+      dbusservices/com.deepin.dde.desktop.service \
+      dde-desktop/data/com.deepin.dde.desktop.service \
+      dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \
+      dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \
+      dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \
+      dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \
+      dde-file-manager-daemon/dde-file-manager-daemon.pro \
+      dde-file-manager-lib/dde-file-manager-lib.pro \
+      dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \
+      dde-file-manager/dde-file-manager-xdg-autostart.desktop \
+      dde-file-manager/dde-file-manager.desktop \
+      dde-file-manager/dde-file-manager.pro \
+      dde-file-manager/mips/dde-file-manager-autostart.desktop \
+      dde-file-manager/mips/dde-file-manager.desktop \
+      dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \
+      usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \
+      usb-device-formatter/usb-device-formatter.desktop \
+      usb-device-formatter/usb-device-formatter.pro
+      fixPath $out /etc \
+      dde-file-manager/dde-file-manager.pro \
+      dde-file-manager-daemon/dde-file-manager-daemon.pro
+
+    fixPath $out /usr \
+      common/common.pri \
+      dde-desktop/dbus/filedialog/filedialog.pri \
+      dde-desktop/dbus/filemanager1/filemanager1.pri \
+      dde-desktop/development.pri \
+      dde-dock-plugins/disk-mount/disk-mount.pro \
+      dde-file-manager-daemon/dde-file-manager-daemon.pro \
+      usb-device-formatter/usb-device-formatter.pro
+
+    sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \
+      dde-file-manager/dde-xdg-user-dirs-update
+
+    sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \
+      dde-file-manager/dde-file-manager.desktop
+
+    sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \
+      dde-desktop/data/applications/dde-trash.desktop \
+      dde-desktop/data/applications/dde-computer.desktop
+
+    sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \
+      dde-file-manager-lib/gvfs/networkmanager.cpp
+
+    sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \
+           -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \
+           -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \
+      dde-file-manager-daemon/usershare/usersharemanager.cpp
+
+    sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \
+      dde-file-manager-lib/controllers/appcontroller.cpp
+
+    sed -i -e 's,/bin/bash,${runtimeShell},' \
+           -e 's,\<ps\>,${procps}/bin/ps,' \
+           -e 's,\<grep\>,${gnugrep}/bin/grep,' \
+      utils/utils.cpp \
+      dde-file-manager-lib/controllers/fileeventprocessor.cpp
+
+    # The hard coded path in `QString("/etc/xdg/%1/%2")` in
+    # dde-file-manager-lib/interfaces/dfmsettings.cpp
+    # does not needed a fix because all the standard locations
+    # are tried before faling back to /etc/xdg.
+
+    # I do not know yet how to deal with:
+    #   dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h:        return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so";
+    #   dde-file-manager-lib/sw_label/filemanagerlibrary.h:        return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so";
+    #   dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager
+    #   dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager
+    # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored?
+
+    # Notes:
+    # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency.
+    # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology.
+  '';
+
+  qmakeFlags = [
+    "QMAKE_CFLAGS_ISYSTEM="
+
+    # Disable ffmpeg
+    "CONFIG+=DISABLE_FFMPEG"
+  ];
+
+  preBuild = ''
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib}/lib";
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib";
+  '';
+
+  postFixup = ''
+    # debuging
+    unset LD_LIBRARY_PATH
+    searchForUnresolvedDLL $out
+    searchHardCodedPaths $out
+  '';
+
+  passthru.updateScript = deepin.updateScript { inherit name; };
+
+  meta = with stdenv.lib; {
+    description = "File manager and desktop module for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/dde-file-manager;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 914e77d85157..ef47603f817b 100644
--- a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [
     cmake
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/deepin/default.nix b/nixpkgs/pkgs/desktops/deepin/default.nix
index ccc2270a8edf..49114330f135 100644
--- a/nixpkgs/pkgs/desktops/deepin/default.nix
+++ b/nixpkgs/pkgs/desktops/deepin/default.nix
@@ -11,6 +11,7 @@ let
     dde-calendar = callPackage ./dde-calendar { };
     dde-daemon = callPackage ./dde-daemon { };
     dde-dock = callPackage ./dde-dock { };
+    dde-file-manager = callPackage ./dde-file-manager { };
     dde-network-utils = callPackage ./dde-network-utils { };
     dde-polkit-agent = callPackage ./dde-polkit-agent { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 6331aa9eb149..c7a9b4ccfbd1 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
     networkmanager modemmanager gnome-bluetooth tracker
     udisks2 gsound libhandy
+    mutter # schemas for the keybindings
   ];
 
   patches = [
diff --git a/nixpkgs/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix
index 151581b73eb9..742babf721ac 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix
@@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; {
   corePackages = with gnome3; [
     pkgs.desktop-file-utils
     pkgs.shared-mime-info # for update-mime-database
-    glib # for gsettings
-    gtk3.out # for gtk-update-icon-cache
+    pkgs.glib # for gsettings
+    pkgs.gtk3.out # for gtk-update-icon-cache
     glib-networking gvfs dconf gnome-backgrounds gnome-control-center
-    gnome-menus gnome-settings-daemon gnome-shell
+    pkgs.gnome-menus gnome-settings-daemon gnome-shell
     gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
     pkgs.hicolor-icon-theme
   ];
@@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
     gnome-getting-started-docs gnome-packagekit gnome-software
-    gnome-power-manager gnome-todo gnome-usage
+    gnome-power-manager gnome-todo pkgs.gnome-usage
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
index c43daf2ebb2f..54d45eedc3d9 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -2,7 +2,7 @@
 , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
 , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
 , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
-, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }:
+, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }:
 
 stdenv.mkDerivation rec {
   pname = "geary";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
     gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
     libgee libnotify libsecret sqlite webkitgtk glib-networking
-    libunwind folks
+    libunwind libunity folks
   ];
 
   checkInputs = [ xvfb_run dbus ];
diff --git a/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix b/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
index b238623eb09a..b058bd87989d 100644
--- a/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libobjc2";
-  version = "1.9";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "gnustep";
     repo = "libobjc2";
     rev = "v${version}";
-    sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn";
+    sha256 = "1b4h0a4pqr8j6300qr2wmi33r7ysvp705gs0ypx69hbmifln0mlf";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
index 411308c488c7..f5b71eba141a 100644
--- a/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -1,31 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, mate, python3Packages }:
+{ stdenv, fetchurl, substituteAll
+, pkgconfig, gobject-introspection, gdk_pixbuf
+, gtk3, mate, python3, dropbox }:
 
+let
+  dropboxd = "${dropbox}/bin/dropbox";
+in
 stdenv.mkDerivation rec {
-  name = "caja-dropbox-${version}";
+  pname = "caja-dropbox";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-cli-paths.patch;
+      inherit dropboxd;
+    })
+  ];
+
+  strictDeps = true;
+
   nativeBuildInputs = [
     pkgconfig
+    gobject-introspection
+    gdk_pixbuf
+    (python3.withPackages (ps: with ps; [
+      docutils
+      pygobject3
+    ]))
   ];
 
   buildInputs = [
     gtk3
     mate.caja
-    python3Packages.python
-    python3Packages.pygtk
-    python3Packages.docutils
+    python3
   ];
 
   configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
 
   meta = with stdenv.lib; {
     description = "Dropbox extension for Caja file manager";
-    homepage = https://github.com/mate-desktop/caja-dropbox;
+    homepage = "https://github.com/mate-desktop/caja-dropbox";
     license = with licenses; [ gpl3 cc-by-nd-30 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];
diff --git a/nixpkgs/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch b/nixpkgs/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
new file mode 100644
index 000000000000..de591f493f6f
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/mate/caja-dropbox/fix-cli-paths.patch
@@ -0,0 +1,11 @@
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -70,7 +70,7 @@ DOWNLOADING = "Downloading Dropbox... %d%%"
+ UNPACKING = "Unpacking Dropbox... %d%%"
+
+ PARENT_DIR = os.path.expanduser("~")
+-DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
++DROPBOXD_PATH = "@dropboxd@"
+ DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
+
+ enc = locale.getpreferredencoding()
diff --git a/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
new file mode 100644
index 000000000000..35e3cd198f6b
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }:
+
+stdenv.mkDerivation {
+  pname = "${caja.pname}-with-extensions";
+  version = caja.version;
+
+  phases = [ "installPhase" ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  inherit caja;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper $caja/bin/caja $out/bin/caja \
+    --set CAJA_EXTENSION_DIRS ${lib.concatMapStringsSep ":" (x: "${x.outPath}/lib/caja/extensions-2.0") extensions}
+  '';
+
+  inherit (caja.meta);
+}
diff --git a/nixpkgs/pkgs/desktops/mate/caja/default.nix b/nixpkgs/pkgs/desktops/mate/caja/default.nix
index fcb903f703e7..667a73eb6307 100644
--- a/nixpkgs/pkgs/desktops/mate/caja/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/caja/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "caja-${version}";
+  pname = "caja";
   version = "1.22.1";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv";
   };
 
diff --git a/nixpkgs/pkgs/desktops/mate/default.nix b/nixpkgs/pkgs/desktops/mate/default.nix
index 3cab936b92b1..f4f2b3620e71 100644
--- a/nixpkgs/pkgs/desktops/mate/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/default.nix
@@ -4,11 +4,12 @@ let
   callPackage = newScope self;
 
   self = rec {
-  
+
     atril = callPackage ./atril { };
     caja = callPackage ./caja { };
     caja-dropbox = callPackage ./caja-dropbox { };
     caja-extensions = callPackage ./caja-extensions { };
+    caja-with-extensions = callPackage ./caja-with-extensions { };
     engrampa = callPackage ./engrampa { };
     eom = callPackage ./eom { };
     libmatekbd = callPackage ./libmatekbd { };
@@ -86,7 +87,7 @@ let
       mozo
       pluma
     ];
-  
+
   };
 
 in self
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 9aed8ffcc272..4a4850a0824e 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig
 , meson, ninja, vala, desktop-file-utils, libxml2
-, gtk3, python3, granite, libgee, gobject-introspection
-, elementary-icon-theme, appstream, wrapGAppsHook }:
+, gtk3, python3, granite, libgee, elementary-icon-theme
+, appstream, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "calculator";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index c165df26f60b..9f684c22767d 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -2,7 +2,7 @@
 , ninja, vala, desktop-file-utils, gtk3, granite, libgee
 , geoclue2, libchamplain, clutter, folks, geocode-glib, python3
 , libnotify, libical, evolution-data-server, appstream-glib
-, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "calendar";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index c90d9a566f8d..99c7afffe7a5 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala
 , python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify
 , libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking
-, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "files";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     gettext
     glib-networking
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 4ee2aef17601..32e9a0bcc8db 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
 , gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch
 , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
-, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }:
+, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
   pname = "photos";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 2644d31d7983..b1a5796770d9 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage
 , ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
-, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libcanberra, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 9b2060afa6b7..2c146169f427 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
 , vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee
-, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }:
+, elementary-icon-theme, appstream, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "terminal";
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index b123d4cbf5bc..2d978d966b93 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
 , desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1
-, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "videos";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 1883e2294797..859e04eb954d 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-a11y";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d217ad20d2ed..6d7ecbffa314 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-about";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index ed4dc0c84473..0d7586391ce0 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index db653a7f8ffe..547b6d897e4e 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
-, granite, gtk3, bluez, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
+, vala, libgee, granite, gtk3, bluez, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-bluetooth";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 8c00ff4728e8..e1303a3cc48a 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig
-, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }:
+, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-datetime";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index f5fbb0a51cfb..22fb795297e0 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-display";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 50256b8f77d7..71f865bdeb62 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee
-, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
+, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index eaf15fdb8155..a55a525c79bd 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja, pkgconfig, vala
-, libgee, granite, gtk3, switchboard, elementary-settings-daemon, gobject-introspection }:
+, libgee, granite, gtk3, switchboard, elementary-settings-daemon }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 95b558901d20..283a13bd82aa 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala
-, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }:
+, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-network";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index a6fb86bb828c..277f70cf984c 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja
+, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-notifications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 0417d33df7d7..496a69ce1f6b 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
 , libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib
-, librest, webkitgtk, libsoup, switchboard, gobject-introspection }:
+, librest, webkitgtk, libsoup, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-onlineaccounts";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 6c29282652c8..4d6a1f5c5c67 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
 , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
-, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }:
+, gala, wingpanel, plank, switchboard, gettext, bamf }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-pantheon-shell";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 0178f23f5e1a..0179aac84ced 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
 , pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon
-, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }:
+, makeWrapper, granite, gtk3, dbus, polkit, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-power";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 11bd70894edd..293faad51c74 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, cups, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-printers";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index ff59768e363f..9cbab8f2c9f8 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, meson, python3, ninja
 , pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist
-, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }:
+, switchboard, lightlocker, pantheon-agent-geoclue2 }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-security-privacy";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 9660daa7715d..265352ed8815 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard, gobject-introspection }:
+, vala, libgee, granite, gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sharing";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index ad379f37471a..907bdc37e2a7 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3
-, switchboard, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
+, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sound";
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 310230c7aacc..12edf97f6ba9 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja
 , vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity
-, elementary-icon-theme, wrapGAppsHook, gobject-introspection }:
+, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 32083d3ada62..177837c76dc0 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson
 , ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon
-, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators
+, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators
 , elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx
 , clutter-gtk, libGL, dbus, wrapGAppsHook }:
 
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 6ceebf1980c6..ca0ab888f149 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils
-, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }:
+, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "shortcut-overlay";
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix
index bc29dba9718e..1005c4090f3f 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
 , desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra
-, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection
-, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }:
+, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme
+, elementary-settings-daemon, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "gala";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     desktop-file-utils
     gettext
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index e905ce9d854b..0d00ee2072dd 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
-, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3
-, zeitgeist, bc }:
+, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist
+, bc }:
 
 stdenv.mkDerivation rec {
   pname = "applications-menu";
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
     libgee
     libsoup
     libunity
-    libwnck3
     plank
     switchboard
     wingpanel
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 571dab02c318..4d7868a1d14c 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
 , ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2
-, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-bluetooth";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 297e99fe47b1..8a4c9f393839 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3
 , ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server
-, libical, libgee, libxml2, libsoup, gobject-introspection
-, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
+, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-datetime";
@@ -21,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index f34ca29a98bb..aa63f82c9652 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
 , substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee
-, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-keyboard";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     libxml2
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index 2ac05fdc6d82..a201d6864a66 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
 , gtk3, granite, networkmanager, networkmanagerapplet, wingpanel
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-network";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 8e450726976b..fd4e1cc7e177 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection
-, elementary-icon-theme, wrapGAppsHook }:
+, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-nightlight";
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 6a7fcfbb4e03..03369c3ad42e 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite
-, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-notifications";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 45a4e543b662..a9af53449c9a 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
 , ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-power";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index a46e001e7a0e..5b1bd161b05f 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
 , ninja, vala, gtk3, granite, wingpanel, accountsservice
-, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
+, libgee, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-session";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index fc40c2faf5ef..3e17813fde2a 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
 , python3, ninja, vala, gtk3, granite, wingpanel, libnotify
 , pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook
-, gobject-introspection, elementary-icon-theme }:
+, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-sound";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     libxml2
     meson
     ninja
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 9c18eaed6da2..be6c89f9c05d 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja
-, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib
-, python3, gobject-introspection }:
+{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
+, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel";
@@ -21,8 +20,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    glib-networking
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
index 66ba331ddcdc..cc612407bf61 100644
--- a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "granite";
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
index 59983469c114..da5e544b0058 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/cerbere/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "cerbere";
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index e77948ccf295..055706b1521a 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
-, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }:
+, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "capnet-assist";
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index aa451ba75166..d8514c51f4f7 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -36,25 +36,26 @@
 , systemd
 , tzdata
 , upower
+, libXtst
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-settings-daemon";
-  version = "3.32.0";
+  version = "3.30.2";
 
   projectName = "gnome-settings-daemon";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
-    sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
+    sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
   };
 
   # Source for ubuntu's patchset
   src2 = fetchgit {
     url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
     rev = "refs/tags/ubuntu/${version}-1ubuntu1";
-    sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn";
+    sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
   };
 
   # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
     "${patchPath}/correct_logout_action.patch"
     "${patchPath}/ubuntu-lid-close-suspend.patch"
+    "${patchPath}/revert-wacom-migration.patch"
     "${patchPath}/revert-gsettings-removals.patch"
     "${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
     "${patchPath}/ubuntu_ibus_configs.patch"
@@ -129,6 +131,7 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk3
     lcms2
+    libXtst
     libcanberra-gtk3
     libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
     libgudev
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
index dcdc83934ba6..c073b23e6b9f 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
+++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
@@ -1,18 +1,18 @@
-diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
-index d7d10fd2..5619d6ad 100644
---- a/plugins/power/gsd-backlight.c
-+++ b/plugins/power/gsd-backlight.c
-@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
-                 proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
-                                          &error,
-                                          "pkexec",
--                                         LIBEXECDIR "/gsd-backlight-helper",
-+                                         "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper",
-                                          g_udev_device_get_sysfs_path (backlight->udev_device),
-                                          data->value_str, NULL);
-         } else {
+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
+index e83f1549..15890053 100644
+--- a/plugins/power/gpm-common.c
++++ b/plugins/power/gpm-common.c
+@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand   command,
+         gchar *argv[5] = { 0 };
+ 
+         argv[0] = "pkexec";
+-        argv[1] = LIBEXECDIR "/gsd-backlight-helper";
++        argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper";
+         argv[2] = helper_args[command];
+         argv[3] = value;
+ 
 diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
-index f16300f8..79d6bd17 100644
+index f16300f8..f19bba3e 100644
 --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
 +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
 @@ -25,7 +25,7 @@
@@ -22,5 +22,5 @@ index f16300f8..79d6bd17 100644
 -    <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
 +    <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate>
    </action>
-
+ 
  </policyconfig>
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 2487c4ba3af4..4b055d47b0a0 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib
-, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }:
+, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "pantheon-agent-geoclue2";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 4fdaa4a8bf9f..d9e5512ce784 100644
--- a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
-, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }:
+, vala, gtk3, libgee, polkit, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "pantheon-agent-polkit";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index 7c3203fe62eb..8ebed6f4b5bd 100644
--- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix
+++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
 
 let
-  defaultVersion = "83";
+  defaultVersion = "84";
 
   # Map from git revs to SHA256 hashes
   sha256s = {
-    "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm";
+    "version_84" = "189zqc5gp8fm7clsgby9h2s758ijil7ma4liwbf81wnwkb4kqxc0";
     "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
   };
 in
diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix
index b263b8b187d3..141516015429 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/head.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix
@@ -27,7 +27,7 @@
 , # Whetherto build terminfo.
   enableTerminfo ? !stdenv.targetPlatform.isWindows
 
-, version ? "8.7.20190115"
+, version ? "8.9.20190601"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,14 +89,24 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/ghc.git/";
-    rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
-    sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
+    rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
+    sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
   };
 
   enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
+  patches = [
+    (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+     url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
+     name = "loadpluginsinmodules.diff";
+     sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
+     extraPrefix = "utils/haddock/";
+     stripLen = 1;
+   })
+  ];
+
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
index c288fd3e2a5c..d3d9a4c506de 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
@@ -84,6 +84,14 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+  '' + optionalString stdenv.hostPlatform.isAarch32 ''
+    # skip failing X86 test cases on armv7l
+    rm test/DebugInfo/X86/debug_addr.ll
+    rm test/tools/llvm-dwarfdump/X86/debug_addr.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s
   '' + ''
     patchShebangs test/BugPoint/compile-custom.ll.py
   '';
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
index a4172e8f2b7c..cdc5314f3c77 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "08";
-  patch_version = "0+rc1";
-  sha256 = "014yincnkfg0j2jy0cn30l5hb1y4sf2qf1gy9ix9ghgn32iw5ndk";
+  patch_version = "0+rc2";
+  sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg";
 
   # If the executable is stripped it does not work
   dontStrip = true;
diff --git a/nixpkgs/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix
index 83869e1b6214..4540a3016106 100644
--- a/nixpkgs/pkgs/development/compilers/orc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/orc/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
     sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
   '';
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15
-  doCheck = stdenv.hostPlatform.system != "i686-linux"; # not sure about cross-compiling
+  # i686   https://gitlab.freedesktop.org/gstreamer/orc/issues/18
+  # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9
+  doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32);
 
   meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";
diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix
index a498eafd4254..ff4e387f07e7 100644
--- a/nixpkgs/pkgs/development/compilers/osl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
   # In theory this could use GCC + Clang rather than just Clang,
   # but https://github.com/NixOS/nixpkgs/issues/29877 stops this
   name = "openshadinglanguage-${version}";
-  version = "1.10.4";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "OpenShadingLanguage";
-    rev = "Release-1.10.4";
-    sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
+    rev = "Release-1.10.5";
+    sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
   };
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/nixpkgs/pkgs/development/compilers/scala/default.nix b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
index ce863ef9c915..ce863ef9c915 100644
--- a/nixpkgs/pkgs/development/compilers/scala/default.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
diff --git a/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
new file mode 100644
index 000000000000..ab27d93a7cf9
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "scala-2.13.0";
+
+  src = fetchurl {
+    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
+    sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
+  };
+
+  propagatedBuildInputs = [ jre ] ;
+  buildInputs = [ makeWrapper ] ;
+
+  installPhase = ''
+    mkdir -p $out
+    rm "bin/"*.bat
+    mv * $out
+
+    # put docs in correct subdirectory
+    mkdir -p $out/share/doc
+    mv $out/doc $out/share/doc/scala
+
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p \
+        --prefix PATH ":" ${coreutils}/bin \
+        --prefix PATH ":" ${gnugrep}/bin \
+        --prefix PATH ":" ${jre}/bin \
+        --set JAVA_HOME ${jre}
+    done
+  '';
+
+  meta = {
+    description = "General purpose programming language";
+    longDescription = ''
+      Scala is a general purpose programming language designed to express
+      common programming patterns in a concise, elegant, and type-safe way.
+      It smoothly integrates features of object-oriented and functional
+      languages, enabling Java and other programmers to be more productive.
+      Code sizes are typically reduced by a factor of two to three when
+      compared to an equivalent Java application.
+    '';
+    homepage = https://www.scala-lang.org/;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index ee1aeb1503e0..874b99f2bebf 100644
--- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,23 +14,23 @@ let params =
       sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
     };
 
-    "8.7" = {
-      version = "20171212";
-      rev = "195e550a1cf0810497734356437a1720ebb6d744";
-      sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
-    };
     "8.8" = rec {
-      preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
       version = "20190311";
       rev = "22af9e9a223d0038f05638654422e637e863b355";
       sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
-      buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
-      propagatedBuildInputs = [ coq-ext-lib simple-io ];
+    };
+
+    "8.9" = rec {
+      version = "1.1.0";
+      rev = "v${version}";
+      sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
     };
   };
   param = params."${coq.coq-version}";
 in
 
+let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
+
 stdenv.mkDerivation rec {
 
   name = "coq${coq.coq-version}-QuickChick-${param.version}";
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
+  preConfigure = stdenv.lib.optionalString recent
+    "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
+
   buildInputs = [ coq ]
   ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
-  ++ (param.buildInputs or [])
+  ++ stdenv.lib.optionals recent
+     (with coq.ocamlPackages; [ ocamlbuild num ])
   ;
-  propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
+  propagatedBuildInputs = [ ssreflect ]
+  ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
 
   enableParallelBuilding = false;
 
-  preConfigure = param.preConfigure or null;
-
   installPhase = ''
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
index e685de4e9741..e74b158d33a3 100644
--- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, coq, coq-ext-lib }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.2.0";
   name = "coq${coq.coq-version}-simple-io-${version}";
   src = fetchFromGitHub {
     owner = "Lysxia";
     repo = "coq-simple-io";
     rev = version;
-    sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
+    sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
   };
 
   buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 26e0f56d506c..ff0b2bd82241 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -357,6 +357,7 @@ self: super: {
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
   redis-io = dontCheck super.redis-io;
+  reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;
   safecopy = dontCheck super.safecopy;
@@ -860,7 +861,7 @@ self: super: {
   # Wrap the generated binaries to include their run-time dependencies in
   # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
   # in LTS-13.x.
-  cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
+  cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: {
     buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
     postInstall = drv.postInstall or "" + ''
       for b in $out/bin/cryptol $out/bin/cryptol-html; do
@@ -1099,7 +1100,14 @@ self: super: {
 
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-  stack = generateOptparseApplicativeCompletion "stack" super.stack;
+  stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
+    ansi-terminal = self.ansi-terminal_0_9_1;
+    concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
+    rio = self.rio_0_1_9_2;
+    hi-file-parser = dontCheck super.hi-file-parser;    # Avoid depending on newer hspec versions.
+    http-download = dontCheck super.http-download;
+    pantry-tmp = dontCheck super.pantry-tmp;
+  }));
 
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@@ -1174,14 +1182,13 @@ self: super: {
   # https://github.com/mgajda/json-autotype/issues/25
   json-autotype = dontCheck super.json-autotype;
 
-  # The LTS-13.x version doesn't suffice to build hlint, hoogle, etc.
+  # The LTS-13.x versions doesn't suffice to build these packages.
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
   hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
 
   # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
   tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
   these = doJailbreak super.these; # until these >= 0.7.6
-  insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
 
   uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
     url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1218,8 +1225,11 @@ self: super: {
 
   # Use latest pandoc despite what LTS says.
   # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
-  pandoc = doDistribute super.pandoc_2_7_2;
+  cmark-gfm = self.cmark-gfm_0_2_0;
+  pandoc = dontCheck (doDistribute super.pandoc_2_7_3);  # test suite failure: https://github.com/jgm/pandoc/issues/5582
   pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
+  skylighting = self.skylighting_0_8_1_1;
+  skylighting-core = self.skylighting-core_0_8_1_1;
 
   # Current versions of tasty-hedgehog need hedgehog 1.x, which
   # we don't have in LTS-13.x.
@@ -1271,4 +1281,13 @@ self: super: {
   # https://github.com/pruvisto/heap/issues/11
   heap = dontCheck super.heap;
 
+  # https://github.com/hslua/tasty-lua/issues/1
+  tasty-lua = dontCheck super.tasty-lua;
+
+  # Test suite won't link for no apparent reason.
+  constraints-deriving = dontCheck super.constraints-deriving;
+
+  # The old LTS-13.x version does not compile.
+  ip = self.ip_1_5_0;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3d215cb03eda..3044f64e53de 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,8 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  - ghc-lib-parser ==0.20190523  # newer versions break hlint
-  # LTS Haskell 13.24
+  # LTS Haskell 13.25
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -212,7 +211,7 @@ default-package-overrides:
   - asn1-types ==0.3.2
   - assert-failure ==0.1.2.2
   - astro ==0.4.2.1
-  - async ==2.2.1
+  - async ==2.2.2
   - async-extra ==0.2.0.0
   - async-refresh ==0.3.0.0
   - async-refresh-tokens ==0.4.0.0
@@ -237,7 +236,7 @@ default-package-overrides:
   - avers ==0.0.17.1
   - avers-api ==0.1.0
   - avers-server ==0.1.0.1
-  - avro ==0.4.4.2
+  - avro ==0.4.4.3
   - avwx ==0.3.0.2
   - axel ==0.0.9
   - backprop ==0.2.6.2
@@ -446,7 +445,7 @@ default-package-overrides:
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.1.1
-  - conduit-algorithms ==0.0.9.0
+  - conduit-algorithms ==0.0.10.1
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-connection ==0.1.0.4
@@ -464,7 +463,7 @@ default-package-overrides:
   - console-style ==0.0.2.1
   - constraint ==0.1.3.0
   - constraints ==0.10.1
-  - contravariant ==1.5.1
+  - contravariant ==1.5.2
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
   - control-dsl ==0.2.1.3
@@ -526,7 +525,7 @@ default-package-overrides:
   - cusparse ==0.2.0.0
   - cutter ==0.0
   - cyclotomic ==1.0
-  - czipwith ==1.0.1.1
+  - czipwith ==1.0.1.2
   - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
   - data-accessor-template ==0.2.1.16
@@ -584,7 +583,7 @@ default-package-overrides:
   - dhall ==1.19.1
   - dhall-bash ==1.0.18
   - dhall-json ==1.2.6
-  - dhall-text ==1.0.17
+  - dhall-text ==1.0.18
   - diagrams ==1.4
   - diagrams-contrib ==1.4.3
   - diagrams-core ==1.4.1.1
@@ -624,7 +623,7 @@ default-package-overrides:
   - double-conversion ==2.0.2.0
   - download ==0.3.2.7
   - drinkery ==0.4
-  - dsp ==0.2.4.1
+  - dsp ==0.2.5
   - dual-tree ==0.2.2
   - dublincore-xml-conduit ==0.1.0.2
   - dunai ==0.5.1
@@ -672,7 +671,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - error-util ==0.0.1.2
-  - ersatz ==0.4.6
+  - ersatz ==0.4.7
   - esqueleto ==2.6.0
   - etc ==0.4.1.0
   - eventful-core ==0.2.0
@@ -828,19 +827,19 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.6
   - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.15
+  - gi-atk ==2.0.18
   - gi-cairo ==1.0.17
   - gi-gdk ==3.0.16
-  - gi-gdkpixbuf ==2.0.18
+  - gi-gdkpixbuf ==2.0.20
   - gi-gio ==2.0.19
   - gi-glib ==2.0.17
-  - gi-gobject ==2.0.16
+  - gi-gobject ==2.0.19
   - gi-gtk ==3.0.27
   - gi-gtk-hs ==0.3.6.3
   - gi-gtksource ==3.0.16
   - gi-javascriptcore ==4.0.16
   - gingersnap ==0.3.1.0
-  - gi-pango ==1.0.16
+  - gi-pango ==1.0.19
   - giphy-api ==0.6.0.1
   - githash ==0.1.3.1
   - github-release ==1.2.4
@@ -894,7 +893,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - hapistrano ==0.3.9.2
-  - happy ==1.19.10
+  - happy ==1.19.11
   - hasbolt ==0.1.3.3
   - hashable ==1.2.7.0
   - hashable-time ==0.2.0.2
@@ -1045,7 +1044,7 @@ default-package-overrides:
   - http-common ==0.8.2.0
   - http-conduit ==2.3.7.1
   - http-date ==0.0.8
-  - http-directory ==0.1.2
+  - http-directory ==0.1.4
   - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3.1
   - http-media ==0.7.1.3
@@ -1073,8 +1072,8 @@ default-package-overrides:
   - hw-json ==0.9.0.1
   - hw-mquery ==0.1.0.3
   - hw-packed-vector ==0.0.0.1
-  - hw-parser ==0.1.0.0
-  - hw-prim ==0.6.2.24
+  - hw-parser ==0.1.0.1
+  - hw-prim ==0.6.2.25
   - hw-rankselect ==0.12.0.4
   - hw-rankselect-base ==0.3.2.1
   - hw-streams ==0.0.0.10
@@ -1117,7 +1116,7 @@ default-package-overrides:
   - inline-c-cpp ==0.3.0.2
   - inliterate ==0.1.0
   - insert-ordered-containers ==0.2.2
-  - inspection-testing ==0.4.1.2
+  - inspection-testing ==0.4.2.1
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.3
   - integration ==0.2.1
@@ -1145,8 +1144,8 @@ default-package-overrides:
   - IPv6Addr ==1.1.2
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.6
-  - irc-conduit ==0.3.0.2
+  - irc-client ==1.1.0.7
+  - irc-conduit ==0.3.0.3
   - irc-ctcp ==0.1.3.0
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
@@ -1211,6 +1210,7 @@ default-package-overrides:
   - leancheck ==0.8.0
   - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
+  - learn-physics ==0.6.4
   - lens ==4.17.1
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1281,7 +1281,7 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.2.8.0
+  - massiv ==0.2.8.1
   - massiv-io ==0.1.6.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.1.0
@@ -1424,7 +1424,7 @@ default-package-overrides:
   - network-ip ==0.3.0.2
   - network-messagepack-rpc ==0.1.1.0
   - network-multicast ==0.2.0
-  - network-simple ==0.4.3
+  - network-simple ==0.4.4
   - network-simple-tls ==0.3.2
   - network-transport ==0.5.4
   - network-transport-composed ==0.2.1
@@ -1442,6 +1442,7 @@ default-package-overrides:
   - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
+  - not-gloss ==0.7.7.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.1
   - nsis ==0.3.3
@@ -1543,7 +1544,7 @@ default-package-overrides:
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
-  - pipes ==4.3.9
+  - pipes ==4.3.10
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-binary ==0.4.2
@@ -1634,7 +1635,7 @@ default-package-overrides:
   - protolude ==0.2.3
   - proxied ==0.3.1
   - psql-helpers ==0.1.0.0
-  - psqueues ==0.2.7.1
+  - psqueues ==0.2.7.2
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.13.0.0
   - pure-zlib ==0.6.4
@@ -1662,7 +1663,7 @@ default-package-overrides:
   - ramus ==0.1.2
   - rando ==0.0.0.4
   - random ==1.1
-  - random-bytestring ==0.1.3.1
+  - random-bytestring ==0.1.3.2
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
@@ -1706,7 +1707,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.3.2
   - regex-tdfa-text ==1.0.0.3
   - regex-with-pcre ==1.0.2.0
-  - registry ==0.1.5.2
+  - registry ==0.1.6.0
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.2.1
@@ -1731,6 +1732,7 @@ default-package-overrides:
   - rev-state ==0.1.2
   - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
+  - rg ==1.4.0.0
   - rio ==0.1.8.0
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
@@ -1809,7 +1811,7 @@ default-package-overrides:
   - servant-foreign ==0.15
   - servant-js ==0.9.4
   - servant-JuicyPixels ==0.3.0.4
-  - servant-kotlin ==0.1.1.7
+  - servant-kotlin ==0.1.1.8
   - servant-lucid ==0.8.1
   - servant-mock ==0.8.5
   - servant-pandoc ==0.5.0.0
@@ -1885,6 +1887,7 @@ default-package-overrides:
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - sparse-linear-algebra ==0.3.1
+  - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
   - speculate ==0.3.5
   - speedy-slice ==0.3.0
@@ -1928,7 +1931,7 @@ default-package-overrides:
   - streaming ==0.2.2.0
   - streaming-attoparsec ==1.0.0.1
   - streaming-bytestring ==0.1.6
-  - streaming-commons ==0.2.1.0
+  - streaming-commons ==0.2.1.1
   - streaming-wai ==0.1.1
   - streamly ==0.5.2
   - streamproc ==1.6.2
@@ -2077,7 +2080,7 @@ default-package-overrides:
   - tldr ==0.4.0.1
   - tls ==1.4.1
   - tls-debug ==0.4.5
-  - tls-session-manager ==0.0.0.2
+  - tls-session-manager ==0.0.1.0
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.2.2
@@ -2102,7 +2105,8 @@ default-package-overrides:
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
   - turtle ==1.5.14
-  - typed-process ==0.2.4.0
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.4.1
   - type-fun ==0.1.1
   - type-hint ==0.1
   - type-level-integers ==0.0.1
@@ -2145,7 +2149,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
   - unix-time ==0.4.5
-  - unliftio ==0.2.10
+  - unliftio ==0.2.11
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2206,7 +2210,7 @@ default-package-overrides:
   - wai-app-static ==3.1.6.3
   - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.4
-  - wai-cors ==0.2.6
+  - wai-cors ==0.2.7
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.26
   - wai-handler-launch ==3.0.2.4
@@ -2729,6 +2733,7 @@ broken-packages:
   - algebra
   - algebra-sql
   - algebraic
+  - algebraic-graphs
   - algebraic-prelude
   - algo-s
   - AlgoRhythm
@@ -3166,6 +3171,7 @@ broken-packages:
   - blockhash
   - Blogdown
   - blogination
+  - BlogLiterately
   - BlogLiterately-diagrams
   - bloodhound
   - bloodhound-amazonka-auth
@@ -3652,6 +3658,8 @@ broken-packages:
   - conduit-resumablesink
   - conduit-throttle
   - conduit-tokenize-attoparsec
+  - conduit-vfs
+  - conduit-vfs-zip
   - conduit-zstd
   - conf
   - confcrypt
@@ -3674,6 +3682,7 @@ broken-packages:
   - consistent
   - console-program
   - const-math-ghc-plugin
+  - constrained-categories
   - constrained-category
   - constrained-dynamic
   - constrained-monads
@@ -3681,7 +3690,6 @@ broken-packages:
   - constraint-manip
   - constraint-reflection
   - ConstraintKinds
-  - constraints-deriving
   - constraints-emerge
   - constraints-extras
   - constructive-algebra
@@ -4020,6 +4028,7 @@ broken-packages:
   - dgs
   - dhall-check
   - dhall-nix
+  - dhall-to-cabal
   - dhcp-lease-parser
   - di
   - di-df1
@@ -4058,6 +4067,7 @@ broken-packages:
   - digestive-functors-hsp
   - DigitalOcean
   - digitalocean-kzs
+  - digraph
   - dimensional-tf
   - DimensionalHash
   - dingo-core
@@ -4073,6 +4083,7 @@ broken-packages:
   - direct-rocksdb
   - directed-cubical
   - dirfiles
+  - dirtree
   - discogs-haskell
   - discord-gateway
   - discord-haskell
@@ -4139,6 +4150,7 @@ broken-packages:
   - doctest-discover-configurator
   - doctest-driver-gen
   - doctest-prop
+  - docusign-client
   - docusign-example
   - docvim
   - doi
@@ -4174,6 +4186,7 @@ broken-packages:
   - DrIFT-cabalized
   - drifter-postgresql
   - drmaa
+  - drone
   - dropbox-sdk
   - dropsolve
   - ds-kanren
@@ -4277,6 +4290,7 @@ broken-packages:
   - Emping
   - Empty
   - empty-monad
+  - enchant
   - encoding
   - encoding-io
   - engine-io-growler
@@ -4818,12 +4832,27 @@ broken-packages:
   - ghclive
   - ght
   - gi-cairo-again
+  - gi-dbusmenu
+  - gi-dbusmenugtk3
+  - gi-gdkx11
+  - gi-ggit
+  - gi-girepository
+  - gi-gst
+  - gi-gstaudio
+  - gi-gstbase
   - gi-gstpbutils
   - gi-gsttag
+  - gi-gstvideo
   - gi-gtkosxapplication
+  - gi-handy
   - gi-notify
+  - gi-ostree
+  - gi-pangocairo
   - gi-poppler
+  - gi-secret
+  - gi-soup
   - gi-wnck
+  - gi-xlib
   - giak
   - Gifcurry
   - ginger
@@ -4852,6 +4881,7 @@ broken-packages:
   - github-webhook-handler
   - github-webhook-handler-snap
   - gitignore
+  - gitit
   - gitlab-api
   - gitlib-cross
   - gitlib-libgit2
@@ -4872,6 +4902,7 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
+  - glirc
   - GLMatrix
   - glob-posix
   - global
@@ -5013,6 +5044,7 @@ broken-packages:
   - GTALib
   - gtfs
   - gtk-serialized-event
+  - gtk-sni-tray
   - gtk-toy
   - gtk2hs-hello
   - gtk2hs-rpn
@@ -5351,6 +5383,7 @@ broken-packages:
   - hasql-backend
   - hasql-class
   - hasql-cursor-query
+  - hasql-cursor-transaction
   - hasql-dynamic-statements
   - hasql-generic
   - hasql-implicits
@@ -5382,6 +5415,7 @@ broken-packages:
   - haxl-amazonka
   - haxl-facebook
   - haxparse
+  - haxr
   - haxr-th
   - haxy
   - hayland
@@ -5442,6 +5476,7 @@ broken-packages:
   - heckle
   - hedgehog-checkers
   - hedgehog-checkers-lens
+  - hedgehog-classes
   - hedgehog-fn
   - hedgehog-gen-json
   - hedgehog-quickcheck
@@ -5593,6 +5628,7 @@ broken-packages:
   - hjsonpointer
   - hjsonschema
   - HJVM
+  - hkgr
   - hlatex
   - hlbfgsb
   - hlcm
@@ -5730,6 +5766,7 @@ broken-packages:
   - hpqtypes
   - hpqtypes-extras
   - hprotoc-fork
+  - hprox
   - hps
   - hps-cairo
   - hps-kmeans
@@ -5742,6 +5779,7 @@ broken-packages:
   - hR
   - hranker
   - HRay
+  - hrfsize
   - hricket
   - Hricket
   - hriemann
@@ -5845,7 +5883,6 @@ broken-packages:
   - hslinks
   - hslogger-reader
   - hslogstash
-  - hslua-module-system
   - hsluv-haskell
   - hsmagick
   - HSmarty
@@ -5957,6 +5994,7 @@ broken-packages:
   - http-querystring
   - http-response-decoder
   - http-shed
+  - http-streams
   - http-wget
   - http2-client-grpc
   - http2-grpc-types
@@ -5966,6 +6004,7 @@ broken-packages:
   - htune
   - htvm
   - htzaar
+  - hubigraph
   - huck
   - HueAPI
   - huff
@@ -5999,6 +6038,7 @@ broken-packages:
   - hw-dump
   - hw-eliasfano
   - hw-excess
+  - hw-fingertree
   - hw-ip
   - hw-json
   - hw-json-lens
@@ -6188,7 +6228,6 @@ broken-packages:
   - iostring
   - iothread
   - iotransaction
-  - ip
   - ip2location
   - ip2proxy
   - ipatch
@@ -6612,6 +6651,7 @@ broken-packages:
   - limp-cbc
   - linda
   - linden
+  - line-drawing
   - linear-accelerate
   - linear-algebra-cblas
   - linear-circuit
@@ -6991,6 +7031,7 @@ broken-packages:
   - mollie-api-haskell
   - monad-atom
   - monad-atom-simple
+  - monad-chronicle
   - monad-codec
   - monad-dijkstra
   - monad-exception
@@ -7070,6 +7111,9 @@ broken-packages:
   - mosaico-lib
   - moto
   - moto-postgresql
+  - motor
+  - motor-diagrams
+  - motor-reflection
   - mount
   - movie-monad
   - mp
@@ -7315,6 +7359,7 @@ broken-packages:
   - NoTrace
   - np-linear
   - nptools
+  - ntha
   - ntrip-client
   - NTRU
   - null-canvas
@@ -7708,6 +7753,7 @@ broken-packages:
   - plugins
   - plugins-auto
   - plugins-multistage
+  - plur
   - plural
   - png-file
   - pngload
@@ -7732,6 +7778,9 @@ broken-packages:
   - polydata
   - polydata-core
   - polynomial
+  - polysemy
+  - polysemy-plugin
+  - polysemy-zoo
   - polyseq
   - polysoup
   - polytypeable
@@ -8097,7 +8146,6 @@ broken-packages:
   - refh
   - refined
   - reflection-extras
-  - reflex
   - reflex-animation
   - reflex-backend-wai
   - reflex-basic-host
@@ -8214,6 +8262,7 @@ broken-packages:
   - reversi
   - ReviewBoard
   - rewrite
+  - rewrite-inspector
   - rewriting
   - rezoom
   - rfc
@@ -8430,6 +8479,7 @@ broken-packages:
   - secret-sharing
   - secrm
   - sednaDBXML
+  - selda-json
   - selectors
   - SelectSequencesFromMSA
   - selenium
@@ -8439,6 +8489,8 @@ broken-packages:
   - Semantique
   - semdoc
   - semi-iso
+  - semialign
+  - semialign-indexed
   - semibounded-lattices
   - Semigroup
   - semigroupoids-syntax
@@ -8502,6 +8554,7 @@ broken-packages:
   - servant-pushbullet-client
   - servant-py
   - servant-quickcheck
+  - servant-reason
   - servant-reflex
   - servant-router
   - servant-scotty
@@ -8522,6 +8575,7 @@ broken-packages:
   - serversession-frontend-snap
   - serversession-frontend-yesod
   - services
+  - ses-html
   - ses-html-snaplet
   - SessionLogger
   - sessions
@@ -8868,28 +8922,6 @@ broken-packages:
   - stable-marriage
   - stable-memo
   - stable-tree
-  - stack-bump
-  - stack-hpc-coveralls
-  - stack-lib
-  - stack-network
-  - stack-prism
-  - stack-run
-  - stack-run-auto
-  - stack-type
-  - stack2cabal
-  - stackage
-  - stackage-build-plan
-  - stackage-cabal
-  - stackage-cli
-  - stackage-curator
-  - stackage-metadata
-  - stackage-query
-  - stackage-sandbox
-  - stackage-setup
-  - stackage-to-hackage
-  - stackage-types
-  - stackage-upload
-  - stackage2nix
   - standalone-derive-topdown
   - standalone-haddock
   - starling
@@ -8979,6 +9011,7 @@ broken-packages:
   - stripe
   - stripe-haskell
   - stripe-http-client
+  - stripe-http-streams
   - strongswan-sql
   - structural-induction
   - structural-traversal
@@ -9123,7 +9156,6 @@ broken-packages:
   - tasty-jenkins-xml
   - tasty-laws
   - tasty-lens
-  - tasty-lua
   - tasty-quickcheck-laws
   - tasty-stats
   - tasty-tap
@@ -9203,6 +9235,7 @@ broken-packages:
   - text-containers
   - text-generic-pretty
   - text-icu-normalized
+  - text-icu-translit
   - text-lens
   - text-locale-encoding
   - text-markup
@@ -9210,6 +9243,7 @@ broken-packages:
   - text-plus
   - text-position
   - text-register-machine
+  - text-show-instances
   - text-time
   - text-utf8
   - text-xml-qq
@@ -9240,6 +9274,7 @@ broken-packages:
   - Theora
   - theoremquest
   - theoremquest-client
+  - these-lens
   - these-skinny
   - thih
   - thimk
@@ -9344,6 +9379,7 @@ broken-packages:
   - trace-function-call
   - traced
   - tracetree
+  - tracing
   - tracker
   - trackit
   - traction
@@ -9374,6 +9410,16 @@ broken-packages:
   - travis-meta-yaml
   - trawl
   - traypoweroff
+  - tree-sitter
+  - tree-sitter-go
+  - tree-sitter-haskell
+  - tree-sitter-java
+  - tree-sitter-json
+  - tree-sitter-php
+  - tree-sitter-python
+  - tree-sitter-ruby
+  - tree-sitter-tsx
+  - tree-sitter-typescript
   - tree-traversals
   - TreeCounter
   - treemap-html
@@ -9822,6 +9868,7 @@ broken-packages:
   - word2vec-model
   - WordAlignment
   - wordchoice
+  - wordify
   - WordNet
   - WordNet-ghc74
   - wordpass
@@ -10080,6 +10127,7 @@ broken-packages:
   - yuuko
   - yx
   - yxdb-utils
+  - z3
   - z3-encoding
   - z85
   - zabt
diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index b25a8fcc99f7..94cd5c4783fa 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -537,6 +537,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) freealut;};
 
+  "ALUT_2_4_0_3" = callPackage
+    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
+     mkDerivation {
+       pname = "ALUT";
+       version = "2.4.0.3";
+       sha256 = "04nrh7vribs4jvg99hj3fmshzcw6kkf45r842iys19ln3l51p2bi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base OpenAL StateVar transformers ];
+       librarySystemDepends = [ freealut ];
+       description = "A binding for the OpenAL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) freealut;};
+
   "AMI" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, network
      , pureMD5, stm
@@ -1990,6 +2005,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -5317,10 +5334,8 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.6";
-       sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
-       revision = "1";
-       editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r";
+       version = "2.0.7";
+       sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -6506,6 +6521,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_15" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.15";
+       sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -14489,6 +14522,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
+  "OpenAL_1_7_0_5" = callPackage
+    ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "OpenAL";
+       version = "1.7.0.5";
+       sha256 = "167qgbls1439wbckva281cf61bclkca0krbbi4451l7qjinm8fil";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ObjectName OpenGL StateVar transformers
+       ];
+       librarySystemDepends = [ openal ];
+       description = "A binding to the OpenAL cross-platform 3D audio API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openal;};
+
   "OpenCL" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }:
      mkDerivation {
@@ -14539,6 +14591,8 @@ self: {
        pname = "OpenGL";
        version = "3.0.3.0";
        sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as";
+       revision = "1";
+       editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741";
        libraryHaskellDepends = [
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
@@ -14578,6 +14632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
+  "OpenGLRaw_3_3_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.3.3.0";
+       sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ libGL ];
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -23710,6 +23781,30 @@ self: {
        broken = true;
      }) {};
 
+  "aeson-typescript_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, interpolate, mtl, process, template-haskell
+     , temporary, text, th-abstraction, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-typescript";
+       version = "0.2.0.0";
+       sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw";
+       libraryHaskellDepends = [
+         aeson base containers interpolate mtl template-haskell text
+         th-abstraction unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath hspec
+         interpolate mtl process template-haskell temporary text
+         th-abstraction unordered-containers
+       ];
+       description = "Generate TypeScript definition files from your ADTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "aeson-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific
      , text
@@ -24684,6 +24779,8 @@ self: {
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-graphs_0_4" = callPackage
@@ -24704,6 +24801,7 @@ self: {
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -31783,6 +31881,18 @@ self: {
        broken = true;
      }) {};
 
+  "ast-path" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "ast-path";
+       version = "0.1.2";
+       sha256 = "18glmgnjsp25q88430h8v0a617sc0y468n55nlrgq85a073b6nwf";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "vocabulary representation for predicting program properties";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "astar" = callPackage
     ({ mkDerivation, base, hashable, psqueues, unordered-containers }:
      mkDerivation {
@@ -31873,26 +31983,6 @@ self: {
      }:
      mkDerivation {
        pname = "async";
-       version = "2.2.1";
-       sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
-       revision = "2";
-       editedCabalFile = "130rc6icx3h471qs417lkw9b2pfn27xd009liw58cmdk66zscizp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base hashable stm ];
-       testHaskellDepends = [
-         base HUnit stm test-framework test-framework-hunit
-       ];
-       description = "Run IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async_2_2_2" = callPackage
-    ({ mkDerivation, base, hashable, HUnit, stm, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "async";
        version = "2.2.2";
        sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb";
        isLibrary = true;
@@ -31903,7 +31993,6 @@ self: {
        ];
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-ajax" = callPackage
@@ -33650,40 +33739,6 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.4.4.2";
-       sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers data-binary-ieee754 deepseq fail hashable mtl scientific
-         semigroups tagged template-haskell text tf-random
-         unordered-containers vector zlib
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers directory extra fail hashable hspec lens lens-aeson mtl
-         pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged
-         template-haskell text tf-random transformers unordered-containers
-         vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring containers gauge hashable mtl random
-         raw-strings-qq text transformers unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_4_4_3" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, bytestring, containers, data-binary-ieee754, deepseq
-     , directory, extra, fail, gauge, hashable, hspec, hspec-discover
-     , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random
-     , raw-strings-qq, scientific, semigroups, tagged, template-haskell
-     , text, tf-random, transformers, unordered-containers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "avro";
        version = "0.4.4.3";
        sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi";
        libraryHaskellDepends = [
@@ -33706,7 +33761,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -36885,6 +36939,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bglib" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, monad-loops, mtl
+     , optparse-applicative, serialport, stm
+     }:
+     mkDerivation {
+       pname = "bglib";
+       version = "1.0.0.1";
+       sha256 = "09nifakgbx45l4qgqvb4jyaq06cx7gy6pnry31hpim3g82czsixs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring monad-loops mtl serialport stm
+       ];
+       executableHaskellDepends = [
+         async base bytestring mtl optparse-applicative serialport stm
+       ];
+       description = "Implementation of the BGAPI serial protocol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bgmax" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, time }:
      mkDerivation {
@@ -37208,6 +37282,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bimap_0_4_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "bimap";
+       version = "0.4.0";
+       sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi";
+       libraryHaskellDepends = [ base containers deepseq exceptions ];
+       testHaskellDepends = [
+         base containers deepseq exceptions QuickCheck template-haskell
+       ];
+       description = "Bidirectional mapping between two key types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bimap-server" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, directory, http-types
      , unix, wai, warp
@@ -37275,22 +37366,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_6_0" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
-     , containers, criterion, deepseq, directory, filepath
-     , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework
-     , test-framework-quickcheck2, unordered-containers, zlib
+  "binary_0_8_7_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring
+     , Cabal, cereal, containers, criterion, deepseq, directory
+     , filepath, generic-deriving, HUnit, mtl, QuickCheck, random
+     , test-framework, test-framework-quickcheck2, unordered-containers
+     , zlib
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.6.0";
-       sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y";
-       revision = "1";
-       editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2";
+       version = "0.8.7.0";
+       sha256 = "1r29yg94imhrbzjsv8ghf3217rhlas7945cp9i3dxzskzviyz78x";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
-         array base bytestring Cabal containers directory filepath HUnit
-         QuickCheck random test-framework test-framework-quickcheck2
+         array base base-orphans bytestring Cabal containers directory
+         filepath HUnit QuickCheck random test-framework
+         test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [
          array attoparsec base bytestring cereal containers criterion
@@ -38714,6 +38805,8 @@ self: {
        pname = "bindynamic";
        version = "1.0.0.1";
        sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
+       revision = "1";
+       editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
@@ -39049,8 +39142,8 @@ self: {
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.1.2.1";
-       sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx";
+       version = "0.1.3.0";
+       sha256 = "1mgiv9al30v1y78cz65rfb8251mwkgk34j1i3dygjp44071kxqcq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42543,6 +42636,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "bson_0_3_2_8" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.8";
+       sha256 = "1xqxjs0vhlrvnclkxn8y5dr4liaja4flqizphk1000km2kvvw748";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash-md5 data-binary-ieee754 mtl
+         network text time
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2 text time
+       ];
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -43227,8 +43342,8 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.3.2.1";
-       sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda";
+       version = "1.3.2.3";
+       sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
@@ -55359,43 +55474,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.9.0";
-       sha256 = "1d2d9ak3mn77lklxr80xw9xpay31f71h5hd66mgrixk48bfr9p8i";
-       libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq directory exceptions
-         HUnit lzma-conduit monad-control mtl pqueue resourcet stm
-         stm-conduit streaming-commons test-framework test-framework-hunit
-         test-framework-th transformers unliftio-core vector
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers criterion deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "conduit-algorithms_0_0_10_1" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, conduit-zstd, containers
-     , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
-     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit-algorithms";
        version = "0.0.10.1";
        sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y";
        libraryHaskellDepends = [
@@ -55544,6 +55622,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-connection_0_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, HUnit
+     , network, resourcet, test-framework, test-framework-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "conduit-connection";
+       version = "0.1.0.5";
+       sha256 = "0mvsvxfps6pnlanl5zx7cz6qxpn907qgx5bcl18vb9vhn8frh0m6";
+       libraryHaskellDepends = [
+         base bytestring conduit connection resourcet transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit connection HUnit network resourcet
+         test-framework test-framework-hunit transformers
+       ];
+       description = "Conduit source and sink for Network.Connection.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-extra_1_2_3_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
@@ -55605,6 +55704,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_3_2" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , gauge, hspec, network, primitive, process, QuickCheck, resourcet
+     , stm, streaming-commons, text, transformers, transformers-base
+     , typed-process, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.3.2";
+       sha256 = "1fs61dsdkk61rqfkrv11plkq5n1z44kq5cscv7iwbgb5s0ds6j5i";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring conduit directory filepath network
+         primitive process resourcet stm streaming-commons text transformers
+         typed-process unliftio-core
+       ];
+       testHaskellDepends = [
+         async attoparsec base bytestring bytestring-builder conduit
+         directory exceptions filepath hspec process QuickCheck resourcet
+         stm streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-builder conduit gauge transformers
+       ];
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -55777,6 +55905,60 @@ self: {
        broken = true;
      }) {};
 
+  "conduit-vfs" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-extra, directory, exceptions, extra, filepath
+     , monad-loops, mono-traversable, mtl, resourcet, text, transformers
+     , unix, unliftio, unordered-containers
+     }:
+     mkDerivation {
+       pname = "conduit-vfs";
+       version = "0.1.0.3";
+       sha256 = "1nsq4s0cxag6drynkfl79q0lirh37r3l59nzhkdyjlak4bzq5g1f";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra directory
+         exceptions extra filepath monad-loops mono-traversable mtl
+         resourcet text transformers unix unliftio unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra directory
+         exceptions extra filepath monad-loops mono-traversable mtl
+         resourcet text transformers unix unliftio unordered-containers
+       ];
+       description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "conduit-vfs-zip" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-extra, conduit-vfs, directory, exceptions, extra
+     , filepath, monad-loops, mono-traversable, mtl, resourcet, text
+     , transformers, unix, unliftio, unordered-containers, zip-archive
+     }:
+     mkDerivation {
+       pname = "conduit-vfs-zip";
+       version = "0.1.0.1";
+       sha256 = "07c2r03if3bminakcf4z7k990c8nf94w3q41csrzd4zy3qk0acr5";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra conduit-vfs
+         directory exceptions extra filepath monad-loops mono-traversable
+         mtl resourcet text transformers unix unliftio unordered-containers
+         zip-archive
+       ];
+       testHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra conduit-vfs
+         directory exceptions extra filepath monad-loops mono-traversable
+         mtl resourcet text transformers unix unliftio unordered-containers
+         zip-archive
+       ];
+       description = "Zip archive interface for the Conduit Virtual File System";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "conduit-zstd" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, directory, HUnit, test-framework
@@ -56020,10 +56202,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "0.5.0.1";
-       sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
-       revision = "3";
-       editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
+       version = "1.0.0.0";
+       sha256 = "0yziw7yqyzdxfxzrzp8wq0858njxxf3ikdbzivf63zfn3sf79y61";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -56510,6 +56690,8 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -56691,8 +56873,6 @@ self: {
        ];
        description = "Manipulating constraints and deriving class instances programmatically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraints-emerge" = callPackage
@@ -56868,24 +57048,13 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_6_0_1" = callPackage
-    ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
-     , ghc-prim, HUnit, QuickCheck, random, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     }:
+  "containers_0_6_1_1" = callPackage
+    ({ mkDerivation, array, base, deepseq }:
      mkDerivation {
        pname = "containers";
-       version = "0.6.0.1";
-       sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
-       libraryHaskellDepends = [ array base deepseq ghc-prim ];
-       testHaskellDepends = [
-         array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ghc-prim random transformers
-       ];
+       version = "0.6.1.1";
+       sha256 = "101w44h7rz1isqpnl8lgmazjxg290cha5nqnk47sy5ijwgdq3lsd";
+       libraryHaskellDepends = [ array base deepseq ];
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57143,25 +57312,11 @@ self: {
     ({ mkDerivation, base, StateVar, transformers }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.5.1";
-       sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8";
-       revision = "2";
-       editedCabalFile = "016p9bn2glarmyizs3cw86ilxqajy5iriz4fvq0ibzf9f0aj4vnq";
-       libraryHaskellDepends = [ base StateVar transformers ];
-       description = "Contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "contravariant_1_5_2" = callPackage
-    ({ mkDerivation, base, StateVar, transformers }:
-     mkDerivation {
-       pname = "contravariant";
        version = "1.5.2";
        sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4";
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -61468,25 +61623,12 @@ self: {
     ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
        pname = "czipwith";
-       version = "1.0.1.1";
-       sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base transformers ];
-       description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "czipwith_1_0_1_2" = callPackage
-    ({ mkDerivation, base, template-haskell, transformers }:
-     mkDerivation {
-       pname = "czipwith";
        version = "1.0.1.2";
        sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -67162,23 +67304,6 @@ self: {
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.17";
-       sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53";
-       revision = "1";
-       editedCabalFile = "1avvybk495zngswlnjiqj8nk7iycwzzhxx3cml4w2yhqlic3xx2g";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base dhall optparse-applicative text
-       ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_18" = callPackage
-    ({ mkDerivation, base, dhall, optparse-applicative, text }:
-     mkDerivation {
-       pname = "dhall-text";
        version = "1.0.18";
        sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd";
        isLibrary = false;
@@ -67188,7 +67313,6 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -67217,6 +67341,8 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -68213,8 +68339,8 @@ self: {
      }:
      mkDerivation {
        pname = "differential";
-       version = "0.1.1.0";
-       sha256 = "0h6w082zq4f4p7j61bdi3jzpb42wwgh1d3067jywlnx2qwa0ijhp";
+       version = "0.1.2.0";
+       sha256 = "1mw70yrxi72q55h5xvyds7qp5az7j1qc3xix6ahck17dv5w8fpyl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68565,6 +68691,8 @@ self: {
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dihaa" = callPackage
@@ -68632,13 +68760,16 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, QuickCheck }:
+    ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck
+     }:
      mkDerivation {
        pname = "dimensions";
-       version = "1.0.1.1";
-       sha256 = "18f0b82vgzwk8yf0d8h10ni18jq2x34rgb1lsprlb1xxpw0dskda";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
+       version = "2.0.0.0";
+       sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8";
+       libraryHaskellDepends = [ base constraints-deriving ghc ];
+       testHaskellDepends = [
+         base Cabal constraints-deriving QuickCheck
+       ];
        description = "Safe type-level dimensionality for multidimensional data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69071,6 +69202,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disassembler" = callPackage
@@ -69286,19 +69419,17 @@ self: {
 
   "discrimination" = callPackage
     ({ mkDerivation, array, base, containers, contravariant, criterion
-     , deepseq, ghc-prim, hashable, primitive, profunctors, promises
-     , semigroups, transformers, transformers-compat
+     , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors
+     , promises, semigroups, transformers, transformers-compat
      , unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.3";
-       sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
-       revision = "1";
-       editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
+       version = "0.4";
+       sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
-         primitive profunctors promises semigroups transformers
+         integer-gmp primitive profunctors promises semigroups transformers
          transformers-compat vector void
        ];
        benchmarkHaskellDepends = [
@@ -71006,19 +71137,22 @@ self: {
   "docusign-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , data-default, docusign-base-minimal, exceptions, http-client
-     , http-client-tls, http-types, servant-client, text, uuid
+     , http-client-tls, http-types, servant-client, servant-client-core
+     , text, uuid
      }:
      mkDerivation {
        pname = "docusign-client";
-       version = "0.0.2";
-       sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx";
+       version = "0.0.3";
+       sha256 = "0gaqcxdl40fhpik6n8fgs717gri1g90xkhmxii5535513lp67id2";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring data-default
          docusign-base-minimal exceptions http-client http-client-tls
-         http-types servant-client text uuid
+         http-types servant-client servant-client-core text uuid
        ];
        description = "Client bindings for the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-example" = callPackage
@@ -71748,6 +71882,29 @@ self: {
        broken = true;
      }) {};
 
+  "dprox" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, dns
+     , hspec, iproute, network, optparse-applicative, streaming-commons
+     , unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dprox";
+       version = "0.1.2.1";
+       sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring containers dns iproute network
+         optparse-applicative streaming-commons unix unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers dns hspec iproute network
+         optparse-applicative streaming-commons unix unordered-containers
+       ];
+       description = "a lightweight DNS proxy server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -71939,6 +72096,8 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -72118,20 +72277,6 @@ self: {
     ({ mkDerivation, array, base, containers, QuickCheck, random }:
      mkDerivation {
        pname = "dsp";
-       version = "0.2.4.1";
-       sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base containers random ];
-       testHaskellDepends = [ array base containers QuickCheck ];
-       description = "Haskell Digital Signal Processing";
-       license = "GPL";
-     }) {};
-
-  "dsp_0_2_5" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, random }:
-     mkDerivation {
-       pname = "dsp";
        version = "0.2.5";
        sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5";
        isLibrary = true;
@@ -72140,7 +72285,6 @@ self: {
        testHaskellDepends = [ array base containers QuickCheck ];
        description = "Haskell Digital Signal Processing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dstring" = callPackage
@@ -73249,14 +73393,21 @@ self: {
      }) {};
 
   "easytensor" = callPackage
-    ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
+    ({ mkDerivation, base, Cabal, constraints-deriving, dimensions
+     , QuickCheck, template-haskell, time
+     }:
      mkDerivation {
        pname = "easytensor";
-       version = "1.0.1.0";
-       sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k";
-       libraryHaskellDepends = [ base dimensions ];
-       testHaskellDepends = [ base Cabal dimensions QuickCheck ];
-       benchmarkHaskellDepends = [ base dimensions time ];
+       version = "2.0.1.0";
+       sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv";
+       libraryHaskellDepends = [ base constraints-deriving dimensions ];
+       testHaskellDepends = [
+         base Cabal constraints-deriving dimensions QuickCheck
+         template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base constraints-deriving dimensions time
+       ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73267,8 +73418,8 @@ self: {
     ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
      mkDerivation {
        pname = "easytensor-vulkan";
-       version = "1.0.1.0";
-       sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9";
+       version = "2.0.1.0";
+       sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
@@ -73943,8 +74094,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.8.1";
-       sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w";
+       version = "3.8.2";
+       sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -75389,6 +75540,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -76629,34 +76782,6 @@ self: {
      }:
      mkDerivation {
        pname = "ersatz";
-       version = "0.4.6";
-       sha256 = "0h99i04690c7f1zpkzbh31p641nmxyj7grisxw5yaavdbinagmvq";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array attoparsec base bytestring containers data-default lens mtl
-         process semigroups temporary transformers unordered-containers
-       ];
-       executableHaskellDepends = [
-         array base containers fail lens mtl parsec semigroups
-       ];
-       testHaskellDepends = [ array base directory doctest filepath mtl ];
-       description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "ersatz_0_4_7" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, containers, data-default, directory, doctest, fail
-     , filepath, lens, mtl, parsec, process, semigroups, temporary
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ersatz";
        version = "0.4.7";
        sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d";
        isLibrary = true;
@@ -79068,20 +79193,20 @@ self: {
     ({ mkDerivation, async, base, bytestring, containers, data-default
      , deepseq, directory, exceptions, extensible-effects, filepath
      , hostname, HUnit, lens, monad-control, mtl, network, parallel
-     , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty
-     , tasty-discover, tasty-hunit, text, time, transformers-base
+     , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged
+     , tasty, tasty-discover, tasty-hunit, text, time, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.25.0";
-       sha256 = "135vj952zq4qgs9fsdnkn9rrpkyzkzl5dz6izghyx2i3rfyi7mnf";
+       version = "0.25.1";
+       sha256 = "0c8569lys8pj432kmwcf30gxaxz2mnrqqpg7blk504fa5zrdxs69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers data-default deepseq directory
          exceptions extensible-effects filepath hostname lens monad-control
          mtl network parallel pretty-types process QuickCheck
-         safe-exceptions stm text time transformers-base
+         safe-exceptions stm tagged text time transformers-base
        ];
        executableHaskellDepends = [
          base data-default deepseq directory extensible-effects filepath
@@ -79816,6 +79941,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_2_4_16" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, hspec-discover, text, unix-compat
+     , unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.16";
+       sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix-compat unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -80768,6 +80913,8 @@ self: {
        pname = "feed";
        version = "1.1.0.0";
        sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg";
+       revision = "1";
+       editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -82413,6 +82560,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fixed";
+       version = "0.3";
+       sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j";
+       libraryHaskellDepends = [ base ];
+       description = "Signed 15.16 precision fixed point arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-length" = callPackage
     ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
      }:
@@ -82913,14 +83072,14 @@ self: {
      }) {};
 
   "flags-applicative" = callPackage
-    ({ mkDerivation, base, containers, hspec, mtl, text }:
+    ({ mkDerivation, base, containers, hspec, mtl, network, text }:
      mkDerivation {
        pname = "flags-applicative";
-       version = "0.0.4.4";
-       sha256 = "19iary62l31vhsbmp1y67pwjl8vik4bi5ijxs82gszqp5syg46mh";
+       version = "0.0.4.5";
+       sha256 = "1qwps2f8ifdm0801v0kgg33q9kj3fmhh7pjgqz43ba4b8qb3ni6m";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers mtl text ];
+       libraryHaskellDepends = [ base containers mtl network text ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Applicative flag parsing";
@@ -87227,8 +87386,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.10.2";
-       sha256 = "0mff8kdjihakaf2gmy3a1ln9ghnqis72gqldssp9b4ahn2xni1v8";
+       version = "0.11.1";
+       sha256 = "0a5682k3gksn08ca5wahk4s8spvjccly5pzq6125ppg976h6w4j8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90579,25 +90738,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser";
-       version = "0.20190523";
-       sha256 = "0z023rimlifffds03h25r9m1s5c51wfwra0d0isfiijqfxmq3ki7";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib-parser_8_8_0_20190424" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
-     , process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser";
        version = "8.8.0.20190424";
        sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10";
        enableSeparateDataOutput = true;
@@ -90608,7 +90748,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -91701,28 +91840,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.15";
-       sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9";
+       version = "2.0.18";
+       sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_17" = callPackage
+  "gi-atk_2_0_19" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.17";
-       sha256 = "0xdhc2na8hx56czyhq12470gjsqmy8jdhj7gq77vny26vngpz7xb";
+       version = "2.0.19";
+       sha256 = "014pmfnwbhx7a6gnf79i2rxw1rzqzljz5bcinh998dnfq1y8s5m6";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -91758,15 +91896,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
-  "gi-cairo_1_0_19" = callPackage
+  "gi-cairo_1_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.19";
-       sha256 = "1sj5887w2yqj6f2srq85yhlrshdyfzlklglrggrvq93zdc3jmady";
+       version = "1.0.21";
+       sha256 = "0w90mapgxs79iy0nwfvdwy79r5msgajn52p9b9q2am63abpcpmyl";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -91838,8 +91976,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
-       version = "0.4.3";
-       sha256 = "0vjkanjc4ylmqv6gihpf78627gigvag83866hyc0gq2a42h0qf75";
+       version = "0.4.5";
+       sha256 = "0439zf2hghnr38h5iwpzip4si2rxp8b7jr76iixvs3mi22ysna56";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -91848,6 +91986,8 @@ self: {
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -91858,8 +91998,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
-       version = "0.4.4";
-       sha256 = "1jcjk4iw6y6pqhl1p9n5zp23gp1yphjk1653jsddvpw1k855kjx9";
+       version = "0.4.6";
+       sha256 = "001agjm5qma5bxqribgh82hqwiqhlnlqq1wknqxlffvggr3ln1ws";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
@@ -91869,6 +92009,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -91892,7 +92034,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gdk_3_0_18" = callPackage
+  "gi-gdk_3_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -91900,8 +92042,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.18";
-       sha256 = "1668vyiahl7h9hhhgpc1ay23k2pr01nvwmdq4sfdldpzqf5fkqqk";
+       version = "3.0.20";
+       sha256 = "0ad8802rac65gm5jl0zqwdq24qxva6n8qz935l7gg26waqs7dz73";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -91921,28 +92063,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.18";
-       sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj";
+       version = "2.0.20";
+       sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf ];
-       doHaddock = false;
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
-  "gi-gdkpixbuf_2_0_19" = callPackage
+  "gi-gdkpixbuf_2_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.19";
-       sha256 = "1zj3m8mlfwrh986109xi1xh5mizmgz9kb3256qsbw2ghb97pyb12";
+       version = "2.0.21";
+       sha256 = "1xxvrqi86n833xs2lmarbv1qyjmm34vvv5cj7lgfmb1ak0h4wihh";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -91961,8 +92102,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkx11";
-       version = "3.0.5";
-       sha256 = "118cdj23vc4ggnkcdl257wp00bi38gm6bic99dsmkbg2f8v7gm7j";
+       version = "3.0.7";
+       sha256 = "1dql529dj041a0ch6z2wky20y7kyavwjb3vhrgsgxcrqdyhxcjkd";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
@@ -91972,6 +92113,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gi-ggit" = callPackage
@@ -91981,8 +92124,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ggit";
-       version = "1.0.4";
-       sha256 = "0ak054y6lcg7ir7wwp6n6a0as2pvl46x3n96nah3jfgbsh3c58b1";
+       version = "1.0.6";
+       sha256 = "08qz7lbjfyfk6c57xh6f64dsa085ilpajskqgvgrk38rc3cm15ak";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -91991,6 +92134,8 @@ self: {
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -92012,15 +92157,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gio_2_0_21" = callPackage
+  "gi-gio_2_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.21";
-       sha256 = "1w1xqscd3l8qm9kzrn1r1rkybir240paxi7yay9sipn5vf9spqic";
+       version = "2.0.23";
+       sha256 = "04rnisx6la0aki6diqsf044hn2ykcxh6gaijnfwxdizar1crm8w5";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92039,8 +92184,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.18";
-       sha256 = "1x98db448v1w2fsanj1djdar7nm4hszdqlq9g40bfj45xf5zb8ja";
+       version = "1.0.20";
+       sha256 = "1y8c2dqvija13y748nz8465knybds5ymx4vvfzgh0ryyq56q9ka8";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92049,6 +92194,8 @@ self: {
        libraryPkgconfigDepends = [ gobject-introspection ];
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
@@ -92070,15 +92217,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-glib_2_0_19" = callPackage
+  "gi-glib_2_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.19";
-       sha256 = "0yws8cgl810ss0gjnrx3d8w28im7s20v5qv68addr0qf118yl5xl";
+       version = "2.0.21";
+       sha256 = "053bm03x0dwybblzn8qz02dgj65bbxp35imf1j02wiq72gp2jwwf";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -92097,28 +92244,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.16";
-       sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65";
+       version = "2.0.19";
+       sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gobject_2_0_18" = callPackage
+  "gi-gobject_2_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.18";
-       sha256 = "1p77i466as1kjrjgvsrgcgijkz9w8p4i4afh57h1xzb3yxc8j9wv";
+       version = "2.0.20";
+       sha256 = "1q78imn19g9b6d5ydh5scbpkbi7gn2iafsxqfg0si4zzdvi9iwb0";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi haskell-gi-base
@@ -92137,8 +92283,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.18";
-       sha256 = "0zr7calvl7ivqck2gxgq9ms2g6pwll3bwkr1wdqyz0i96i6hz2pz";
+       version = "1.0.20";
+       sha256 = "119gh8569mcqwjrm8h3kxxqvxvhrgnfnwvvwk6b70dygbh8dgnhi";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92147,6 +92293,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer ];
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -92156,8 +92304,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.17";
-       sha256 = "02d4ixjmiv600avmv0lyaynfbywkiahcfyw4zz6ihzlbxwrifznq";
+       version = "1.0.19";
+       sha256 = "1pfp945haffpgrxd8zr8lyqr1dxriqyh3wmw1rhqh5j2rb7li2c3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92166,6 +92314,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
@@ -92175,8 +92325,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.18";
-       sha256 = "0mxys3r67rcwk9kfg7bk70ppyswafx3mqvmacwrnjqkp187bbw02";
+       version = "1.0.20";
+       sha256 = "195v4j1xj79qwjfm4py0ikgdymfvzd2gxdarpwk51grdshwp94v7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
@@ -92185,6 +92335,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -92195,8 +92347,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstpbutils";
-       version = "1.0.17";
-       sha256 = "07x8pibdj24qsx90rym4fnd6bp9wfdlkwmmwpkj0wbmk1r22zsyx";
+       version = "1.0.19";
+       sha256 = "1kk3xlpn7syzb9k93b933xykc1jpaf5gsqqhckx69rghrx9x09nv";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio
@@ -92217,8 +92369,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gsttag";
-       version = "1.0.17";
-       sha256 = "06rv6c22hlqfnv74gkgwp0yjlr65s6jf9cn9m087i73l5d7x3j1m";
+       version = "1.0.19";
+       sha256 = "0sb3qpp23gj4h2cgx6a5qvd3s8x9z1h0kdkh8wi7x9nnzsykms31";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92238,8 +92390,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.18";
-       sha256 = "01q9rl0qvwa9swim1y7gdlsn16pjk9d9z3w09x1sm5mvmilpa2sz";
+       version = "1.0.20";
+       sha256 = "155hysdl97mssjflrk9hq1sgn96v6wn32rdaxvdddmwp880kxrgb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92248,6 +92400,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -92271,7 +92425,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gtk_3_0_28" = callPackage
+  "gi-gtk_3_0_30" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base
@@ -92279,8 +92433,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.28";
-       sha256 = "1v0inwj2adl4qrmnk4i8l3nvsij8w1mxfjlgnwc2b3fk9xbvplq4";
+       version = "3.0.30";
+       sha256 = "19qy6r3r1nnk982zir90nq13h88c3inkq2mrcrlm9r83hhlghc4v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -92410,7 +92564,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtksourceview3;};
 
-  "gi-gtksource_3_0_18" = callPackage
+  "gi-gtksource_3_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
@@ -92418,8 +92572,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.18";
-       sha256 = "19rp6qf5i0g2scqgzy1x52hcjmy2g4bprxyyr06b0ba45n57mv24";
+       version = "3.0.20";
+       sha256 = "0wqdmp953f1frkh239346z2qv1sippvijqcn5dy3ryzqaa7flg08";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -92440,8 +92594,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-handy";
-       version = "0.0.2";
-       sha256 = "1n7klswgpyrpj8wwbavajcz8bh7vwg21sh8f746lfv9dbsxddgm2";
+       version = "0.0.4";
+       sha256 = "1amzr50s610b3zwrx861y2m3llvlnrp2l8197b3r8a6lr2qwyh4v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -92451,6 +92605,8 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-javascriptcore" = callPackage
@@ -92474,15 +92630,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_17" = callPackage
+  "gi-javascriptcore_4_0_19" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.17";
-       sha256 = "0xkvk8zsk7afyz6k236qmli54c7c0rwrmjd81srwwx4pfp3lg6q9";
+       version = "4.0.19";
+       sha256 = "01idxk90ac7dcssx5hfh45a3gdcrclag0qm1bl67i0zpvnwn1zd4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92501,8 +92657,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.17";
-       sha256 = "1ch8bg8l7pzj0rcfm3q6hzfk47ls17bmx71apzpq9sm9svqxb8p3";
+       version = "0.7.19";
+       sha256 = "0kbpvzxxkjm0b33sch5kwb496l92jhmjgdg9ld3qwmlskxljsikf";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
@@ -92522,8 +92678,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.8";
-       sha256 = "16p54x0pryi4dn944kkshbrkrlsjicmqfibzr4hsmjwxn54wx6hl";
+       version = "1.0.10";
+       sha256 = "0z9zqpd1mn06wh9015lk8lm1591ds3znd4acargwqswx0a1ld3s3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92533,6 +92689,8 @@ self: {
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -92542,8 +92700,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.16";
-       sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57";
+       version = "1.0.19";
+       sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92558,15 +92716,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
-  "gi-pango_1_0_18" = callPackage
+  "gi-pango_1_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.18";
-       sha256 = "1h9qpx87dn956awfhrn90nksjq5lgcvpg02jmqklhd3hbi0y09gx";
+       version = "1.0.20";
+       sha256 = "009r17247iww4pprq9sv3q70bl5pabbh1i6vrs96793sf36fjw6k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92590,8 +92748,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.19";
-       sha256 = "002bir4pdgjdsi0psppfh335y07f53g747axm7ip29005mki0y4r";
+       version = "1.0.21";
+       sha256 = "0qxb6zdai8lcy7hqqc0xs6v9pwfnz1ax6bxdybbjl0xm6jysqp52";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -92604,6 +92762,8 @@ self: {
        '';
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
@@ -92613,8 +92773,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.17";
-       sha256 = "14vnqc3nxg5ysajr5g357vhzx7pgag82l9irvkhk9q1y4q1w5akc";
+       version = "0.18.19";
+       sha256 = "0ifpx03jsb1xqqz8cldyi25par557vqg778jbghixyapp77jkpcl";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
@@ -92634,8 +92794,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-secret";
-       version = "0.0.7";
-       sha256 = "13qfzglg7r6yhdkxp1jdlmraijw7677cssjh9zyd805xrz6974cx";
+       version = "0.0.9";
+       sha256 = "1pxl30lnmj46jibwfgzrxvhcdkqh5mv5p33l2w2q6mv5j062faf1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92644,6 +92804,8 @@ self: {
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -92653,8 +92815,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.18";
-       sha256 = "1k0x01lkpbk75gp2l9rrjib3hcijdr1d73fi766pnix66cwk7b44";
+       version = "2.4.20";
+       sha256 = "1390n03cb62zfzszw73pnkd3im6pj23a9axbc9dn0d5pavba6ngb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92663,6 +92825,8 @@ self: {
        libraryPkgconfigDepends = [ libsoup ];
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsoup;};
 
   "gi-vte" = callPackage
@@ -92686,7 +92850,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {vte_291 = pkgs.vte;};
 
-  "gi-vte_2_91_21" = callPackage
+  "gi-vte_2_91_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -92694,8 +92858,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.21";
-       sha256 = "075xibks1cpk61rhjr62gr9iywc1pns0pg6g13gaf2gk68isahkb";
+       version = "2.91.23";
+       sha256 = "104riv8q9lxf5dzhbjkv3z8sh33yqvc6nynspl1nawzpkjkql96f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -92739,8 +92903,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.21";
-       sha256 = "0k236cnfal15vxfb2ggxfdnxpvshyxs50ra3s99h1wjp3h931db0";
+       version = "4.0.23";
+       sha256 = "0jvbxzxfpwcsp125v656anikiwvb3p3xvlpg5vpsyiz63xqnpxxx";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -92761,8 +92925,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.20";
-       sha256 = "097x8d3ddvbd26hshd89f9rbv6nyca465v2s3lcbn5g8gdwvcbmf";
+       version = "4.0.22";
+       sha256 = "0qk2mvj8j954h99vrckksyff8rjw9304p9lw3007b2qi6x918j27";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-gobject gi-gtk
@@ -92783,8 +92947,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-wnck";
-       version = "3.0.3";
-       sha256 = "0bnajlayk3flliy6ih34pizl9a1ljhk6hipg1jcj75mw3apqy62i";
+       version = "3.0.5";
+       sha256 = "0bd3lhkjbcrg09y491hpq090p1jwr1xqnnnhjjvhrgsqgzsf073v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject
@@ -92805,8 +92969,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-xlib";
-       version = "2.0.4";
-       sha256 = "1f04kl5fc2cyzjknffkgiynn5k8a2y9ib9rwdm9vxkkl96ff3h5m";
+       version = "2.0.6";
+       sha256 = "0ppcizy17j69cczcfl76ij9p1jcis2xnmhjg45ysqhh0fcnj8jvi";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -92815,6 +92979,8 @@ self: {
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
@@ -92858,8 +93024,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.8.4.1";
-       sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p";
+       version = "0.9.0.0";
+       sha256 = "14racx3vadxypk8h5cwj2qhg5fpc2pma6gmwlmr2ga6yswpgkl29";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -93850,6 +94016,8 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -94114,8 +94282,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.4";
-       sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49";
+       version = "0.5";
+       sha256 = "13whv4bv7b69vzq1c6xdcim9mlsr4qsnsjiwv36g7fykcvbr72rl";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -94183,8 +94351,8 @@ self: {
        pname = "gl";
        version = "0.8.0";
        sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
-       revision = "2";
-       editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9";
+       revision = "3";
+       editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl";
        setupHaskellDepends = [
          base Cabal containers directory filepath hxt transformers
        ];
@@ -94568,6 +94736,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -98342,6 +98512,31 @@ self: {
        broken = true;
      }) {};
 
+  "grab" = callPackage
+    ({ mkDerivation, base, criterion, hedgehog }:
+     mkDerivation {
+       pname = "grab";
+       version = "0.0.0.1";
+       sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Applicative non-linear consumption";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "grab-form" = callPackage
+    ({ mkDerivation, base, containers, grab, hedgehog, text }:
+     mkDerivation {
+       pname = "grab-form";
+       version = "0.0.0.1";
+       sha256 = "0pgg7f7nxrw0rxwgvfkcqwz11qx1g92n6hxghrqy8pz9cxirh1np";
+       libraryHaskellDepends = [ base containers grab text ];
+       testHaskellDepends = [ base containers hedgehog text ];
+       description = "Applicative parsers for form parameter lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "graceful" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec, network, process
      , stm, unix
@@ -98970,8 +99165,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.10.0.0";
-       sha256 = "0cgsn0nwixgcamg9yp4qsz88dmm3rdmkcl7ahlnpvksgw7llnxa8";
+       version = "0.10.0.1";
+       sha256 = "1aqadpg3jm9f1z43ylpmh512gi320kqnnfl6qksp2l1w26lnd0vs";
        libraryHaskellDepends = [
          base bytestring cassava containers deepseq graphviz hashable
          process QuickCheck random semigroups text unordered-containers
@@ -99433,6 +99628,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-core_0_1_2_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "greskell-core";
+       version = "0.1.2.6";
+       sha256 = "0p68kwcwccmqn58dx1vyy4k1sc9zk2n2l8hiligik6zpbv4vmkdz";
+       libraryHaskellDepends = [
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
+       ];
+       description = "Haskell binding for Gremlin graph query language - core data types and tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-websocket" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -100385,6 +100602,8 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -105002,23 +105221,6 @@ self: {
      }:
      mkDerivation {
        pname = "happy";
-       version = "1.19.10";
-       sha256 = "1vfaa8x6asmyabmd4i1ygyl2a8501h97xhkx3ip3jnqhjxn61sr2";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "happy_1_19_11" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, mtl, process
-     }:
-     mkDerivation {
-       pname = "happy";
        version = "1.19.11";
        sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h";
        isLibrary = false;
@@ -105028,7 +105230,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy-meta" = callPackage
@@ -106746,7 +106947,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
-  "haskell-gi_0_22_1" = callPackage
+  "haskell-gi_0_22_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobject-introspection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -106754,8 +106955,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.22.1";
-       sha256 = "0bjwbfsai1mpkca670qzfl9f59bz4b0k14asifadhg5g9sandgqr";
+       version = "0.22.4";
+       sha256 = "0ay9q7a3bmjif4dpp0dnqxxrdz1d9zq1a7la6298w89bkyhlmaf5";
        libraryHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath
          haskell-gi-base mtl pretty-show process regex-tdfa safe semigroups
@@ -106780,12 +106981,12 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_22_0" = callPackage
+  "haskell-gi-base_0_22_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.22.0";
-       sha256 = "03lihqjy46igja2vzw7avhx635iww5v97wj12n5yhqhqqh5j50aq";
+       version = "0.22.2";
+       sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -106982,33 +107183,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_13_0_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, directory, filepath, hashable, haskell-lsp-types
-     , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec
-     , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list
-     , stm, temporary, text, time, transformers, unordered-containers
-     , vector
+  "haskell-lsp_0_14_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hashable
+     , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+     , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+     , sorted-list, stm, temporary, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.13.0.0";
-       sha256 = "0mxmgw32j9fzr63qj1pviszcd2fb3mqdxnhz6ghv83lgj5j8517c";
-       revision = "1";
-       editedCabalFile = "0qni50rymq7qx95i6jcj3mb49zxc123ciyyih82vvm15gks62fp2";
+       version = "0.14.0.0";
+       sha256 = "15dnvsfyj18rac9kn7hgi1v7zb26qyy28qykh2bdnzyzvd9rzy94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring containers data-default directory
-         filepath hashable haskell-lsp-types hslogger lens mtl network-uri
-         parsec rope-utf16-splay sorted-list stm temporary text time
+         aeson async attoparsec base bytestring containers data-default
+         directory filepath hashable haskell-lsp-types hslogger lens mtl
+         network-uri rope-utf16-splay sorted-list stm temporary text time
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hslogger lens mtl network-uri parsec rope-utf16-splay stm text time
-         transformers unordered-containers vector
-       ];
        testHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hashable hspec lens network-uri QuickCheck quickcheck-instances
@@ -107061,17 +107254,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_13_0_0" = callPackage
+  "haskell-lsp-types_0_14_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
      , filepath, hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.13.0.0";
-       sha256 = "18np1n5qvy5020vzvvcpj431fn4dbnd3zgzqngfnhv604yymywx8";
-       revision = "2";
-       editedCabalFile = "02yh8lkxbr7pzr97n5w2waz9cr1fisb8c0k16ajibhj57y3dn8il";
+       version = "0.14.0.1";
+       sha256 = "1zrgv1wp8b1vb3adp6l1xz0clig2g2s62icvpwi86cbip1i76fl4";
        libraryHaskellDepends = [
          aeson base bytestring data-default deepseq filepath hashable lens
          network-uri scientific text unordered-containers
@@ -109146,12 +109337,12 @@ self: {
      , haskoin-node, hspec, hspec-discover, http-types, monad-logger
      , mtl, network, nqe, optparse-applicative, random, resourcet
      , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
-     , time, transformers, unliftio, unordered-containers
+     , time, transformers, unliftio, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.16.2";
-       sha256 = "1dwb6vmrfj0yjhav7l8axvqmgdadcpj8z7ma8sqpvi7842yapd77";
+       version = "0.16.4";
+       sha256 = "08kgm2r9kr15gn2mpbjg6bi64pawz8lrav5565zg4lp5k530vwf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109159,21 +109350,21 @@ self: {
          hashable haskoin-core haskoin-node http-types monad-logger mtl
          network nqe random resourcet rocksdb-haskell rocksdb-query scotty
          string-conversions text time transformers unliftio
-         unordered-containers
+         unordered-containers uuid
        ];
        executableHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          filepath hashable haskoin-core haskoin-node http-types monad-logger
          mtl network nqe optparse-applicative random resourcet
          rocksdb-haskell rocksdb-query scotty string-conversions text time
-         transformers unliftio unordered-containers
+         transformers unliftio unordered-containers uuid
        ];
        testHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          hashable haskoin-core haskoin-node hspec http-types monad-logger
          mtl network nqe random resourcet rocksdb-haskell rocksdb-query
          scotty string-conversions text time transformers unliftio
-         unordered-containers
+         unordered-containers uuid
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -110138,6 +110329,8 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-dynamic-statements" = callPackage
@@ -110935,6 +111128,8 @@ self: {
        ];
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxr-th" = callPackage
@@ -112089,8 +112284,8 @@ self: {
      }:
      mkDerivation {
        pname = "heatitup";
-       version = "0.5.3.3";
-       sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+       version = "0.5.4.0";
+       sha256 = "07qwsmk2hszm2q7ky4avmpwmd2j4xqprid7kvcrhh1s6d9f8nbz2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112117,8 +112312,8 @@ self: {
      }:
      mkDerivation {
        pname = "heatitup-complete";
-       version = "0.5.3.3";
-       sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+       version = "0.5.4.0";
+       sha256 = "0zxyxwvpj0mkz10y4rf793cpxmd0bmlz3d4p8c0icgainacs6dsg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112358,20 +112553,23 @@ self: {
      }) {};
 
   "hedgehog-classes" = callPackage
-    ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show
-     , semirings, transformers, wl-pprint-annotated
+    ({ mkDerivation, aeson, base, binary, containers, hedgehog
+     , pretty-show, semirings, silently, transformers
+     , wl-pprint-annotated
      }:
      mkDerivation {
        pname = "hedgehog-classes";
-       version = "0.1.2";
-       sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv";
+       version = "0.2.1";
+       sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq";
        libraryHaskellDepends = [
-         aeson base containers hedgehog pretty-show semirings transformers
-         wl-pprint-annotated
+         aeson base binary containers hedgehog pretty-show semirings
+         silently transformers wl-pprint-annotated
        ];
-       testHaskellDepends = [ aeson base containers hedgehog ];
+       testHaskellDepends = [ aeson base binary containers hedgehog ];
        description = "Hedgehog will eat your typeclass bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -114655,6 +114853,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hi-file-parser" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }:
+     mkDerivation {
+       pname = "hi-file-parser";
+       version = "0.1.0.0";
+       sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l";
+       revision = "1";
+       editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23";
+       libraryHaskellDepends = [ base binary bytestring rio vector ];
+       testHaskellDepends = [ base binary bytestring hspec rio vector ];
+       description = "Parser for GHC's hi files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hi3status" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre
      , network, prefix-units, process, regex-pcre-builtin, text, time
@@ -114952,8 +115164,8 @@ self: {
      }:
      mkDerivation {
        pname = "higgledy";
-       version = "0.2.0.1";
-       sha256 = "1rbx7f3gkby3jx772p63z02hf61xa5amaqm76ba2lfd24s62g228";
+       version = "0.2.1.0";
+       sha256 = "087p68h4sjjbmjszh48ayidmnvgvhg4k2fnw27z28p37xdp4ys21";
        libraryHaskellDepends = [ barbies base generic-lens QuickCheck ];
        testHaskellDepends = [
          barbies base doctest hspec lens QuickCheck
@@ -116231,6 +116443,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hkgr" = callPackage
+    ({ mkDerivation, base, directory, filepath, simple-cmd
+     , simple-cmd-args
+     }:
+     mkDerivation {
+       pname = "hkgr";
+       version = "0.0";
+       sha256 = "1qd4xccgmhh6lhx5bl9fbw6ii4469qfln2bh0rqlxvyhpk94rad0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath simple-cmd simple-cmd-args
+       ];
+       description = "Simple Hackage release workflow for package maintainers";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hkt" = callPackage
     ({ mkDerivation, base, hspec, inspection-testing, protolude, text
      }:
@@ -116749,10 +116980,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.22";
-       sha256 = "0v4kqpbvpsmgsl7jrkcbxjl4mrr7wx3qxh4rn3715dfn6rlqxblz";
-       revision = "1";
-       editedCabalFile = "0x1dpinkm4kw0x5d7wj0bb4fkccfnsifnbhc7n1g7gn012z00wd9";
+       version = "2.1.24";
+       sha256 = "0x8qyg8g7l6rx7l2gccf9pydkfh0wd3cxak1vrg7kqsx2hmd2s06";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -117074,6 +117303,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gsl;};
 
+  "hmatrix-gsl-stats_0_4_1_8" = callPackage
+    ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
+     , vector
+     }:
+     mkDerivation {
+       pname = "hmatrix-gsl-stats";
+       version = "0.4.1.8";
+       sha256 = "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q";
+       libraryHaskellDepends = [
+         base binary hmatrix storable-complex vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
+       description = "GSL Statistics interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl;};
+
   "hmatrix-mmap" = callPackage
     ({ mkDerivation, base, hmatrix, mmap }:
      mkDerivation {
@@ -120025,6 +120271,29 @@ self: {
        broken = true;
      }) {};
 
+  "hprox" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
+     , case-insensitive, conduit, conduit-extra, http-client
+     , http-reverse-proxy, http-types, optparse-applicative, tls, unix
+     , wai, wai-extra, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "hprox";
+       version = "0.1.0.2";
+       sha256 = "0ajyv9zmi6nr8add7admfxavd691g3rvyy8ll6gra6hhpn0lwp0m";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base base64-bytestring binary bytestring case-insensitive
+         conduit conduit-extra http-client http-reverse-proxy http-types
+         optparse-applicative tls unix wai wai-extra warp warp-tls
+       ];
+       description = "a lightweight HTTP proxy server, and more";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hps" = callPackage
     ({ mkDerivation, base, filepath, hcg-minus, process }:
      mkDerivation {
@@ -120282,6 +120551,8 @@ self: {
        testHaskellDepends = [ base process tasty tasty-hunit ];
        description = "File size in human readable format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hricket" = callPackage
@@ -122340,6 +122611,20 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsemail_2_1_0" = callPackage
+    ({ mkDerivation, base, hspec, mtl, parsec, time }:
+     mkDerivation {
+       pname = "hsemail";
+       version = "2.1.0";
+       sha256 = "1m6x2lzjfs31pl4c0jz8xbhdcs13p5fxf58yymcahhw4aqmx12x6";
+       libraryHaskellDepends = [ base mtl parsec time ];
+       testHaskellDepends = [ base hspec parsec time ];
+       description = "Parsec parsers for the RFC2822 Internet Message format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hsemail-ns" = callPackage
     ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }:
      mkDerivation {
@@ -122886,8 +123171,6 @@ self: {
        testHaskellDepends = [ base hslua tasty tasty-hunit text ];
        description = "Lua module wrapper around Haskell's System module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -126006,31 +126289,14 @@ self: {
      }:
      mkDerivation {
        pname = "http-directory";
-       version = "0.1.2";
-       sha256 = "0p6m2xlgrs9sgn2nsn85z6gawa9509lxbsw44kdfxya3gcgyg2rp";
-       libraryHaskellDepends = [
-         base bytestring html-conduit http-client http-client-tls http-date
-         http-types text time xml-conduit
-       ];
-       description = "http directory listing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-directory_0_1_3" = callPackage
-    ({ mkDerivation, base, bytestring, html-conduit, http-client
-     , http-client-tls, http-date, http-types, text, time, xml-conduit
-     }:
-     mkDerivation {
-       pname = "http-directory";
-       version = "0.1.3";
-       sha256 = "0z73qa8hccjk0njajsa7i9704p4ml2wl5kkmf53lpr0bgvh3v1zk";
+       version = "0.1.4";
+       sha256 = "0cs42s38kg4334j345balxl6bkqx12n5d7arsxbh9l4wg8rlca3g";
        libraryHaskellDepends = [
          base bytestring html-conduit http-client http-client-tls http-date
          http-types text time xml-conduit
        ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-dispatch" = callPackage
@@ -126052,6 +126318,34 @@ self: {
        broken = true;
      }) {};
 
+  "http-download" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, conduit
+     , conduit-extra, cryptonite, cryptonite-conduit, directory
+     , exceptions, filepath, hspec, hspec-discover, http-client
+     , http-conduit, http-types, memory, path, path-io, retry, rio
+     , rio-prettyprint
+     }:
+     mkDerivation {
+       pname = "http-download";
+       version = "0.1.0.0";
+       sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb";
+       revision = "2";
+       editedCabalFile = "0aprl9vnc0i96qbdyjlw5v30aq91nbv65yxd71jca8vbkij3v7iv";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit conduit-extra cryptonite
+         cryptonite-conduit directory exceptions filepath http-client
+         http-conduit http-types memory path path-io retry rio
+         rio-prettyprint
+       ];
+       testHaskellDepends = [
+         base cryptonite hspec hspec-discover http-client path path-io retry
+         rio rio-prettyprint
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Verified downloads with retries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-encodings" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
      , text, utf8-string, zlib
@@ -126506,6 +126800,8 @@ self: {
        ];
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-test" = callPackage
@@ -126861,6 +127157,8 @@ self: {
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hubris" = callPackage
@@ -127528,6 +127826,35 @@ self: {
        broken = true;
      }) {};
 
+  "hw-balancedparens_0_2_2_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-excess, hw-fingertree
+     , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.2.2.0";
+       sha256 = "105s6slx9h3rx6r6iqp4c4mjpp674h4fss7p40bvv18mgxki9pzz";
+       libraryHaskellDepends = [
+         base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
+         hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim
+         hw-rankselect-base transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base criterion hedgehog hw-bits hw-prim vector
+       ];
+       doHaddock = false;
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
@@ -127537,6 +127864,8 @@ self: {
        pname = "hw-bits";
        version = "0.7.0.6";
        sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm";
+       revision = "1";
+       editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -127715,6 +128044,42 @@ self: {
        broken = true;
      }) {};
 
+  "hw-eliasfano_0_1_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim
+     , hw-rankselect, hw-rankselect-base, lens, mmap
+     , optparse-applicative, vector
+     }:
+     mkDerivation {
+       pname = "hw-eliasfano";
+       version = "0.1.1.0";
+       sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       executableHaskellDepends = [
+         base binary bytestring generic-lens hw-packed-vector lens
+         optparse-applicative vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int
+         hw-packed-vector hw-prim vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hedgehog hspec hw-bits hw-hedgehog
+         hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
+       ];
+       description = "Elias-Fano";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-excess" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
@@ -127741,21 +128106,49 @@ self: {
        broken = true;
      }) {};
 
+  "hw-excess_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
+     , hw-rankselect-base, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.2.2.0";
+       sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hw-prim vector
+       ];
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-fingertree" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover
-     , hw-hspec-hedgehog
+     , hw-hspec-hedgehog, hw-prim
      }:
      mkDerivation {
        pname = "hw-fingertree";
-       version = "0.1.0.3";
-       sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv";
-       libraryHaskellDepends = [ base deepseq ];
+       version = "0.1.1.0";
+       sha256 = "096lj6bhyk3pyal3jnif8cm6yprir1kpr5cvjl576kbfhyxdnhmy";
+       libraryHaskellDepends = [ base deepseq hw-prim ];
        testHaskellDepends = [
          base deepseq hedgehog hspec hw-hspec-hedgehog
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -127856,21 +128249,31 @@ self: {
        broken = true;
      }) {};
 
-  "hw-ip_2_3_1_0" = callPackage
-    ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
-     , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
+  "hw-ip_2_3_1_1" = callPackage
+    ({ mkDerivation, appar, base, binary, bytestring, containers
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "2.3.1.0";
-       sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363";
+       version = "2.3.1.1";
+       sha256 = "15y5zbbyh0fkz5b8gv027irjpimmcx5fzilhaai83hcnnv0kbamf";
+       revision = "1";
+       editedCabalFile = "0h56lr70p90xzw9qx2d91rynn6iywhdnd725bjx208pg6mz4ia86";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          appar base containers generic-lens hw-bits iproute text
        ];
+       executableHaskellDepends = [
+         appar base binary bytestring generic-lens lens optparse-applicative
+         text
+       ];
        testHaskellDepends = [
          appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
          text
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127926,6 +128329,8 @@ self: {
        pname = "hw-json";
        version = "1.0.0.2";
        sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js";
+       revision = "1";
+       editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128139,22 +128544,30 @@ self: {
        broken = true;
      }) {};
 
-  "hw-parser" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }:
+  "hw-packed-vector_0_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim
+     , vector
+     }:
      mkDerivation {
-       pname = "hw-parser";
-       version = "0.1.0.0";
-       sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x";
+       pname = "hw-packed-vector";
+       version = "0.0.0.2";
+       sha256 = "1a4avk679l8c1a0hc3ziy508b8y94afr16av64cfldgbc904qr8y";
        libraryHaskellDepends = [
-         attoparsec base bytestring hw-prim text
+         base bytestring deepseq hw-bits hw-prim vector
        ];
-       description = "Simple parser support";
+       testHaskellDepends = [
+         base bytestring hedgehog hspec hw-bits hw-hedgehog
+         hw-hspec-hedgehog hw-prim vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
-  "hw-parser_0_1_0_1" = callPackage
+  "hw-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, hw-prim, text
      }:
@@ -128162,6 +128575,8 @@ self: {
        pname = "hw-parser";
        version = "0.1.0.1";
        sha256 = "0df3238y4ld9j9w4p1x4lcv13lip9cf3fqn88z98xqjqmfzjdffn";
+       revision = "1";
+       editedCabalFile = "1nf0s726vr90dggcjxp1qz1msnvckjj908rsc4f991524gz4ygh7";
        libraryHaskellDepends = [
          attoparsec base bytestring hw-prim text
        ];
@@ -128180,10 +128595,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.24";
-       sha256 = "17bm69hva7cb6pf8qx4w027bckhgcci4mrqlfpf0vkbbzg3vm3wf";
-       revision = "1";
-       editedCabalFile = "0cb3d4i765jhxwmmak84v1qzlbiggm5n1awr2djfsd2nr4q6xqbi";
+       version = "0.6.2.25";
+       sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers vector
        ];
@@ -128201,15 +128614,15 @@ self: {
        broken = true;
      }) {};
 
-  "hw-prim_0_6_2_25" = callPackage
+  "hw-prim_0_6_2_26" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , mmap, QuickCheck, semigroups, transformers, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.25";
-       sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs";
+       version = "0.6.2.26";
+       sha256 = "1bim58jvvf68cxvjpy1d8zqcry4jicns9a2rzk4xdr8p2xi3h2xj";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers vector
        ];
@@ -128295,6 +128708,8 @@ self: {
        pname = "hw-rankselect";
        version = "0.13.0.0";
        sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv";
+       revision = "1";
+       editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128329,6 +128744,8 @@ self: {
        pname = "hw-rankselect-base";
        version = "0.3.2.1";
        sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj";
+       revision = "1";
+       editedCabalFile = "1sx2ibjz7anhiir76ycf7bmm0s16adn7l705clck0fk53dz3h8ds";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -128453,6 +128870,8 @@ self: {
        pname = "hw-uri";
        version = "0.0.0.1";
        sha256 = "11cibgdyk4r1ad6hamb81ffcf27yar9w8045533f2sr6vfnhrj6m";
+       revision = "1";
+       editedCabalFile = "0lmga3mr4ww59mv1nv2gj8gf00q7fnylgm4fjqk98kk1y98zi0in";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base
          bytestring directory exceptions filepath http-client http-types
@@ -131292,38 +131711,43 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, atom-conduit, base, base-noprelude
+    ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary
      , blaze-html, blaze-markup, bytestring, case-insensitive, conduit
-     , connection, containers, directory, dyre, fast-logger, filepath
+     , connection, containers, dhall, directory, fast-logger, filepath
      , hashable, HaskellNet, HaskellNet-SSL, http-client
      , http-client-tls, http-types, microlens, mime-mail, monad-time
-     , monoid-subclasses, mtl, network, opml-conduit
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , refined, relude, rss-conduit, safe-exceptions, stm
-     , streaming-bytestring, streaming-with, streamly, text, time
-     , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit
-     , xml-types
+     , network, opml-conduit, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, refined, relude, rss-conduit
+     , safe-exceptions, stm, stm-chans, streaming-bytestring
+     , streaming-with, text, time, timerep, tls, typed-process
+     , uri-bytestring, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "imm";
-       version = "1.5.0.0";
-       sha256 = "005idmw68z28pfj8q6x6al809w5hd83m0jykg5m8m1xy9fv1plja";
+       version = "1.6.1.0";
+       sha256 = "1fgf2q19n6qhyl0yvl63lpqv6sciv148y0izhj3jmww3ak6pg4sy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson atom-conduit base-noprelude blaze-html blaze-markup
-         bytestring case-insensitive conduit connection containers directory
-         dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types microlens mime-mail
-         monad-time monoid-subclasses mtl network opml-conduit
+         aeson async atom-conduit base-noprelude binary conduit containers
+         dhall directory filepath hashable http-types microlens monad-time
+         prettyprinter prettyprinter-ansi-terminal refined relude
+         rss-conduit safe-exceptions text time timerep tls uri-bytestring
+         xml-conduit xml-types
+       ];
+       executableHaskellDepends = [
+         aeson async atom-conduit base-noprelude blaze-html blaze-markup
+         bytestring case-insensitive conduit connection containers dhall
+         directory fast-logger filepath HaskellNet HaskellNet-SSL
+         http-client http-client-tls mime-mail network opml-conduit
          optparse-applicative prettyprinter prettyprinter-ansi-terminal
-         refined relude rss-conduit safe-exceptions stm streaming-bytestring
-         streaming-with streamly text time timerep tls transformers-base
-         uri-bytestring xml xml-conduit xml-types
+         refined relude rss-conduit safe-exceptions stm stm-chans
+         streaming-bytestring streaming-with text time typed-process
+         uri-bytestring xml-conduit xml-types
        ];
-       executableHaskellDepends = [ base ];
-       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
-       license = stdenv.lib.licenses.publicDomain;
+       description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
+       license = stdenv.lib.licenses.cc0;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -131816,6 +132240,20 @@ self: {
        broken = true;
      }) {};
 
+  "indent" = callPackage
+    ({ mkDerivation, base, containers, optparse-applicative, text }:
+     mkDerivation {
+       pname = "indent";
+       version = "0.0.5";
+       sha256 = "0xqvdns8rqdfqw872rcmnbiwnms8dkdp15vkczcypsxic1bliv5w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers text ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       description = "Fix your indentation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "indentation" = callPackage
     ({ mkDerivation, base, indentation-core, indentation-parsec
      , indentation-trifecta, mtl, parsec, parsers, trifecta
@@ -132690,31 +133128,14 @@ self: {
      }:
      mkDerivation {
        pname = "inspection-testing";
-       version = "0.4.1.2";
-       sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_4_2" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.4.2";
-       sha256 = "0ikngy54i53aa1w48mxl1a8i9gavr1bagwi7h4s79x0dr65yikxg";
+       version = "0.4.2.1";
+       sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd";
        libraryHaskellDepends = [
          base containers ghc mtl template-haskell transformers
        ];
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -134098,8 +134519,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip_1_5_0" = callPackage
@@ -134131,7 +134550,6 @@ self: {
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -134483,8 +134901,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.6";
-       sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1";
+       version = "1.1.0.7";
+       sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -134513,8 +134931,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-conduit";
-       version = "0.3.0.2";
-       sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5";
+       version = "0.3.0.3";
+       sha256 = "1wbgczkiwnbpcwwcpsv9zf8n7nisv0iv2kivpjrxnhin2j4c48y1";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls profunctors text time tls transformers
@@ -144429,6 +144847,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-regex-pcre" = callPackage
+    ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "lens-regex-pcre";
+       version = "0.3.0.0";
+       sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs";
+       libraryHaskellDepends = [
+         base lens pcre-heavy pcre-light template-haskell text
+       ];
+       testHaskellDepends = [
+         base hspec lens pcre-heavy pcre-light template-haskell text
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
      , lens-family-th, mtl, transformers
@@ -145884,6 +146319,20 @@ self: {
        broken = true;
      }) {};
 
+  "lie" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lie";
+       version = "0.1.0.0";
+       sha256 = "1kvy0zsgwq2kgdbiz7z88q9d3ldhb9z9fb057x7mnhli7b3hd8fh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       description = "Lie Algebras";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
      mkDerivation {
@@ -146381,6 +146830,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "line-drawing" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "line-drawing";
+       version = "0.1.0.0";
+       sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "raster line drawing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "line-size" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -146622,8 +147085,8 @@ self: {
        pname = "linearmap-category";
        version = "0.3.5.0";
        sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
-       revision = "1";
-       editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw";
+       revision = "2";
+       editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg";
        libraryHaskellDepends = [
          base call-stack constrained-categories containers
          free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -148375,6 +148838,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "load-env_0_2_1_0" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec, parsec
+     , temporary
+     }:
+     mkDerivation {
+       pname = "load-env";
+       version = "0.2.1.0";
+       sha256 = "184l0km1i6rfliq9nsj9p67ynsx6nlq466hf056lbgmrzvx6vv73";
+       libraryHaskellDepends = [ base directory filepath parsec ];
+       testHaskellDepends = [
+         base directory doctest hspec parsec temporary
+       ];
+       description = "Load environment variables from a file";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "load-font" = callPackage
     ({ mkDerivation, base, c2hs, Cabal }:
      mkDerivation {
@@ -149921,8 +150401,8 @@ self: {
        broken = true;
      }) {};
 
-  "lsp-test_0_5_2_3" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+  "lsp-test_0_5_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
      , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
      , parser-combinators, process, rope-utf16-splay, text, transformers
@@ -149930,10 +150410,10 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.2.3";
-       sha256 = "1l4fdmqm6mvjpyz8imnf5q52pcls0jg5fqsxhkmj7ywnam66xfrk";
+       version = "0.5.4.0";
+       sha256 = "028nvfdchc73klwd3wm14bxzdrfvk5f5axbizz4gqijb0v1mha6p";
        libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring conduit
+         aeson aeson-pretty ansi-terminal async base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
          haskell-lsp lens mtl parser-combinators process rope-utf16-splay
          text transformers unix unordered-containers
@@ -151294,8 +151774,8 @@ self: {
      }:
      mkDerivation {
        pname = "mail-pool";
-       version = "2.0.0";
-       sha256 = "06z1g21flxi0cpy84sdvg3pjfzrf5sjpp3rm9dni58gdj0lhg4f3";
+       version = "2.1.0";
+       sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152104,8 +152584,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.5.0.2";
-       sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g";
+       version = "0.5.0.3";
+       sha256 = "12k5h3r6wnqjy5vzia3hypwjrh953cc5n912k1rfdwm4m4pznq03";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -152127,8 +152607,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.5.0.2";
-       sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb";
+       version = "0.5.0.3";
+       sha256 = "16g0xfs99xcccyngknplgmargz4y4ncfw0wjm7sinjcrfd7js9fb";
        libraryHaskellDepends = [
          array base binary call-stack comonad constrained-categories
          containers deepseq free free-vector-spaces ieee754 lens linear
@@ -152151,8 +152631,8 @@ self: {
     ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.5.0.2";
-       sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954";
+       version = "0.5.0.3";
+       sha256 = "1r459qjbdqygxplv06bnqrysfl0xvmx5i7jkwgah1blpmipr4nwz";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
@@ -152745,8 +153225,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.2.8.0";
-       sha256 = "01z57p6byvrrbl9hhr1jq90kpb823kjfbq0inhvmjjbcnbngqrf3";
+       version = "0.2.8.1";
+       sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq ghc-prim primitive
          vector
@@ -154146,6 +154626,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mega-sdist_0_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp
+     , path, path-io, rio, rio-orphans, yaml
+     }:
+     mkDerivation {
+       pname = "mega-sdist";
+       version = "0.4.0.0";
+       sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring optparse-simple pantry-tmp path path-io rio
+         rio-orphans yaml
+       ];
+       description = "Handles uploading to Hackage from mega repos";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "megaparsec_6_5_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-discover, hspec-expectations
@@ -155778,8 +156277,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.4.4";
-       sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd";
+       version = "3.4.5";
+       sha256 = "18a8az9qj1jldrpya72r3h303awhl5ny4xidkjzxgj3r6xz3ffz4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157645,6 +158144,8 @@ self: {
        ];
        description = "These as a transformer, ChronicleT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-classes" = callPackage
@@ -159549,6 +160050,8 @@ self: {
        pname = "more-containers";
        version = "0.1.2.0";
        sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj";
+       revision = "1";
+       editedCabalFile = "1q6svybm9lgyrhvp3frky59dd0zqj42884cb3zcdd0cwrlc6795l";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "A few more collections";
@@ -159611,39 +160114,46 @@ self: {
 
   "morley" = callPackage
     ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
-     , base16-bytestring, base58-bytestring, bifunctors, bytestring
-     , containers, cryptonite, data-default, directory, filepath, fmt
-     , formatting, hex-text, hspec, hspec-golden-aeson, HUnit, lens
-     , megaparsec, memory, morley-prelude, mtl, named
-     , optparse-applicative, parser-combinators, pretty-simple
+     , base16-bytestring, base58-bytestring, binary, bytestring
+     , constraints, containers, cryptonite, data-default, directory
+     , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text
+     , hspec, hspec-expectations, HUnit, lens, megaparsec, memory
+     , morley-prelude, mtl, named, optparse-applicative
+     , parser-combinators, pretty-simple, qm-interpolated-string
      , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
-     , singletons, text, time, timerep, transformers-compat, universum
-     , vinyl, wl-pprint-text
+     , singletons, syb, tasty, tasty-ant-xml, tasty-discover
+     , tasty-hspec, tasty-quickcheck, template-haskell, text, time
+     , timerep, transformers-compat, vector, vinyl, wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "0.2.0.1";
-       sha256 = "1mkc3hfhm9isnw2m2zvdpmjcxw8fh2s7gzcp5r532spy2pv82wiz";
+       version = "0.3.0.1";
+       sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-options aeson-pretty base-noprelude base16-bytestring
-         base58-bytestring bifunctors bytestring containers cryptonite
-         data-default directory fmt formatting hex-text hspec lens
-         megaparsec memory morley-prelude mtl named parser-combinators
-         QuickCheck singletons text time timerep transformers-compat vinyl
+         base58-bytestring binary bytestring constraints containers
+         cryptonite data-default filepath fmt formatting ghc-prim hex-text
+         hspec lens megaparsec memory morley-prelude mtl named
+         parser-combinators QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons syb tasty tasty-ant-xml
+         template-haskell text time timerep transformers-compat vector vinyl
          wl-pprint-text
        ];
        executableHaskellDepends = [
-         base-noprelude fmt megaparsec morley-prelude named
-         optparse-applicative pretty-simple text
+         base-noprelude data-default directory filepath fmt megaparsec
+         morley-prelude named optparse-applicative pretty-simple text
        ];
        testHaskellDepends = [
-         aeson base-noprelude containers directory filepath fmt formatting
-         hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude
-         QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time
-         universum vinyl
+         aeson base-noprelude bytestring containers data-default directory
+         filepath fmt formatting generic-arbitrary hex-text hspec
+         hspec-expectations HUnit lens megaparsec morley-prelude mtl
+         qm-interpolated-string QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons syb tasty tasty-hspec
+         tasty-quickcheck text
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.agpl3Plus;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159654,8 +160164,8 @@ self: {
     ({ mkDerivation, base-noprelude, universum }:
      mkDerivation {
        pname = "morley-prelude";
-       version = "0.1.0.4";
-       sha256 = "0k96m27ix80awh6cg7qncps6nn2gd0yr423b5gc22rw4ayqsdlr1";
+       version = "0.2.0.1";
+       sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2";
        libraryHaskellDepends = [ base-noprelude universum ];
        description = "A custom prelude used in Morley";
        license = stdenv.lib.licenses.agpl3Plus;
@@ -159894,6 +160404,8 @@ self: {
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -159913,6 +160425,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -159930,6 +160444,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -160299,8 +160815,8 @@ self: {
      }:
      mkDerivation {
        pname = "ms-tds";
-       version = "0.1.0.1";
-       sha256 = "0mgn7a1h15bd69n2hngmvz8dr7ksvxx8d1c4jdqsbd12j6230w3z";
+       version = "0.1.0.2";
+       sha256 = "002im2x8wsypjnqm1s8l663gadb8km8fk8a6az0jn41ddljmcvwk";
        libraryHaskellDepends = [
          array base binary bytestring data-default-class mtl network text
          time tls uuid-types x509-store x509-system
@@ -160439,8 +160955,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.1.0.2";
-       sha256 = "0k0ijffl4xq5jb12gnwpnpc4r6cd64r1a344mqwybqaymjyblm66";
+       version = "0.1.0.3";
+       sha256 = "0x058v58silxchxyjck1g68npfwkckkkzlvgxx31r0iy929ccq75";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds network text time tls
        ];
@@ -162616,8 +163132,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple-typed";
-       version = "0.1.1.3";
-       sha256 = "1gfj7s9rxp8n0fws8x6f94z3mi7kysa0vscvm6hky9awq83avbv4";
+       version = "0.1.2.0";
+       sha256 = "160pyhcazmg3qnqsvzl05gc4xrm0cd1s622zv4z8n9z2w7xqh5qa";
        libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
@@ -164797,12 +165313,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network-byte-order_0_1_0_0" = callPackage
+  "network-byte-order_0_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, doctest }:
      mkDerivation {
        pname = "network-byte-order";
-       version = "0.1.0.0";
-       sha256 = "064b7p1kfvn0s1c07wckxr2jfmf235x01pd2xxf24j551ac2knn8";
+       version = "0.1.1.0";
+       sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
@@ -165282,10 +165798,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-simple";
-       version = "0.4.3";
-       sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
-       revision = "2";
-       editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn";
+       version = "0.4.4";
+       sha256 = "0mzgpa3mwc98w35klgwgqli5j6fdz4sz6h8lniapqakrfwi7hvh2";
        libraryHaskellDepends = [
          base bytestring network safe-exceptions socks transformers
        ];
@@ -165293,6 +165807,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, network, network-bsd
+     , safe-exceptions, socks, transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.5";
+       sha256 = "17hpgcwrsx2h8lrb2wwzy0anp33mn80dnwcgnqmb8prajwjvz807";
+       libraryHaskellDepends = [
+         base bytestring network network-bsd safe-exceptions socks
+         transformers
+       ];
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -167046,20 +167577,20 @@ self: {
        broken = true;
      }) {};
 
-  "nonempty-containers_0_2_0_0" = callPackage
-    ({ mkDerivation, base, comonad, containers, data-or, deepseq
-     , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text
+  "nonempty-containers_0_3_1_0" = callPackage
+    ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+     , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
      }:
      mkDerivation {
        pname = "nonempty-containers";
-       version = "0.2.0.0";
-       sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw";
+       version = "0.3.1.0";
+       sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l";
        libraryHaskellDepends = [
-         base comonad containers data-or deepseq semigroupoids
+         base comonad containers deepseq semigroupoids these
        ];
        testHaskellDepends = [
-         base comonad containers data-or hedgehog hedgehog-fn semigroupoids
-         tasty tasty-hedgehog text
+         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;
@@ -167294,17 +167825,17 @@ self: {
      }) {};
 
   "notmuch" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch
-     , profunctors, tagged, talloc, text, time
+    ({ mkDerivation, base, bytestring, c2hs, deepseq, filepath, mtl
+     , notmuch, profunctors, tagged, talloc, text, time
      }:
      mkDerivation {
        pname = "notmuch";
-       version = "0.2.0.0";
-       sha256 = "1w3g4747q02m0r0n8l5bkfp8icwwnvkp4bf9amkh7h80vidzmspy";
+       version = "0.3.0.0";
+       sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring deepseq mtl profunctors tagged text time
+         base bytestring deepseq filepath mtl profunctors tagged text time
        ];
        librarySystemDepends = [ notmuch talloc ];
        libraryToolDepends = [ c2hs ];
@@ -167524,6 +168055,8 @@ self: {
        testHaskellDepends = [ base containers hspec pretty ];
        description = "A tiny statically typed functional programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nthable" = callPackage
@@ -171829,34 +172362,30 @@ self: {
      }) {};
 
   "pads-haskell" = callPackage
-    ({ mkDerivation, base, byteorder, bytestring, Cabal, containers
-     , directory, Glob, haskell-src, haskell-src-meta, HUnit
-     , mainland-pretty, mtl, normaldistribution, old-locale, parsec
+    ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim
+     , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec
      , QuickCheck, random, regex-posix, syb, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , th-lift, time, transformers
      }:
      mkDerivation {
        pname = "pads-haskell";
-       version = "0.0.0.1";
-       sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a";
-       revision = "1";
-       editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6";
+       version = "0.1.0.0";
+       sha256 = "0c4by0amwp5kki7h46pygd6p6f5yx0zzlbzcfhd68h5ka0alkfdf";
        libraryHaskellDepends = [
-         base byteorder bytestring containers Glob haskell-src
-         haskell-src-meta HUnit mainland-pretty normaldistribution
-         old-locale parsec random regex-posix syb template-haskell th-lift
-         time transformers
+         base byteorder bytestring containers ghc-prim haskell-src-meta
+         HUnit mainland-pretty mtl mwc-random parsec random regex-posix syb
+         template-haskell th-lift time transformers
        ];
        testHaskellDepends = [
-         base byteorder bytestring Cabal containers directory Glob
-         haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale
-         parsec QuickCheck regex-posix syb template-haskell test-framework
+         base byteorder bytestring containers ghc-prim haskell-src-meta
+         HUnit mainland-pretty mtl mwc-random parsec QuickCheck random
+         regex-posix syb template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 th-lift time
          transformers
        ];
        description = "PADS data description language for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -172145,26 +172674,24 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_7_2" = callPackage
+  "pandoc_2_7_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, cmark-gfm, containers, criterion, data-default
      , deepseq, Diff, directory, doctemplates, exceptions
      , executable-path, filepath, Glob, haddock-library, hslua
-     , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls
-     , http-types, ipynb, JuicyPixels, mtl, network, network-uri
-     , pandoc-types, parsec, process, QuickCheck, random, safe
-     , scientific, SHA, skylighting, split, syb, tagsoup, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath
-     , text, time, unicode-transforms, unix, unordered-containers
-     , vector, weigh, xml, zip-archive, zlib
+     , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client
+     , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network
+     , network-uri, pandoc-types, parsec, process, QuickCheck, random
+     , safe, scientific, SHA, skylighting, split, syb, tagsoup, tasty
+     , tasty-golden, tasty-hunit, tasty-lua, tasty-quickcheck, temporary
+     , texmath, text, time, unicode-transforms, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.7.2";
-       sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010";
-       revision = "3";
-       editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc";
+       version = "2.7.3";
+       sha256 = "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -172173,19 +172700,19 @@ self: {
          aeson aeson-pretty attoparsec base base64-bytestring binary
          blaze-html blaze-markup bytestring case-insensitive cmark-gfm
          containers data-default deepseq directory doctemplates exceptions
-         filepath Glob haddock-library hslua hslua-module-text HsYAML HTTP
-         http-client http-client-tls http-types ipynb JuicyPixels mtl
-         network network-uri pandoc-types parsec process random safe
-         scientific SHA skylighting split syb tagsoup temporary texmath text
-         time unicode-transforms unix unordered-containers vector xml
-         zip-archive zlib
+         filepath Glob haddock-library hslua hslua-module-system
+         hslua-module-text HsYAML HTTP http-client http-client-tls
+         http-types ipynb JuicyPixels mtl network network-uri pandoc-types
+         parsec process random safe scientific SHA skylighting split syb
+         tagsoup temporary texmath text time unicode-transforms unix
+         unordered-containers vector xml zip-archive zlib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base base64-bytestring bytestring containers Diff directory
          executable-path filepath Glob hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
-         xml zip-archive
+         tasty tasty-golden tasty-hunit tasty-lua tasty-quickcheck temporary
+         text time xml zip-archive
        ];
        benchmarkHaskellDepends = [
          base bytestring containers criterion mtl text time weigh
@@ -172815,6 +173342,60 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pantry-tmp" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
+     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
+     , containers, contravariant, cryptonite, cryptonite-conduit
+     , deepseq, digest, directory, exceptions, filelock, filepath
+     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
+     , hpack, hspec, http-client, http-client-tls, http-conduit
+     , http-download, http-types, integer-gmp, memory, mono-traversable
+     , mtl, network, network-uri, path, path-io, persistent
+     , persistent-sqlite, persistent-template, primitive, QuickCheck
+     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+     , safe, syb, tar-conduit, template-haskell, text, text-metrics
+     , th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, yaml, zip-archive
+     }:
+     mkDerivation {
+       pname = "pantry-tmp";
+       version = "0.1.0.0";
+       sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn";
+       revision = "2";
+       editedCabalFile = "1zz8cpl55dlfgyhn3g89l1y4hppc3g92y3410i1ahmzcs5pfzmpc";
+       libraryHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory filelock
+         filepath generic-deriving ghc-prim hackage-security hashable hpack
+         http-client http-client-tls http-conduit http-download http-types
+         integer-gmp memory mono-traversable mtl network network-uri path
+         path-io persistent persistent-sqlite persistent-template primitive
+         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
+         template-haskell text text-metrics th-lift th-lift-instances
+         th-orphans th-reify-many th-utilities time transformers unix-compat
+         unliftio unordered-containers vector yaml zip-archive
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory exceptions
+         filelock filepath generic-deriving ghc-prim hackage-security
+         hashable hedgehog hpack hspec http-client http-client-tls
+         http-conduit http-download http-types integer-gmp memory
+         mono-traversable mtl network network-uri path path-io persistent
+         persistent-sqlite persistent-template primitive QuickCheck
+         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
+         tar-conduit template-haskell text text-metrics th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unix-compat unliftio unordered-containers vector yaml
+         zip-archive
+       ];
+       description = "Content addressable Haskell package management";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "papa" = callPackage
     ({ mkDerivation, base, papa-base, papa-base-export
      , papa-base-implement, papa-bifunctors, papa-bifunctors-export
@@ -173553,6 +174134,8 @@ self: {
        pname = "paripari";
        version = "0.6.0.0";
        sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511";
+       revision = "2";
+       editedCabalFile = "074z7wrb1p4c8wxwmqv3nxs6kp835r9pxmmnspqaajj0rag70ny3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173893,6 +174476,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parser-combinators_1_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "1.1.0";
+       sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc";
+       libraryHaskellDepends = [ base ];
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parser-combinators-tests" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
      , hspec-megaparsec, megaparsec, megaparsec-tests
@@ -173900,10 +174495,8 @@ self: {
      }:
      mkDerivation {
        pname = "parser-combinators-tests";
-       version = "1.0.3";
-       sha256 = "0xnmf5sfr9qg2jdcvgjsfvv5b8rd4z06vgk75lsbrwv019srpamm";
-       revision = "1";
-       editedCabalFile = "08hns8ycdlvqvi0il8077c4mbzf2npvaglzd89979wqpki8jm7l2";
+       version = "1.1.0";
+       sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz";
        isLibrary = false;
        isExecutable = false;
        testHaskellDepends = [
@@ -175571,6 +176164,8 @@ self: {
        pname = "pencil";
        version = "1.0.1";
        sha256 = "0a1lb0dclv6p6qkd6nd3zp665n6spkv10yd1i2m67rrqabg802cl";
+       revision = "1";
+       editedCabalFile = "012afvs4wghdw7adz0hw01pmi8ai89r8jhpykdwfyf4ignbrfpvq";
        libraryHaskellDepends = [
          base data-default directory edit-distance filepath hashable hsass
          mtl pandoc parsec semigroups text time unordered-containers vector
@@ -178163,31 +178758,6 @@ self: {
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.3.9";
-       sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
-       revision = "2";
-       editedCabalFile = "0pw4i3pdg3i98a9mbps0ycgb70vf4p7dqv08xf365iy4dzdm3a1i";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl semigroups transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_10" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
        version = "4.3.10";
        sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2";
        libraryHaskellDepends = [
@@ -178202,7 +178772,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -179508,17 +180077,17 @@ self: {
      }) {};
 
   "pkgtreediff" = callPackage
-    ({ mkDerivation, async, base, directory, filepath, http-directory
-     , simple-cmd, simple-cmd-args, text
+    ({ mkDerivation, async, base, directory, filepath, Glob
+     , http-directory, simple-cmd, simple-cmd-args, text
      }:
      mkDerivation {
        pname = "pkgtreediff";
-       version = "0.2.1";
-       sha256 = "0m9jslk08dg7gy8bx6vzabrasgmvqycgqrsirxxrqmj8xbrj5hpw";
+       version = "0.3";
+       sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         async base directory filepath http-directory simple-cmd
+         async base directory filepath Glob http-directory simple-cmd
          simple-cmd-args text
        ];
        description = "Package tree diff tool";
@@ -180187,6 +180756,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -180843,8 +181414,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "0.3.0.0";
-       sha256 = "00jm95sv685xj8j11k93r0qbgwz4v6dqdzasawg7f1xp3rjfcsvn";
+       version = "0.4.0.0";
+       sha256 = "151l2x73fwyvk77r35bf57xjbygdqwk0n83qcx9krlij5ljyrl83";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-abstraction
          transformers
@@ -180859,26 +181430,30 @@ self: {
        ];
        description = "Higher-order, low-boilerplate, zero-cost free monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-plugin" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec
      , inspection-testing, polysemy, should-not-typecheck, syb
      , transformers
      }:
      mkDerivation {
        pname = "polysemy-plugin";
-       version = "0.2.0.1";
-       sha256 = "1w8hzsl9ms1h20nd44kwxl30sxq5ny7jbymi91f9na1lajpm2drc";
+       version = "0.2.0.3";
+       sha256 = "1svd5fa4fqp5l3ibzxzv8ym2s54k2mwzglvr4s65kw5ny9w9v9qq";
        libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra polysemy syb transformers
+         base containers ghc ghc-tcplugins-extra polysemy syb transformers
        ];
        testHaskellDepends = [
-         base ghc ghc-tcplugins-extra hspec inspection-testing polysemy
-         should-not-typecheck syb transformers
+         base containers ghc ghc-tcplugins-extra hspec inspection-testing
+         polysemy should-not-typecheck syb transformers
        ];
        description = "Disambiguate obvious uses of effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -180888,8 +181463,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-zoo";
-       version = "0.1.2.0";
-       sha256 = "1pcq3krsfzbv5b9v85p6rmiqlbap7zpcwffkn5spryd9f41k8rw8";
+       version = "0.1.2.1";
+       sha256 = "0wy70sx6nq7imqjsgs8i344qv6vmxv07bjrzjvzg97fms0kk9jlk";
        libraryHaskellDepends = [
          base constraints containers mtl polysemy polysemy-plugin random
          random-fu random-source reflection
@@ -180900,6 +181475,8 @@ self: {
        ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyseq" = callPackage
@@ -181371,12 +181948,12 @@ self: {
      }) {};
 
   "porter" = callPackage
-    ({ mkDerivation, haskell2010 }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "porter";
-       version = "0.1";
-       sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
-       libraryHaskellDepends = [ haskell2010 ];
+       version = "0.1.0.2";
+       sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q";
+       libraryHaskellDepends = [ base ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186377,19 +186954,17 @@ self: {
   "psqueues" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
+     , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
      }:
      mkDerivation {
        pname = "psqueues";
-       version = "0.2.7.1";
-       sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4";
-       revision = "1";
-       editedCabalFile = "0336d9ckixv4n23vy5l3xk0wavfn3z9xk105gig0zv70b3jh3r3y";
+       version = "0.2.7.2";
+       sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6";
        libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
        testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
+         tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq fingertree-psqueue ghc-prim
@@ -190011,25 +190586,6 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.3.1";
-       sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
-       revision = "1";
-       editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4";
-       libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
-       benchmarkHaskellDepends = [
-         async base bytestring criterion cryptonite entropy ghc-prim
-         mwc-random pcg-random primitive random
-       ];
-       description = "Efficient generation of random bytestrings";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "random-bytestring_0_1_3_2" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, cryptonite
-     , entropy, ghc-prim, mwc-random, pcg-random, primitive, random
-     }:
-     mkDerivation {
-       pname = "random-bytestring";
        version = "0.1.3.2";
        sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
@@ -190039,7 +190595,6 @@ self: {
        ];
        description = "Efficient generation of random bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-class" = callPackage
@@ -194092,8 +194647,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.5.2";
-       sha256 = "1spvc9y985820f945zvp822w8bxrrmny7rwcfy94nky4mv5gk4i0";
+       version = "0.1.6.0";
+       sha256 = "142d71n52s9j27nwm8if930j3psx41k2jh8lwsphp1lsd1m653cg";
        libraryHaskellDepends = [
          base containers exceptions hashable mmorph mtl protolude resourcet
          semigroupoids semigroups template-haskell text transformers-base
@@ -194112,7 +194667,7 @@ self: {
        broken = true;
      }) {};
 
-  "registry_0_1_5_4" = callPackage
+  "registry_0_1_6_1" = callPackage
     ({ mkDerivation, async, base, containers, exceptions, generic-lens
      , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl
      , multimap, protolude, random, resourcet, semigroupoids, semigroups
@@ -194121,8 +194676,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.5.4";
-       sha256 = "1rz6grjgcahgpkbm19ipm93w8nzip3swj0vcd53vn73gv21kii79";
+       version = "0.1.6.1";
+       sha256 = "05wqgy0lbvab7iykzj8xw4winkv0pi1dqbgbybi35dirapp153qi";
        libraryHaskellDepends = [
          base containers exceptions hashable mmorph mtl protolude resourcet
          semigroupoids semigroups template-haskell text transformers-base
@@ -194149,8 +194704,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.0.2";
-       sha256 = "19yffjqdggic25vfwn33hpc34jn4dsg655bl542mnrl2h4fkgd2x";
+       version = "0.2.0.3";
+       sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -196524,6 +197079,8 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -196793,8 +197350,8 @@ self: {
      }:
      mkDerivation {
        pname = "rg";
-       version = "1.2.0.0";
-       sha256 = "0vwrwbhi61lqzvj9zr5j2akypfm095b208zlmdilsi6yb84qbqxc";
+       version = "1.4.0.0";
+       sha256 = "1cnh3pmq80vziwr2rnz2zinlhak5abrkcpcrrs6x6jz0aq9npnj7";
        libraryHaskellDepends = [
          array base fmt possibly text unordered-containers vector
        ];
@@ -197257,6 +197814,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio-prettyprint" = callPackage
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+     , base, Cabal, colour, mtl, path, rio, text
+     }:
+     mkDerivation {
+       pname = "rio-prettyprint";
+       version = "0.1.0.0";
+       sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m";
+       revision = "1";
+       editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag";
+       libraryHaskellDepends = [
+         aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl
+         path rio text
+       ];
+       description = "Pretty-printing for RIO";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "riot" = callPackage
     ({ mkDerivation, base, containers, directory, haskell98, mtl
      , ncurses, old-locale, packedstring, process, unix
@@ -200622,6 +201197,34 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "sbp_2_6_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base
+     , base64-bytestring, basic-prelude, binary, binary-conduit
+     , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754
+     , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit
+     , template-haskell, text, time, yaml
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "2.6.3";
+       sha256 = "03d2wa73lg5l417c39di742x5x00bjjbqp7wkyr2vkpy04ilqvii";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring basic-prelude binary bytestring
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base basic-prelude binary-conduit bytestring
+         cmdargs conduit conduit-extra resourcet time yaml
+       ];
+       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbp2udp" = callPackage
     ({ mkDerivation, base, basic-prelude, binary, binary-conduit
      , bytestring, conduit, conduit-extra, network, optparse-generic
@@ -200669,7 +201272,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_8_2" = callPackage
+  "sbv_8_3" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, deepseq, directory, doctest, filepath, generic-deriving
      , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
@@ -200678,10 +201281,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.2";
-       sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q";
-       revision = "1";
-       editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv";
+       version = "8.3";
+       sha256 = "0d2ph3wr6qga3x43w7xlrvdr63zzsx4x3xn8p7l994b6i7d6rdzd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum deepseq directory filepath
@@ -202203,6 +202804,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+     , SDL2, StateVar, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.5.0.0";
+       sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       testHaskellDepends = [ base deepseq linear vector weigh ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, sdl2 }:
      mkDerivation {
@@ -202828,6 +203451,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring selda text ];
        description = "JSON support for the Selda database library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -203111,6 +203736,8 @@ self: {
        ];
        description = "Align and Zip type-classes from the common Semialign ancestor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semialign-indexed" = callPackage
@@ -203127,6 +203754,8 @@ self: {
        ];
        description = "SemialignWithIndex, i.e. izip and ialign";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semibounded-lattices" = callPackage
@@ -205397,31 +206026,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.7";
-       sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4";
-       libraryHaskellDepends = [
-         base containers directory formatting lens servant servant-foreign
-         text time wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base containers directory formatting hspec http-api-data lens
-         servant servant-foreign text time wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers directory formatting http-api-data lens
-         servant servant-foreign shelly text time wl-pprint-text
-       ];
-       description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-kotlin_0_1_1_8" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, formatting
-     , hspec, http-api-data, lens, servant, servant-foreign, shelly
-     , text, time, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-kotlin";
        version = "0.1.1.8";
        sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r";
        libraryHaskellDepends = [
@@ -205438,7 +206042,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -205946,6 +206549,8 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -206419,6 +207024,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_3_4_3_22_2" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+     , servant-server, servant-swagger-ui-core, swagger2, text
+     }:
+     mkDerivation {
+       pname = "servant-swagger-ui";
+       version = "0.3.4.3.22.2";
+       sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm";
+       libraryHaskellDepends = [
+         base bytestring file-embed-lzma servant servant-server
+         servant-swagger-ui-core swagger2 text
+       ];
+       description = "Servant swagger ui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger-ui-core" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, http-media
      , servant, servant-blaze, servant-server, swagger2, text
@@ -206926,6 +207548,8 @@ self: {
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -208909,8 +209533,8 @@ self: {
      }:
      mkDerivation {
        pname = "shower";
-       version = "0.2";
-       sha256 = "0jxsv08w7cmlkr820f2m9qbx00m2h6h3hp6lrng7iz03i89gwpf2";
+       version = "0.2.0.1";
+       sha256 = "13qxddl6v3kcfgyr5q281hrr4xkflnc3nafbs3jq0w5k6njn7djb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base megaparsec pretty ];
@@ -209410,6 +210034,17 @@ self: {
        broken = true;
      }) {};
 
+  "simple-cabal" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "simple-cabal";
+       version = "0.0.0";
+       sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "Cabal file wrapper library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-cmd" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -210149,6 +210784,25 @@ self: {
        broken = true;
      }) {};
 
+  "simple-vec3_0_6" = callPackage
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+     , QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "simple-vec3";
+       version = "0.6";
+       sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh";
+       libraryHaskellDepends = [ base QuickCheck vector ];
+       testHaskellDepends = [
+         base doctest doctest-driver-gen tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Three-dimensional vectors of doubles with basic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "simple-zipper" = callPackage
     ({ mkDerivation, base, hspec, lens }:
      mkDerivation {
@@ -211043,7 +211697,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_1" = callPackage
+  "skylighting_0_8_1_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -211052,8 +211706,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.1";
-       sha256 = "02damyql5v7kf69ai74cwnkbyjr217gc0n4a1yf9nkiaxk7gbmnm";
+       version = "0.8.1.1";
+       sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211099,7 +211753,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_1" = callPackage
+  "skylighting-core_0_8_1_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -211109,8 +211763,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.1";
-       sha256 = "189w4fg428zpsqjj7bahmhnm2lchhkf8m2qw9ys7zh2ggb563cdb";
+       version = "0.8.1.1";
+       sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214952,8 +215606,8 @@ self: {
        pname = "spatial-rotations";
        version = "0.1.0.1";
        sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
-       revision = "1";
-       editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c";
+       revision = "2";
+       editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4";
        libraryHaskellDepends = [
          base linear manifolds-core vector-space
        ];
@@ -216601,30 +217255,32 @@ self: {
      }) {};
 
   "stack" = callPackage
-    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
-     , attoparsec, base, base64-bytestring, bindings-uname, bytestring
-     , Cabal, conduit, conduit-extra, containers, cryptonite
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+     , async, attoparsec, base, base64-bytestring, bytestring, Cabal
+     , colour, conduit, conduit-extra, containers, cryptonite
      , cryptonite-conduit, deepseq, directory, echo, exceptions, extra
      , file-embed, filelock, filepath, fsnotify, generic-deriving
-     , hackage-security, hashable, hpack, hpc, hspec, http-client
-     , http-client-tls, http-conduit, http-types, memory, microlens
-     , mintty, monad-logger, mono-traversable, mtl, mustache
-     , neat-interpolation, network-uri, open-browser
-     , optparse-applicative, path, path-io, persistent
+     , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec
+     , http-client, http-client-tls, http-conduit, http-download
+     , http-types, memory, microlens, mintty, mono-traversable, mtl
+     , mustache, neat-interpolation, network-uri, open-browser
+     , optparse-applicative, pantry-tmp, path, path-io, persistent
      , persistent-sqlite, persistent-template, pretty, primitive
-     , process, project-template, QuickCheck, regex-applicative-text
-     , resourcet, retry, rio, semigroups, smallcheck, split, stm, store
-     , store-core, streaming-commons, tar, template-haskell, temporary
-     , text, text-metrics, th-reify-many, time, tls, transformers
-     , typed-process, unicode-transforms, unix, unix-compat, unliftio
-     , unordered-containers, vector, yaml, zip-archive, zlib
+     , process, project-template, QuickCheck, raw-strings-qq
+     , regex-applicative-text, resource-pool, resourcet, retry, rio
+     , rio-prettyprint, semigroups, smallcheck, split, stm
+     , streaming-commons, tar, template-haskell, temporary
+     , terminal-size, text, text-metrics, th-reify-many, time, tls
+     , transformers, typed-process, unicode-transforms, unix
+     , unix-compat, unliftio, unordered-containers, vector, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.9.3.1";
-       sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj";
-       revision = "2";
-       editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj";
+       version = "2.1.1.1";
+       sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2";
+       revision = "1";
+       editedCabalFile = "1wn8lh8qxzj9rqvv1584gqz6rq33nkn1944ry7kpfsvwjl40vhkc";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -216633,55 +217289,58 @@ self: {
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         http-client http-client-tls http-conduit http-download http-types
+         memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template regex-applicative-text
-         resourcet retry rio semigroups split stm store store-core
-         streaming-commons tar template-haskell temporary text text-metrics
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         regex-applicative-text resource-pool resourcet retry rio
+         rio-prettyprint semigroups split stm streaming-commons tar
+         template-haskell temporary terminal-size text text-metrics
          th-reify-many time tls transformers typed-process
          unicode-transforms unix unix-compat unliftio unordered-containers
          vector yaml zip-archive zlib
        ];
        executableHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         http-client http-client-tls http-conduit http-download http-types
+         memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template regex-applicative-text
-         resourcet retry rio semigroups split stm store store-core
-         streaming-commons tar template-haskell temporary text text-metrics
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         regex-applicative-text resource-pool resourcet retry rio
+         rio-prettyprint semigroups split stm streaming-commons tar
+         template-haskell temporary terminal-size text text-metrics
          th-reify-many time tls transformers typed-process
          unicode-transforms unix unix-compat unliftio unordered-containers
          vector yaml zip-archive zlib
        ];
        testHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc hspec
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         hspec http-client http-client-tls http-conduit http-download
+         http-types memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template QuickCheck
-         regex-applicative-text resourcet retry rio semigroups smallcheck
-         split stm store store-core streaming-commons tar template-haskell
-         temporary text text-metrics th-reify-many time tls transformers
-         typed-process unicode-transforms unix unix-compat unliftio
-         unordered-containers vector yaml zip-archive zlib
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         QuickCheck raw-strings-qq regex-applicative-text resource-pool
+         resourcet retry rio rio-prettyprint semigroups smallcheck split stm
+         streaming-commons tar template-haskell temporary terminal-size text
+         text-metrics th-reify-many time tls transformers typed-process
+         unicode-transforms unix unix-compat unliftio unordered-containers
+         vector yaml zip-archive zlib
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -216716,8 +217375,6 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -216744,8 +217401,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -216761,8 +217416,6 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -216804,8 +217457,6 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -216824,8 +217475,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -216845,8 +217494,6 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -216874,8 +217521,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -216908,8 +217553,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -216944,8 +217587,6 @@ self: {
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack2nix" = callPackage
@@ -216990,8 +217631,6 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -217016,8 +217655,6 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -217038,8 +217675,6 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -217061,8 +217696,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -217107,8 +217740,6 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -217157,8 +217788,6 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -217182,8 +217811,6 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -217204,8 +217831,6 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -217229,8 +217854,6 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -217254,8 +217877,6 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -217275,8 +217896,6 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -217313,8 +217932,6 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -217345,8 +217962,6 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stacked-dag" = callPackage
@@ -219485,28 +220100,6 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.2.1.0";
-       sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
-       libraryHaskellDepends = [
-         array async base bytestring directory network process random stm
-         text transformers unix zlib
-       ];
-       testHaskellDepends = [
-         array async base bytestring deepseq hspec network QuickCheck text
-         unix zlib
-       ];
-       benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_2_1_1" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, deepseq, directory
-     , gauge, hspec, network, process, QuickCheck, random, stm, text
-     , transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
        version = "0.2.1.1";
        sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52";
        libraryHaskellDepends = [
@@ -219520,7 +220113,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -220592,6 +221184,8 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -221039,6 +221633,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_9_2_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , file-embed, filepath, haskell-src-exts, HUnit, mtl
+     , optparse-applicative, semigroups, strict, syb, test-framework
+     , test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.9.2.2";
+       sha256 = "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts mtl semigroups syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts mtl optparse-applicative strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylized" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -224296,6 +224920,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged-identity_0_1_3" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "tagged-identity";
+       version = "0.1.3";
+       sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c";
+       libraryHaskellDepends = [ base mtl transformers ];
+       description = "Trivial monad transformer that allows identical monad stacks have different types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-list" = callPackage
     ({ mkDerivation, AbortT-transformers, base, binary, natural-number
      , type-equality, type-level-natural-number
@@ -225140,15 +225776,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_1_2_2" = callPackage
+  "tasty_1_2_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      , wcwidth
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.2.2";
-       sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih";
+       version = "1.2.3";
+       sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix wcwidth
@@ -225561,8 +226197,6 @@ self: {
        ];
        description = "Write tests in Lua, integrate into tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-program" = callPackage
@@ -228258,6 +228892,8 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -228697,6 +229333,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -229091,6 +229729,17 @@ self: {
        broken = true;
      }) {};
 
+  "th-bang-compat" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-bang-compat";
+       version = "0.0.1.0";
+       sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "Compatibility for bang-type template";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-build" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -229814,6 +230463,8 @@ self: {
        libraryHaskellDepends = [ base base-compat lens these ];
        description = "Lenses for These";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "these-skinny" = callPackage
@@ -231978,8 +232629,8 @@ self: {
     ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
      mkDerivation {
        pname = "tls-session-manager";
-       version = "0.0.0.2";
-       sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
+       version = "0.0.1.0";
+       sha256 = "1hv3bmv0xxcc6fb1p383ivw2gfihiwhwclrsghyhqmrnjvlqqhf3";
        libraryHaskellDepends = [ auto-update base clock psqueues tls ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
@@ -232690,8 +233341,8 @@ self: {
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.1.6.1";
-       sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x";
+       version = "0.1.7.0";
+       sha256 = "0pn5lssfznaw4l9q9c22rg1cz666bkcal4phjn298hh54swvzxdx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233164,8 +233815,8 @@ self: {
      }:
      mkDerivation {
        pname = "tptp";
-       version = "0.1.0.2";
-       sha256 = "0v9qh2kxdfl8g05s7wxknq3c02mzfrjka85j73576si79n06v9jq";
+       version = "0.1.0.3";
+       sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi";
        libraryHaskellDepends = [
          attoparsec base prettyprinter scientific text
        ];
@@ -233265,6 +233916,29 @@ self: {
        broken = true;
      }) {};
 
+  "tracing" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, hspec, http-client, ip, mtl
+     , network, random, stm, text, time, transformers, unliftio
+     }:
+     mkDerivation {
+       pname = "tracing";
+       version = "0.0.4.0";
+       sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive containers
+         http-client ip mtl network random stm text time transformers
+         unliftio
+       ];
+       testHaskellDepends = [
+         base containers hspec mtl stm text unliftio
+       ];
+       description = "Distributed tracing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tracker" = callPackage
     ({ mkDerivation, base, containers, glib }:
      mkDerivation {
@@ -233742,15 +234416,15 @@ self: {
 
   "transient" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , directory, mtl, random, stm, time, transformers
+     , directory, mtl, primitive, random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.6.0.1";
-       sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy";
+       version = "0.6.3";
+       sha256 = "02zy60hilgagxa08j7bvd35wkpap5dzffc5af258hxiy0gdpdw0a";
        libraryHaskellDepends = [
-         atomic-primops base bytestring containers directory mtl random stm
-         time transformers
+         atomic-primops base bytestring containers directory mtl primitive
+         random stm time transformers
        ];
        testHaskellDepends = [
          atomic-primops base bytestring containers directory mtl random stm
@@ -234154,6 +234828,159 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tree-sitter" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , fused-effects, hedgehog, hspec, split, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "tree-sitter";
+       version = "0.1.0.0";
+       sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath fused-effects hedgehog
+         split template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       description = "Unstable bindings for the tree-sitter parsing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-go" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-go";
+       version = "0.1.0.0";
+       sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Go";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-haskell" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-haskell";
+       version = "0.1.0.0";
+       sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-java" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-java";
+       version = "0.1.0.0";
+       sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Java";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-json" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-json";
+       version = "0.1.0.0";
+       sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-php" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-php";
+       version = "0.1.0.0";
+       sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for PHP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-python" = callPackage
+    ({ mkDerivation, aeson, base, directory, filepath, template-haskell
+     , tree-sitter
+     }:
+     mkDerivation {
+       pname = "tree-sitter-python";
+       version = "0.1.0.1";
+       sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base directory filepath template-haskell tree-sitter
+       ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Python";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-ruby" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-ruby";
+       version = "0.1.0.0";
+       sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Ruby";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-tsx" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-tsx";
+       version = "0.1.0.0";
+       sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for TSX";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-typescript" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-typescript";
+       version = "0.1.0.0";
+       sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for TypeScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tree-traversals" = callPackage
     ({ mkDerivation, base, containers, doctest, mtl }:
      mkDerivation {
@@ -236737,10 +237564,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-process";
-       version = "0.2.4.0";
-       sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr";
-       revision = "1";
-       editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1";
+       version = "0.2.4.1";
+       sha256 = "0akmgrsvdr2ywq1asf3ra6nngxsdihn5mw1chvyxmw44i5l330rm";
        libraryHaskellDepends = [
          async base bytestring process stm transformers
        ];
@@ -237350,8 +238175,8 @@ self: {
        pname = "ucam-webauth";
        version = "0.1.0.0";
        sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
-       revision = "3";
-       editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw";
+       revision = "4";
+       editedCabalFile = "1pdlj36ny2rm3sabpknhlw02s5y5r1ng77cvq3l350cv7k946i2f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers cryptonite errors
          http-api-data http-types microlens microlens-mtl mtl
@@ -238252,6 +239077,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_3_6" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath
+     , gauge, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.3.6";
+       sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       benchmarkHaskellDepends = [
+         base deepseq filepath gauge optparse-applicative path path-io text
+       ];
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, data-default, directory
      , filepath, text, twitch
@@ -239069,6 +239917,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unix-time_0_4_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover
+     , old-locale, old-time, QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "unix-time";
+       version = "0.4.6";
+       sha256 = "0cjxjbd3qgqhyfyw3r9g7vyvmli4apl2za6fzb8ym37jgaanl9q4";
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
+         base bytestring hspec old-locale old-time QuickCheck time
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Unix time parser/formatter and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unjson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, invariant, pretty, primitive, scientific
@@ -239124,8 +239990,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.10";
-       sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l";
+       version = "0.2.11";
+       sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
@@ -243670,8 +244536,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.4.0";
-       sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22";
+       version = "1.3.0.0";
+       sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk";
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -243834,8 +244700,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.1.7";
-       sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53";
+       version = "3.1.8";
+       sha256 = "0yxhiba6yywv9yps8pal9l41wh8wi3bfhr1sm0mnvsirps4rk39y";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra containers
@@ -243948,30 +244814,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2.6";
-       sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base base-unicode-symbols bytestring case-insensitive
-         http-types mtl transformers wai
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols directory filepath http-types network
-         process tasty tasty-hunit text wai wai-extra wai-websockets warp
-         websockets
-       ];
-       description = "CORS for WAI";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-cors_0_2_7" = callPackage
-    ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
-     , case-insensitive, directory, filepath, http-types, mtl, network
-     , process, tasty, tasty-hunit, text, transformers, wai, wai-extra
-     , wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "wai-cors";
        version = "0.2.7";
        sha256 = "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5";
        enableSeparateDataOutput = true;
@@ -243986,7 +244828,6 @@ self: {
        ];
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-devel" = callPackage
@@ -244408,6 +245249,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_5" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.5";
+       sha256 = "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp
@@ -246530,8 +247389,8 @@ self: {
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.1.0.2";
-       sha256 = "1yndypl1x5pcxhc1mp2midbidbzvgvjy3s7h076lxpra1dvi6h7r";
+       version = "0.1.1";
+       sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb";
        libraryHaskellDepends = [
          aeson base binary bytestring fast-logger formatting http-api-data
          http-types monad-logger protolude resourcet text unliftio
@@ -246652,7 +247511,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "webdriver_0_9" = callPackage
+  "webdriver_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, call-stack, data-default-class, directory
      , directory-tree, exceptions, filepath, http-client, http-types
@@ -246662,8 +247521,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.9";
-       sha256 = "0m3ga11bysg86n6x3106k0g4v90bnx0dvghixvzm8mhk32l38jbq";
+       version = "0.9.0.1";
+       sha256 = "1w6z95swrz5ijmcxh0x3i521kpxqfp6pxgqfqwix7fc4jy450n8k";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring call-stack
          data-default-class directory directory-tree exceptions filepath
@@ -247244,6 +248103,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weekdaze" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , cryptohash, data-default, deepseq, directory, extra, factory
+     , filepath, hxt, mtl, parallel, QuickCheck, random, time, toolshed
+     , unix, xhtml
+     }:
+     mkDerivation {
+       pname = "weekdaze";
+       version = "0.0.0.1";
+       sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base bytestring Cabal containers cryptohash data-default
+         deepseq extra factory filepath hxt mtl random toolshed xhtml
+       ];
+       executableHaskellDepends = [
+         array base Cabal containers cryptohash data-default deepseq
+         directory extra factory filepath hxt mtl parallel random time
+         toolshed unix xhtml
+       ];
+       testHaskellDepends = [
+         array base Cabal containers factory mtl QuickCheck toolshed
+       ];
+       description = "A school-timetable problem-solver";
+       license = "GPL";
+     }) {};
+
   "weigh" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
      mkDerivation {
@@ -248473,6 +249361,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wordify" = callPackage
+    ({ mkDerivation, array, base, containers, directory, errors
+     , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe
+     , semigroups, split, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "wordify";
+       version = "0.1.0.0";
+       sha256 = "1iw3sk8sspscl29chnvd69g8l7pfz7vlpj9vyai8fkwipmc3jrwv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers errors listsafe mtl parsec random safe
+         semigroups split transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base containers errors listsafe mtl parsec random safe
+         semigroups split transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         array base containers directory errors filepath HUnit listsafe mtl
+         parsec QuickCheck random safe semigroups split test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+         unordered-containers
+       ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "wordlist" = callPackage
     ({ mkDerivation, base, MonadRandom, optparse-applicative, text
      , vector
@@ -249442,6 +250361,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_14" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.14";
+       sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -250326,6 +251260,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xls_0_1_2" = callPackage
+    ({ mkDerivation, base, conduit, filepath, getopt-generics
+     , resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "xls";
+       version = "0.1.2";
+       sha256 = "0gpfc973g6ha9w3fqm9dy59kgl21hw20l2b444rrz0lxs9ix1wyp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit filepath resourcet transformers
+       ];
+       executableHaskellDepends = [
+         base conduit getopt-generics resourcet transformers
+       ];
+       testHaskellDepends = [ base ];
+       description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsior" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, bytestring
      , conduit, conduit-extra, data-default, exceptions, mtl, resourcet
@@ -256185,6 +257141,8 @@ self: {
        pname = "yx";
        version = "0.0.2.0";
        sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
+       revision = "1";
+       editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring hspec ];
        description = "Row-major coordinates";
@@ -256248,6 +257206,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gomp = null; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage
diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
deleted file mode 100644
index 1e9ac5aa66a4..000000000000
--- a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal
-index 0e8923a..bfbbec4 100644
---- a/insert-ordered-containers.cabal
-+++ b/insert-ordered-containers.cabal
-@@ -21,8 +21,8 @@ tested-with:
-   GHC==7.10.3,
-   GHC==8.0.1,
-   GHC==8.2.2,
--  GHC==8.4.3,
--  GHC==8.6.1
-+  GHC==8.4.4,
-+  GHC==8.6.3
- 
- extra-source-files:
-     CHANGELOG.md
-@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests
-     , unordered-containers
-     , base
-     , insert-ordered-containers
--    , tasty             >= 0.10.1.2 && <1.2
-+    , tasty             >= 0.10.1.2 && <1.3
-     , tasty-quickcheck  >= 0.8.3.2  && <0.11
-     , QuickCheck        >=2.7.6     && <2.13
-   default-language: Haskell2010
-
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
index 8c4e1561ec0a..60eb6c8a6a5e 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "21.3.7.1";
-  sha256 = "03vbp22vwra3zz76q3sjv23lmic60gi96a7dncry8whbfp4i4j8a";
+  version = "21.3.8.3";
+  sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix
index 9a6b2f99f4ae..a4a0b41210a4 100644
--- a/nixpkgs/pkgs/development/interpreters/php/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/default.nix
@@ -1,10 +1,10 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, flex, bison, autoconf
+{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
-, libzip, re2c, valgrind
+, libzip, valgrind
 }:
 
 with lib;
@@ -48,7 +48,7 @@ let
   , ftpSupport ? config.php.ftp or true
   , fpmSupport ? config.php.fpm or true
   , gmpSupport ? config.php.gmp or true
-  , ztsSupport ? config.php.zts or false
+  , ztsSupport ? (config.php.zts or false) || (apxs2Support)
   , calendarSupport ? config.php.calendar or true
   , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
   , tidySupport ? (config.php.tidy or false)
@@ -59,10 +59,8 @@ let
   , cliSupport ? config.php.cli or true
   , pharSupport ? config.php.phar or true
   , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
-  , re2cSupport ? config.php.re2c or true
-  , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport)
+  , cgotoSupport ? config.php.cgoto or false
   , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
-  , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2")
   }:
 
     let
@@ -76,8 +74,8 @@ let
 
       enableParallelBuilding = true;
 
-      nativeBuildInputs = [ pkgconfig autoconf ];
-      buildInputs = [ flex bison ]
+      nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
+      buildInputs = [ ]
         ++ optional (versionOlder version "7.3") pcre
         ++ optional (versionAtLeast version "7.3") pcre2
         ++ optional withSystemd systemd
@@ -108,7 +106,6 @@ let
         ++ optional tidySupport html-tidy
         ++ optional argon2Support libargon2
         ++ optional libzipSupport libzip
-        ++ optional re2cSupport re2c
         ++ optional valgrindSupport valgrind;
 
       CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -192,8 +189,7 @@ let
       ++ optional (!pharSupport) "--disable-phar"
       ++ optional xmlrpcSupport "--with-xmlrpc"
       ++ optional cgotoSupport "--enable-re2c-cgoto"
-      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
-      ++ optional valgrindPcreSupport "--with-pcre-valgrind";
+      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
 
       hardeningDisable = [ "bindnow" ];
 
diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix
index 947065997ec9..eff6ff626325 100644
--- a/nixpkgs/pkgs/development/libraries/babl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.62";
+  pname = "babl";
+  version = "0.1.66";
 
   src = fetchurl {
-    url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw";
+    url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
   };
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
index 88876f157cdb..bcdad510e10d 100644
--- a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
+++ b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
@@ -47,16 +47,3 @@ index a148321..96cafb8 100644
    set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
  	unset(CLANG_LIB CACHE)
  endmacro()
-diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-index 88985d7..01bca9e 100644
---- a/./CMakeLists.txt
-+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
-     "intel-beignet.icd.in"
-     "${ICD_FILE_NAME}"
-   )
--  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
-+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
- ELSE(OCLIcd_FOUND)
-   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
- ENDIF(OCLIcd_FOUND)
diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix
index ba6fc7cb541b..05ff5593205a 100644
--- a/nixpkgs/pkgs/development/libraries/beignet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchFromGitHub
 , cmake
 , pkgconfig
 , clang-unwrapped
@@ -19,11 +19,13 @@
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.3.2";
+  version = "unstable-2018.08.20";
 
-  src = fetchurl {
-    url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
+  src = fetchFromGitHub {
+    owner  = "intel";
+    repo   = "beignet";
+    rev    = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c";
+    sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h";
   };
 
   patches = [ ./clang_llvm.patch ];
@@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postPatch = ''
+    substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
     patchShebangs src/git_sha1.sh
   '';
 
@@ -101,8 +104,8 @@ stdenv.mkDerivation rec {
     homepage = https://cgit.freedesktop.org/beignet/;
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
-      The package provides an open source implementation of the OpenCL specification for Intel GPUs. 
-      It supports the Intel OpenCL runtime library and compiler. 
+      The package provides an open source implementation of the OpenCL specification for Intel GPUs.
+      It supports the Intel OpenCL runtime library and compiler.
     '';
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ artuuge zimbatm ];
diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix
index 6d85fe1233cf..60d0cc81d2bc 100644
--- a/nixpkgs/pkgs/development/libraries/dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.12.12";
-  sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm";
+  version = "1.12.14";
+  sha256 = "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";
diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix
index 50323846e980..e7e4835d2ed3 100644
--- a/nixpkgs/pkgs/development/libraries/faad2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix
@@ -12,6 +12,30 @@ stdenv.mkDerivation rec {
     sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
   };
 
+  patches = let
+    fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl {
+      url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}"
+          + "/debian/patches/${pname}.patch?inline=false";
+      inherit name sha256;
+    };
+  in [
+    (fp {
+      # critical bug addressed in vlc 3.0.7 (but we use system-provided faad)
+      pname = "0004-Fix-a-couple-buffer-overflows";
+      sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq";
+    })
+    (fp {
+      name = "CVE-2018-20362.patch";
+      pname = "0009-syntax.c-check-for-syntax-element-inconsistencies";
+      sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81";
+    })
+    (fp {
+      name = "CVE-2018-20194.patch";
+      pname = "0010-sbr_hfadj-sanitize-frequency-band-borders";
+      sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4";
+    })
+  ];
+
   configureFlags = []
     ++ optional drmSupport "--with-drm";
 
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
index aff5737432f5..4ea17e588a9b 100644
--- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
 , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
-, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }:
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     ./respect-xml-catalog-files-var.patch
     ./use-flatpak-from-path.patch
     ./unset-env-vars.patch
+    ./validate-icon-pixbuf.patch
   ];
 
   nativeBuildInputs = [
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
     bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
     libsoup lzma ostree polkit python3 systemd xorg.libXau
     gsettings-desktop-schemas glib-networking
+    librsvg # for flatpak-validate-icon
   ];
 
   checkInputs = [ valgrind ];
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
new file mode 100644
index 000000000000..5b8cc2d0383f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
@@ -0,0 +1,13 @@
+diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
+index 6e23d9f2..f0659a78 100644
+--- a/icon-validator/validate-icon.c
++++ b/icon-validator/validate-icon.c
+@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width,
+     add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL);
+   if (g_getenv ("G_MESSAGES_PREFIXED"))
+     add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
++  if (g_getenv ("GDK_PIXBUF_MODULE_FILE"))
++    add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);
+ 
+   add_args (args, validate_icon, arg_width, arg_height, filename, NULL);
+   g_ptr_array_add (args, NULL);
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix
index db4eee38b6e4..a2c7bdc5bde6 100644
--- a/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -46,7 +46,7 @@ let
   '';
 
   binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
-  version = "2.60.2";
+  version = "2.60.3";
 in
 
 stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1nc0iyday7866hq0hb78h7lxa44an998lzis8jhgvp8a0rsm9w9f";
+    sha256 = "1fb0nx9fcmic8rsh0fbp79lqpasfjxljvnshbw2hsya51mb0vaq4";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix
index 3d3275b041f1..a14c40e6d87e 100644
--- a/nixpkgs/pkgs/development/libraries/goffice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "goffice";
-  version = "0.10.44";
+  version = "0.10.45";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
+    sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 7c364c0fcdf5..a405633c1b8d 100644
--- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "2.3.1";
+  version = "2.5.1";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj";
+    url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
+    sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index 81e30d675d28..5866d6b8fedb 100644
--- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
 with stdenv.lib;
 
 let
-  version = "2.0.3";
+  version = "2.0.4";
   versmm = versions.major version + "." + versions.minor version;
   name = "hwloc-${version}";
 
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
-    sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3";
+    sha256 = "1aa7s208gdijk19vvzzahyl8pglk1va3yd6kdbpfa5pz5ms0ag35";
   };
 
   configureFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index 39d2c29b0127..2bc2bcb5b856 100644
--- a/nixpkgs/pkgs/development/libraries/libevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix
@@ -6,25 +6,13 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "libevent-${version}";
-  version = "2.1.8";
+  version = "2.1.10";
 
   src = fetchurl {
     url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
-    sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
+    sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
   };
 
-  #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
-      sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
-    })
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
-      sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
-    })
-  ];
-
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]
diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix
index 8ca3dd727545..916530220526 100644
--- a/nixpkgs/pkgs/development/libraries/libical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libical/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libical-${version}";
   version = "3.0.4";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "out" "dev" ]; #"devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libical";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl pkgconfig cmake ninja vala gobject-introspection
     (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
-    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
+# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
+#    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
   ];
   buildInputs = [ glib libxml2 icu ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
index c0fadfeb6798..5ec5b8e04dd0 100644
--- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.1.1a";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "0wlb0jrkccsdxlx90wx6ax5raqcm6y9c75dcgc6j6m6gdv7nnrjp";
+    sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
index f94af3498421..ad51ac8d6dbb 100644
--- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
-  name = "libnftnl-${version}";
+  version = "1.1.3";
+  pname = "libnftnl";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5";
+    url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
+    sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
index ac00920d054c..7e2443d31e92 100644
--- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-static"
-    "--enable-gtk-doc"
+#    "--enable-gtk-doc"
     "--enable-man"
     "--enable-valgrind-tests"
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix
index b1e426172538..71362fd7ef7b 100644
--- a/nixpkgs/pkgs/development/libraries/librime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librime/default.nix
@@ -2,14 +2,14 @@
   libyamlcpp, gmock }:
 
 stdenv.mkDerivation rec {
-  name = "librime-${version}";
-  version = "1.4.0";
+  pname = "librime";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
     rev = "${version}";
-    sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd";
+    sha256 = "10wvh1l4317yzcys4rzlkw42i6cj5p8g62r1xzyjw32ky2d0ndxl";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
index 51f779bca6bf..8c88abd2c441 100644
--- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.17";
+  name = "libsodium-1.0.18";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "1cf2d9v1gylz1qcy2zappbf526qfmph6gd6fnn3w2b347vixmhqc";
+    sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
index 0cc18d82720b..0cc1b0d08f9d 100644
--- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.10.2";
+  version = "0.11.0";
   name = "liburcu-${version}";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "1k31faqz9plx5dwxq8g1fnczxda1is4s1x4ph0gjrq3gmy6qixmk";
+    sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s";
   };
 
   checkInputs = [ perl ];
diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix
index 4564bab227bc..cce10a761d3f 100644
--- a/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "liburing-${version}";
-  version = "1.0.0pre132_${builtins.substring 0 7 src.rev}";
+  version = "1.0.0pre137_${builtins.substring 0 7 src.rev}";
 
   src = fetchgit {
     url    = "http://git.kernel.dk/liburing";
-    rev    = "f8865bc65feced660a3075175200a60968187bba";
-    sha256 = "13l6s5iyrhqa0yj272qax0261cfw3nz09hq5hpf0f0kb2952d4rc";
+    rev    = "91dde5c956b1af491bc6c16ee230daa4b4b66706";
+    sha256 = "0rk1ikrn3s6sp3gx7kc4y6msx7yncr3845m67vhk8lxvhd90sgza";
   };
 
   separateDebugInfo = true;
diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index 78abbe7392c9..e725439a3f1a 100644
--- a/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.28.0";
+  version = "1.29.1";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64";
+    sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8";
   };
 
   postPatch = let
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 0724da8375e3..b34ca5253a29 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -19,7 +19,7 @@
 , libelfSupport ? stdenv.isLinux, libelf
 , llvmSupport ? true, llvmPackages
 , libglvndSupport ? true, libglvnd
-, valgrindSupport ? stdenv.isLinux, valgrind-light
+, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 }:
 
 with lib;
@@ -41,10 +41,6 @@ assert enableRadv -> libdrmSupport && llvmSupport && libelfSupport;
   - libOSMesa is in $osmesa (~4 MB)
 */
 
-if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
-  throw "${stdenv.system}: unsupported platform for Mesa"
-else
-
 let
   # platforms that have PCIe slots and thus can use most non-integrated GPUs
   pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
@@ -206,7 +202,7 @@ let
         ++ optional vdpauSupport libvdpau
         ++ optional vaSupport libva-minimal
         ++ optional omxBellagioSupport libomxil-bellagio
-        ++ optional valgrindSupport valgrind-light
+        ++ optional withValgrind valgrind-light
 
         ++ optionals (elem "x11" eglPlatforms)
           ((with xorg; [ xorgproto libX11 ]))
@@ -372,7 +368,7 @@ let
         description = "An open source implementation of OpenGL";
         homepage = https://www.mesa3d.org/;
         license = licenses.mit; # X11 variant, in most files
-        platforms = platforms.linux ++ platforms.darwin;
+        platforms = platforms.mesaPlatforms;
         maintainers = with maintainers; [ vcunat ];
       };
     };
diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix
index ffe6b5edf961..1c6b8df15114 100644
--- a/nixpkgs/pkgs/development/libraries/mpich/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "mpich-${version}";
-  version = "3.3";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "02zs118q9n4xz9qnfc24i2r84vnzgnwnyyqanfv03lf3wqpy17ij";
+    sha256 = "1raism1r4jsx4cybc9ddyr1xkccbxm0l8j3ryrw8kslfkkr1wmgy";
   };
 
   configureFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix
index 1a5656b7ca16..60dc00a335d9 100644
--- a/nixpkgs/pkgs/development/libraries/newt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/newt/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, slang, popt }:
 
 stdenv.mkDerivation rec {
-  name = "newt-0.52.20";
+  pname = "newt";
+  version = "0.52.21";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
-    sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld";
+    url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6";
   };
 
   patchPhase = ''
diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix
index 87bc1a16f236..f3fc4caf3154 100644
--- a/nixpkgs/pkgs/development/libraries/nss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
 
 let
   nssPEM = fetchurl {
@@ -17,7 +17,11 @@ in stdenv.mkDerivation rec {
     sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5";
   };
 
-  buildInputs = [ perl zlib sqlite ]
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ perl ];
+
+  buildInputs = [ zlib sqlite ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [ nspr ];
@@ -43,7 +47,9 @@ in stdenv.mkDerivation rec {
 
   preConfigure = "cd nss";
 
-  makeFlags = [
+  makeFlags = let
+    cpu = stdenv.hostPlatform.parsed.cpu.name;
+  in [
     "NSPR_INCLUDE_DIR=${nspr.dev}/include"
     "NSPR_LIB_DIR=${nspr.out}/lib"
     "NSDISTMODE=copy"
@@ -52,6 +58,12 @@ in stdenv.mkDerivation rec {
     "NSS_ENABLE_ECC=1"
     "USE_SYSTEM_ZLIB=1"
     "NSS_USE_SYSTEM_SQLITE=1"
+    "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "OS_TEST=${cpu}"
+    "CPU_ARCH=${cpu}"
+    "CROSS_COMPILE=1"
+    "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
     ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
 
@@ -95,7 +107,10 @@ in stdenv.mkDerivation rec {
     chmod 0755 $out/bin/nss-config
   '';
 
-  postFixup = ''
+  postFixup = let
+    isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+    nss = if isCross then buildPackages.nss.tools else "$out";
+  in ''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -106,7 +121,7 @@ in stdenv.mkDerivation rec {
        libfile="$out/lib/lib$libname.so"
        LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
      '') + ''
-        $out/bin/shlibsign -v -i "$libfile"
+        ${nss}/bin/shlibsign -v -i "$libfile"
     done
 
     moveToOutput bin "$tools"
diff --git a/nixpkgs/pkgs/development/libraries/opencascade/default.nix b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
index 05d78488957a..8334bf195f7b 100644
--- a/nixpkgs/pkgs/development/libraries/opencascade/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
@@ -1,33 +1,49 @@
-{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4,
-ftgl, freetype}:
+{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
+  pkgconfig, fontconfig, freetype, expat, freeimage, vtk }:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-oce-0.18.3";
-  src = fetchurl {
-    url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
-    sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
+  pname = "opencascade-oce";
+  version = "0.18.3";
+
+  src = fetchFromGitHub {
+    owner = "tpaviot";
+    repo = "oce";
+    rev = "OCE-${version}";
+    sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig";
   };
 
-  buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ];
 
-  # Fix for glibc 2.26
-  postPatch = ''
-    sed -i -e 's/^\( *#include <\)x\(locale.h>\)//' \
-      src/Standard/Standard_CLocaleSentry.hxx
-  '';
+  cmakeFlags = [
+    "-DOCE_INSTALL_PREFIX=${placeholder "out"}"
+    "-DOCE_WITH_FREEIMAGE=ON"
+    "-DOCE_WITH_VTK=ON"
+  ];
 
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
-  '';
+  patches = [
+    # Use fontconfig instead of hardcoded directory list
+    # https://github.com/tpaviot/oce/pull/714
+    (fetchpatch {
+      url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch";
+      sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c";
+    })
+    # Fix for glibc 2.26
+    (fetchpatch {
+      url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch";
+      sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k";
+    })
+  ];
 
-  # https://bugs.freedesktop.org/show_bug.cgi?id=83631
-  NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
-
-  enableParallelBuilding = true;
+  postPatch = ''
+    # make sure the installed cmake file uses absolute paths for fontconfig
+    substituteInPlace adm/cmake/TKService/CMakeLists.txt \
+      --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES
+  '';
 
   meta = with stdenv.lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
-    homepage = http://www.opencascade.org/;
+    homepage = "https://github.com/tpaviot/oce";
     maintainers = [ maintainers.viric ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 1c0d124b5c02..ef617a92eaa7 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -120,8 +120,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2r";
-    sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf";
+    version = "1.0.2s";
+    sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
@@ -132,15 +132,10 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1b";
-    sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
+    version = "1.1.1c";
+    sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
-      (fetchurl {
-        name = "long-chacha-nonce.patch";
-        url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
-        sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
-      })
 
       (if stdenv.hostPlatform.isDarwin
        then ./1.1/use-etc-ssl-certs-darwin.patch
diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index 54bf1cc442b9..40ccd8cfd20b 100644
--- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
     scheme-basic
     collection-pstricks
     collection-fontsrecommended
+    l3kernel
+    l3packages
     mathastext
     pgf
     relsize
     sfmath
+    siunitx
     xcolor
     xkeyval
+    xstring
     ;};
   buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
   propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
index aff7b409ad07..c7d43ae70268 100644
--- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyotherside";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
     rev = version;
-    sha256 = "1mczagl7mrgw9rqxlasgybrkfigdw1g7k542q75am8gp82m6wka9";
+    sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";
   };
 
   nativeBuildInputs = [ qmake ];
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 935a4a4f2fbb..40b2ed775cd5 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -26,7 +26,7 @@ let
   # Determine the Android os identifier from Nix's system identifier
   os = if stdenv.system == "x86_64-linux" then "linux"
     else if stdenv.system == "x86_64-darwin" then "macosx"
-    else throw "No tarballs found for system architecture: ${stdenv.system}";
+    else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";
 
   # Generated Nix packages
   packages = import ./generated/packages.nix {
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index f78fafb16524..fa170a21f3b3 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.1)
+    cocoapods (1.7.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.1)
+      cocoapods-core (= 1.7.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -22,13 +22,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    fourflusher (2.3.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
index 1b16ad4d318e..cde74bbaedd5 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.1)
+    cocoapods (1.7.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.1)
+      cocoapods-core (= 1.7.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -22,13 +22,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    fourflusher (2.3.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 0d898db82ed6..919f540c19e2 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -46,10 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
+      sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
+      sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -169,10 +169,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
+      sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   fuzzy_match = {
     groups = ["default"];
@@ -292,9 +292,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7";
+      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
index d503ca82fd42..d363a81ca0f5 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
@@ -40,10 +40,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
+      sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -51,10 +51,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
+      sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -151,10 +151,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
+      sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   fuzzy_match = {
     source = {
@@ -254,9 +254,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7";
+      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
index 759ed2086fce..e212e83c2708 100644
--- a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
@@ -1,34 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, python, openssl }:
+{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
+, openssl }:
 
 buildPythonPackage rec {
   pname = "acme-tiny";
-  version = "2016-03-26";
+  version = "4.0.4";
 
-  src = fetchFromGitHub {
-    sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
-    rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971";
-    repo = "acme-tiny";
-    owner = "diafygi";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vqlmvk34jgvgx3qdsh50q7m4aiy02786jyjjcq45dcws7a4f9f1";
   };
 
-  # source doesn't have any python "packaging" as such
-  configurePhase = " ";
-  buildPhase = " ";
-  # the tests are... complex
-  doCheck = false;
-
   patchPhase = ''
-    substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl"
+    substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf
   '';
 
-  installPhase = ''
-    mkdir -p $out/${python.sitePackages}/
-    cp acme_tiny.py $out/${python.sitePackages}/
-    mkdir -p $out/bin
-    ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
-    chmod +x $out/bin/acme_tiny
-  '';
+  buildInputs = [ setuptools_scm ];
+  checkInputs = [ fusepy fuse ];
+
+  doCheck = false; # seems to hang, not sure
 
   meta = with stdenv.lib; {
     description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/cors.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
index 00198cd27cff..00198cd27cff 100644
--- a/nixpkgs/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 90bd7521ea41..5769109f7741 100644
--- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,6 +40,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
 
+  # Don't error on cryptography deprecation warning
+  postPatch = ''
+    substituteInPlace pytest.ini --replace "filterwarnings = error" ""
+  '';
+
+  # coroutine 'noop2' was never awaited
+  doCheck = false;
+
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index 5320d5be1087..a078a4207163 100644
--- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.16.1";
+  version = "1.17.0";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qia1ay2dhwps5sfh0hif7mrv7yxvykxs9l7cmfp4m6hmqnn3r5r";
+    sha256 = "1qrpkdyl77956qg6g7g66bbd6bfvb2nwi2sjy3v3li8m3irx8d7d";
   };
 
   patches = [
@@ -21,13 +21,6 @@ buildPythonPackage rec {
     # However that broke the test on NixOS, failing with
     # "Operation not permitted"
     ./fix-sftp-chmod-test-nixos.patch
-
-    # Restore libnacl support for curve25519/ed25519 as a fallback for PyCA
-    # Fixes https://github.com/ronf/asyncssh/issues/206 with older openssl
-    (fetchpatch {
-      url = "https://github.com/ronf/asyncssh/commit/1dee113bb3e4a6888de562b0413e9abd6a0f0f04.patch";
-      sha256 = "04bckdj7i6xk24lizkn3a8cj375pkz7yc57fc0vk222c6jzwzaml";
-    })
   ];
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
index f929180406b3..1c209353f0e3 100644
--- a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "cli_helpers";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj";
+    sha256 = "0rd194l06aw4612j09b44pgh8b8l4cwmz7xgwsgdj9v8m3m25nwq";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index 3b76de33ce75..32f852a2b63b 100644
--- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14pyvihikml1z7q21q9cvdfxvvlf8lhbaasj05hpiq6fjyvd7zsc";
+    sha256 = "0f5f5rgwckci2fqwbzjk5sfpwxqn5gy0biz8sjll4v5zgvjsswxq";
   };
 
   LC_ALL="en_US.UTF-8";
diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/old.nix b/nixpkgs/pkgs/development/python-modules/cmd2/old.nix
deleted file mode 100644
index 8f75170c58c4..000000000000
--- a/nixpkgs/pkgs/development/python-modules/cmd2/old.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, buildPythonPackage, pythonOlder
-, pyperclip, six, pyparsing, vim
-, contextlib2 ? null, subprocess32 ? null
-, pytest, mock, which, fetchFromGitHub, glibcLocales
-, runtimeShell
-}:
-buildPythonPackage rec {
-  pname = "cmd2";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "python-cmd2";
-    repo = "cmd2";
-    rev = version;
-    sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z";
-  };
-
-  LC_ALL="en_US.UTF-8";
-
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
-    # Fake the impure dependencies pbpaste and pbcopy
-    mkdir bin
-    echo '#${runtimeShell}' > bin/pbpaste
-    echo '#${runtimeShell}' > bin/pbcopy
-    chmod +x bin/{pbcopy,pbpaste}
-    export PATH=$(realpath bin):$PATH
-  '';
-
-  checkInputs= [ pytest mock which vim glibcLocales ];
-  checkPhase = ''
-    # test_path_completion_user_expansion might be fixed in the next release
-    py.test -k 'not test_path_completion_user_expansion'
-  '';
-  doCheck = !stdenv.isDarwin;
-
-  propagatedBuildInputs = [
-    pyperclip
-    six
-    pyparsing
-  ]
-  ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2
-  ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32
-  ;
-
-  meta = with stdenv.lib; {
-    description = "Enhancements for standard library's cmd module";
-    homepage = https://github.com/python-cmd2/cmd2;
-    maintainers = with maintainers; [ teto ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index f40f0bf63d82..6b20b4b570a3 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -21,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "2.6.1"; # Also update the hash in vectors.nix
+  version = "2.7"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
+    sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index 5679905cd143..ea24ed908016 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3";
+    sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi";
   };
 
   # No tests included
diff --git a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
index ca28f231831d..5708bf12d6bc 100644
--- a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Python interface to Oracle";
     homepage = "https://oracle.github.io/python-cx_Oracle";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
index 90c2349ae534..d7fbec5715de 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
@@ -4,15 +4,15 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.3.1";
+  version = "2.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3";
+    sha256 = "00nm76w4xymsiih6hq8y46wp026v7zkzq15cx39hp929ba3z2vx9";
   };
 
-  checkInputs = optional isPy3k glibcLocales;
-  propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ];
+  checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales;
+  propagatedBuildInputs = [ flask flask_sqlalchemy alembic ];
 
   # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
   preCheck = optionalString isPy3k ''
diff --git a/nixpkgs/pkgs/development/python-modules/flask-script/default.nix b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
index 72a3fb0c6f85..51ba7ce4d7cd 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
+    sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4";
   };
 
   propagatedBuildInputs = [ flask ];
diff --git a/nixpkgs/pkgs/development/python-modules/http-ece/default.nix b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
new file mode 100644
index 000000000000..1f50608d3d1b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage
+, coverage, flake8, mock, nose
+, cryptography }:
+
+buildPythonPackage rec {
+  pname = "http_ece";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ coverage flake8 mock nose ];
+
+  meta = with lib; {
+    description = "Encipher HTTP Messages";
+    homepage = https://github.com/martinthomson/encrypted-content-encoding;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
index dcac40b873ca..a9f37b52c1b4 100644
--- a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , hopcroftkarp
 , multiset
-, pytest
+, pytest_3
 , pytestrunner
 , hypothesis
 , setuptools_scm
@@ -12,16 +12,20 @@
 
 buildPythonPackage rec {
   pname = "matchpy";
-  version = "0.4.6";
+  version = "0.5.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eefa1e50a10e1255db61bc2522a6768ad0701f8854859f293ebaa442286faadd";
+    sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis"
+  '';
+
   buildInputs = [ setuptools_scm pytestrunner ];
-  checkInputs = [ pytest hypothesis ];
+  checkInputs = [ pytest_3 hypothesis ];
   propagatedBuildInputs = [ hopcroftkarp multiset ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
index 9ae4f00b495b..2c6858915ce9 100644
--- a/nixpkgs/pkgs/development/python-modules/nltk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
@@ -1,26 +1,17 @@
 { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }:
 
 buildPythonPackage rec {
-  version = "3.4";
+  version = "3.4.3";
   pname = "nltk";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "286f6797204ffdb52525a1d21ec0a221ec68b8e3fa4f2d25f412ac8e63c70e8d";
+    sha256 = "1cjkv4jmmlr0w4qi399ncgb6lp41mb9i352934288wh9xad15mqj";
   };
 
   propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch;
 
-  # TODO: remove patch during update to new version
-  patches = [
-    (fetchpatch {
-      url = https://github.com/nltk/nltk/commit/3966111cbf2f35fb86082b2f12acd90d75e9b8bb.patch;
-      includes = [ "setup.py" ];
-      sha256 = "1sxafnvf6nzv6d996xc1rys06x62s36swgpfqhsyh6l1lj7y38jw";
-    })
-  ];
-
   # Tests require some data, the downloading of which is impure. It would
   # probably make sense to make the data another derivation, but then feeding
   # that into the tests (given that we need nltk itself to download the data,
diff --git a/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
new file mode 100644
index 000000000000..d5af1c1c33dd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi
+, flake8, mock, nose, pytest
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "py-vapid";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b3g4ljkpi6ka5n63bl5y47r3qhxjmr6qfamqwxnmna2567b5las";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ flake8 mock nose pytest ];
+
+  meta = with lib; {
+    description = "VAPID is a voluntary standard for WebPush subscription providers";
+    homepage = https://github.com/mozilla-services/vapid;
+    license = licenses.mpl20;
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
index 835cdbaa6be1..706284b56dbc 100644
--- a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
@@ -3,11 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pygraphviz";
-  version = "1.3.1";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
+    sha256 = "179i3mjprhn200gcj6jq7c4mdrzckyqlh1srz78hynnw0nijka2h";
+    extension = "zip";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
new file mode 100644
index 000000000000..65c5e08d934c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, redis
+, pytest
+, process-tests
+, pkgs
+, withDjango ? false, django_redis
+}:
+
+buildPythonPackage rec {
+  pname = "python-redis-lock";
+  version = "3.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6";
+  };
+
+  checkInputs = [ pytest process-tests pkgs.redis ];
+
+  checkPhase = ''
+    pytest tests/
+  '';
+
+  propagatedBuildInputs = [ redis ]
+  ++ stdenv.lib.optional withDjango django_redis;
+
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ionelmc/python-redis-lock";
+    license = licenses.bsd2;
+    description = "Lock context manager implemented via redis SETNX/BLPOP";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
new file mode 100644
index 000000000000..c9077c7a17c4
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchPypi, buildPythonPackage
+, coverage, flake8, mock, nose
+, http-ece, py-vapid, requests }:
+
+buildPythonPackage rec {
+  pname = "pywebpush";
+  version = "1.9.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03qkijz56fx7p8405sknw2wji4pfj5knajk2lmj9y58mjxydbpp3";
+  };
+
+  propagatedBuildInputs = [
+    http-ece py-vapid requests
+  ];
+
+  checkInputs = [
+    coverage flake8 mock nose
+  ];
+
+  meta = with lib; {
+    description = "Webpush Data encryption library for Python";
+    homepage = https://github.com/web-push-libs/pywebpush;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/scandir/default.nix b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
index 9aa2269c9575..2736eb2ee9a3 100644
--- a/nixpkgs/pkgs/development/python-modules/scandir/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
@@ -2,13 +2,15 @@
 
 buildPythonPackage rec {
   pname = "scandir";
-  version = "1.7";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj";
+    sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
   };
 
+  checkPhase = "python test/run_tests.py";
+
   meta = with lib; {
     description = "A better directory iterator and faster os.walk()";
     homepage = https://github.com/benhoyt/scandir;
diff --git a/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
index 7428e6e9e915..73af5d7b00c6 100644
--- a/nixpkgs/pkgs/development/python-modules/spglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "spglib";
@@ -9,6 +9,15 @@ buildPythonPackage rec {
     sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-assertions.patch";
+      url = https://github.com/atztogo/spglib/commit/d57070831585a6f02dec0a31d25b375ba347798c.patch;
+      stripLen = 1;
+      sha256 = "0crmkc498rbrawiy9zbl39qis2nmsbfr4s6kk6k3zhdy8z2ppxw7";
+    })
+  ];
+
   propagatedBuildInputs = [ numpy ];
 
   checkInputs = [ nose pyyaml ];
diff --git a/nixpkgs/pkgs/development/python-modules/strategies/default.nix b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
new file mode 100644
index 000000000000..2b03ddcf9c94
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi
+, multipledispatch, toolz
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "strategies";
+  version = "0.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328";
+  };
+
+  propagatedBuildInputs = [ multipledispatch toolz ];
+  checkInputs = [ pytest ];
+
+  meta = {
+    description = "A Python library for control flow programming";
+    homepage    = "https://github.com/logpy/strategies";
+    license     = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ suhr ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index ca9872bfbf09..36aaf0ec8ceb 100644
--- a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "wsproto";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p24dmym6pfsqsyxps6m2cxfl36cmkri0kdy5y5q7s300j3xmhsm";
+    sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd";
   };
 
   propagatedBuildInputs = [ h11 enum34 ];
diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix
index e571c72232c7..3ecd81d39f99 100644
--- a/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/nixpkgs/pkgs/development/r-modules/default.nix
@@ -258,7 +258,7 @@ let
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];
     gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
-    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev ];
+    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp.dev ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index dfe1a6a10c77..ac9680c404c0 100644
--- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.100.0";
+  version = "0.101.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "10i2r0w979lhqgkq25s1a7j5vxlnjmr2w7nknhc1cvfp3z17k9ay";
+    sha256 = "09m9arpb26fqwc16f2zgjgkrlmjg0gj55zd9rfv2s8x1l0lrx5z6";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
index c75a053acb27..1a56933548f6 100644
--- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
@@ -10,13 +10,13 @@
 
 buildBazelPackage rec {
   name = "bazel-watcher-${version}";
-  version = "0.9.1";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
     rev = "v${version}";
-    sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p";
+    sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v";
   };
 
   nativeBuildInputs = [ go git python ];
@@ -49,7 +49,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5";
+    sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny";
   };
 
   buildAttrs = {
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index 3bbab475c573..fa6b310ce618 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, runCommandCC, bazel }:
+{ stdenv, writeText, runCommandCC, bazel, runLocal, bazelTest }:
 
 # Tests that certain executables are available in bazel-executed bash shells.
 
@@ -22,21 +22,23 @@ let
     )
   '';
 
-  runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script;
-
-  workspaceDir = runLocal "our_workspace" ''
+  workspaceDir = runLocal "our_workspace" {} ''
     mkdir $out
     cp ${WORKSPACE} $out/WORKSPACE
     cp ${fileIn} $out/input.txt
     cp ${fileBUILD} $out/BUILD
   '';
 
-  testBazel = runLocal "bazel-test-bash-tools" ''
-    export HOME=$(mktemp -d)
-    cp -r ${workspaceDir} wd && chmod +w wd && cd wd
-    ${bazel}/bin/bazel build :tool_usage
-    cp bazel-genfiles/output.txt $out
-    echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
-  '';
+  testBazel = bazelTest {
+    name = "bazel-test-bash-tools";
+    bazelPkg = bazel;
+    inherit workspaceDir;
+
+    bazelScript = ''
+      ${bazel}/bin/bazel build :tool_usage
+      cp bazel-genfiles/output.txt $out
+      echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
+    '';
+  };
 
 in testBazel
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
index e106c6962dc3..1ea0fc049ba8 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
-, zip, unzip, bash, writeCBin, coreutils
+{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, runCommandCC, makeWrapper
+# this package (through the fixpoint glass)
+, bazel
+, lr, xe, zip, unzip, bash, writeCBin, coreutils
 , which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
 # Apple dependencies
 , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
@@ -14,14 +16,42 @@
 
 let
   srcDeps = [
+    # From: $REPO_ROOT/WORKSPACE
     (fetchurl {
       url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
       sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
     })
-
     (fetchurl {
-        url = "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz";
-        sha256 = "1ld8m5cj9j0r474f56pixcfi0xvx3w7pzwahxngs8f6ns0yimz5w";
+        url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz";
+        sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz";
+        sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52";
+    })
+    (fetchurl {
+      url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz";
+      sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898";
+    })
+     (fetchurl {
+         url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip";
+         sha256 = "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67";
+     })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip";
+        sha256 = "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip";
+        sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889";
+    })
+    (fetchurl {
+        url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip";
+        sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz";
+        sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f";
     })
   ];
 
@@ -63,17 +93,19 @@ let
   # Java toolchain used for the build and tests
   javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
 
+  platforms = lib.platforms.linux ++ lib.platforms.darwin;
+
 in
 stdenv.mkDerivation rec {
 
-  version = "0.24.0";
+  version = "0.26.1";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = [ maintainers.mboes ];
-    platforms = platforms.linux ++ platforms.darwin;
+    inherit platforms;
   };
 
   # Additional tests that check bazel’s functionality. Execute
@@ -81,16 +113,74 @@ stdenv.mkDerivation rec {
   #     nix-build . -A bazel.tests
   #
   # in the nixpkgs checkout root to exercise them locally.
-  passthru.tests = {
-    pythonBinPath = callPackage ./python-bin-path-test.nix {};
-    bashTools = callPackage ./bash-tools-test.nix {};
-  };
+  passthru.tests =
+    let
+      runLocal = name: attrs: script: runCommandCC name ({
+        preferLocalBuild = true;
+        meta.platforms = platforms;
+      } // attrs) script;
+
+      # bazel wants to extract itself into $install_dir/install every time it runs,
+      # so let’s do that only once.
+      extracted = bazelPkg:
+        let install_dir =
+          # `install_base` field printed by `bazel info`, minus the hash.
+          # yes, this path is kinda magic. Sorry.
+          "$HOME/.cache/bazel/_bazel_nixbld";
+        in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
+            export HOME=$(mktemp -d)
+            touch WORKSPACE # yeah, everything sucks
+            install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
+            # assert it’s actually below install_dir
+            [[ "$install_base" =~ ${install_dir} ]] \
+              || (echo "oh no! $install_base but we are \
+            trying to copy ${install_dir} to $out instead!"; exit 1)
+            cp -R ${install_dir} $out
+          '';
+
+      bazelTest = { name, bazelScript, workspaceDir, bazelPkg }:
+        let
+          be = extracted bazelPkg;
+        in runLocal name {} (
+          # skip extraction caching on Darwin, because nobody knows how Darwin works
+          (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+            # set up home with pre-unpacked bazel
+            export HOME=$(mktemp -d)
+            mkdir -p ${be.install_dir}
+            cp -R ${be}/install ${be.install_dir}
+
+            # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
+            # Bazel checks whether the mtime of the install dir files
+            # is >9 years in the future, otherwise it extracts itself again.
+            # see PosixFileMTime::IsUntampered in src/main/cpp/util
+            # What the hell bazel.
+            ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
+          '')
+          +
+          ''
+            # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
+            # about why to create a subdir for the workspace.
+            cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
+
+            ${bazelScript}
+
+            touch $out
+          '');
+
+      bazelWithNixHacks = bazel.override { enableNixHacks = true; };
+    in {
+      pythonBinPathWithoutNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };
+      bashToolsWithoutNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
+
+      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+    };
 
   name = "bazel-${version}";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
-    sha256 = "11gsc00ghxqkbci8nrflkwq1lcvqawlgkaryj458b24si6bjl7b2";
+    sha256 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0";
   };
 
   # Necessary for the tests to pass on Darwin with sandbox enabled.
@@ -148,10 +238,6 @@ stdenv.mkDerivation rec {
       # https://github.com/NixOS/nixpkgs/pull/41589
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
 
-      # 10.10 apple_sdk Foundation doesn't have type arguments on classes
-      # Remove this when we update apple_sdk
-      sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
-
       # don't use system installed Xcode to run clang, use Nix clang instead
       sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
         scripts/bootstrap/compile.sh \
@@ -159,6 +245,9 @@ stdenv.mkDerivation rec {
         src/tools/xcode/stdredirect/BUILD \
         tools/osx/BUILD
 
+      # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
+      sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
+
       # clang installed from Xcode has a compatibility wrapper that forwards
       # invocations of gcc to clang, but vanilla clang doesn't
       sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
@@ -193,7 +282,7 @@ stdenv.mkDerivation rec {
 
       # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
       substituteInPlace scripts/bootstrap/compile.sh \
-          --replace /bin/sh ${customBash}/bin/bash
+          --replace /bin/bash ${customBash}/bin/bash
 
       # add nix environment vars to .bazelrc
       cat >> .bazelrc <<EOF
@@ -297,7 +386,9 @@ stdenv.mkDerivation rec {
     cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
-  doInstallCheck = true;
+  # Temporarily disabling for now. A new approach is needed for this derivation as Bazel
+  # accesses the internet during the tests which fails in a sandbox.
+  doInstallCheck = false;
   installCheckPhase = ''
     export TEST_TMPDIR=$(pwd)
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
index da3f6248f220..f58be89fabc1 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
@@ -1,33 +1,35 @@
 diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2018-01-18 08:17:22.420459162 -0500
-@@ -287,21 +287,8 @@
-           markerData.put(key, value);
-         }
-       }
--      boolean result = false;
--      if (markerRuleKey.equals(ruleKey)) {
--        result = handler.verifyMarkerData(rule, markerData, env);
--        if (env.valuesMissing()) {
+--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2019-06-12 20:39:37.420705161 -0700
++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2019-06-12 20:44:18.894429744 -0700
+@@ -428,24 +428,7 @@
+       try {
+         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
+         String markerRuleKey = readMarkerFile(content, markerData);
+-        boolean verified = false;
+-        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)
+-            && Objects.equals(
+-                markerData.get(MANAGED_DIRECTORIES_MARKER),
+-                this.markerData.get(MANAGED_DIRECTORIES_MARKER))) {
+-          verified = handler.verifyMarkerData(rule, markerData, env);
+-          if (env.valuesMissing()) {
+-            return null;
+-          }
+-        }
+-
+-        if (verified) {
+           return new Fingerprint().addString(content).digestAndReset();
+-        } else {
+-          // So that we are in a consistent state if something happens while fetching the repository
+-          markerPath.delete();
 -          return null;
 -        }
--      }
- 
--      if (result) {
--        return new Fingerprint().addString(content).digestAndReset();
--      } else {
--        // So that we are in a consistent state if something happens while fetching the repository
--        markerPath.delete();
--        return null;
--      }
-+      return new Fingerprint().addString(content).digestAndReset();
- 
-     } catch (IOException e) {
-       throw new RepositoryFunctionException(e, Transience.TRANSIENT);
+       } catch (IOException e) {
+         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
+       }
 diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2018-01-18 08:17:53.274877980 -0500
-@@ -129,7 +129,6 @@
+--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2019-06-12 20:39:37.538708196 -0700
++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2019-06-12 20:44:18.863429602 -0700
+@@ -146,7 +146,6 @@
      ProcessBuilder builder = new ProcessBuilder();
      builder.command(params.getArgv());
      if (params.getEnv() != null) {
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index 54ae154a6207..08bc642b6307 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeText, runCommandCC, bazel }:
+{ stdenv, lib, writeText, bazel, bazelTest, runLocal }:
 
 let
   WORKSPACE = writeText "WORKSPACE" ''
@@ -22,16 +22,14 @@ let
       srcs = [ "lib.py" ],
     )
 
-    py_test(
+    py_binary(
       name = "bin",
       srcs = [ "bin.py" ],
       deps = [ ":lib" ],
     )
   '';
 
-  runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script;
-
-  workspaceDir = runLocal "our_workspace" ''
+  workspaceDir = runLocal "our_workspace" {} ''
     mkdir $out
     cp ${WORKSPACE} $out/WORKSPACE
     mkdir $out/python
@@ -40,18 +38,16 @@ let
     cp ${pythonBUILD} $out/python/BUILD.bazel
   '';
 
-  testBazel = runLocal "bazel-test-builtin-rules" ''
-    export HOME=$(mktemp -d)
-    # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-    # about why to create a subdir for the workspace.
-    cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
-    ${bazel}/bin/bazel \
-      test \
-        --test_output=errors \
-        --host_javabase='@local_jdk//:jdk' \
-        //...
-
-    touch $out
-  '';
+  testBazel = bazelTest {
+    name = "bazel-test-builtin-rules";
+    inherit workspaceDir;
+    bazelPkg = bazel;
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        run \
+          --host_javabase='@local_jdk//:jdk' \
+          //python:bin
+    '';
+  };
 
 in testBazel
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
index f70e3811f654..8effc723bbab 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
@@ -1,6 +1,6 @@
---- Bear-2.3.11-src/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-+++ Bear-2.3.11-src-patch/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-@@ -49,6 +49,7 @@
+--- a/bear/main.py.in
++++ b/bear/main.py.in
+@@ -49,6 +49,7 @@ import tempfile
  import shutil
  import contextlib
  import logging
@@ -8,16 +8,20 @@
  
  # Map of ignored compiler option for the creation of a compilation database.
  # This map is used in _split_command method, which classifies the parameters
-@@ -540,7 +541,11 @@
-                 any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX)
+@@ -569,7 +570,15 @@ class Compilation:
+                 (compiler, language, rest of the command) otherwise """
  
          if command:  # not empty list will allow to index '0' and '1:'
 -            executable = os.path.basename(command[0])  # type: str
-+            absolute_executable = os.path.realpath(find_executable(command[0]))
-+            if 'wrapper' in absolute_executable:
-+                return None
-+
-+            executable = os.path.basename(absolute_executable) # type: str
++            executable_file = find_executable(command[0])
++            if executable_file:
++                absolute_executable = os.path.realpath(executable_file)
++                # Ignore Nix wrappers.
++                if 'wrapper' in absolute_executable:
++                    return None
++                executable = os.path.basename(absolute_executable)
++            else:
++                executable = os.path.basename(command[0])
              parameters = command[1:]  # type: List[str]
              # 'wrapper' 'parameters' and
              # 'wrapper' 'compiler' 'parameters' are valid.
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
index 60b6fd1953ed..341585744a6e 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,7 +3,7 @@
   tree, hexRegistrySnapshot }:
 
 let
-  version = "3.10.0";
+  version = "3.11.1";
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
@@ -74,10 +74,10 @@ stdenv.mkDerivation rec {
   inherit version erlang;
 
   src = fetchFromGitHub {
-    owner = "rebar";
+    owner = "erlang";
     repo = pname;
     rev = version;
-    sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2";
+    sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd";
   };
 
   inherit bootstrapper;
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 42e8f26970f5..07be22ae43f5 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "11.11.0";
+  version = "11.11.2";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0h35y3ifqqsirkbgg75jj30n1ggyyncbwjnnxwdhc3r9hbbc545y";
+    sha256 = "0q5i9517jsz3mw7hglbnjih7q114350dfd9nyzv7xfk56kc0172w";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "1lphzy5xxyc4qgmnf7rrplida2zdn2mfl9p9fr3gyjs7gbcr92d7";
+    sha256 = "0q7g0ggaxg6akda06an867vbdqjrfcxf4c81b1cxfhbk7whxgxhv";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0i45p4z8f7ggdh7624473d8qhz7d75hlhz98p3z69dggx38vv49y";
+    sha256 = "0bnn89z7p2mrjjlq7i9yfr6ra903vr278qhhy2i126w56dlac6vf";
   };
 
   patches = [ ./fix-shell-path.patch ];
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
index babc46115e80..d7822886a5fd 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.164.3";
+  version = "2.176.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8";
+    sha256 = "130f9x4fvnf9a9ykf48axj9fgqaj2ssr9jhsflpi1gg78ch6xg4b";
   };
 
   buildCommand = ''
diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
new file mode 100644
index 000000000000..f7e37a1a5e5a
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
@@ -0,0 +1,24 @@
+From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sat, 18 May 2019 14:44:08 -0400
+Subject: [PATCH] highlight: fix permission on file style
+
+---
+ gtkdoc/highlight.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
+index 8f6e470..d11c432 100644
+--- a/gtkdoc/highlight.py
++++ b/gtkdoc/highlight.py
+@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
+ 
+ 
+ def append_style_defs(css_file_name):
+-    os.chmod(css_file_name, stat.S_IWRITE)
++    os.chmod(css_file_name, 0o664)
+     with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
+         css.write(HTML_FORMATTER.get_style_defs())
+-- 
+2.21.0
+
diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index f6083a78bf89..44b5384106ea 100644
--- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,30 +1,59 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, python3
+, libxml2Python
+, docbook_xml_dtd_43
+, docbook_xsl
+, libxslt
+, gettext
+, gnome3
 , withDblatex ? false, dblatex
 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-doc";
-  version = "1.29";
+  version = "1.30";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = pname;
+    rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
+    sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
   };
 
   patches = [
     passthru.respect_xml_catalog_files_var_patch
+    # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
+    ./0001-highlight-fix-permission-on-file-style.patch
   ];
 
   outputDevdoc = "out";
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-      gnome-doc-utils gettext which itstool
-    ] ++ stdenv.lib.optional withDblatex dblatex;
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    docbook_xml_dtd_43
+    docbook_xsl
+    libxslt
+    pkgconfig
+    python3
+    libxml2Python
+  ]
+  ++ stdenv.lib.optional withDblatex dblatex
+  ;
 
-  configureFlags = [ "--disable-scrollkeeper" ];
+  mesonFlags = [
+    "-Dtests=false"
+    "-Dyelp_manual=false"
+  ];
 
   # Make pygments available for binaries, python.withPackages creates a wrapper
   # but scripts are not allowed in shebangs so we link it into sys.path.
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
index 5f8aaf07d730..fa00b8e5f890 100644
--- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
@@ -24,6 +24,9 @@
 , flatpak
 , gitMinimal
 , glib
+, glibcLocales
+, gnumake
+, gnupg
 , gnutar
 , json-glib
 , libcap
@@ -32,20 +35,23 @@
 , libyaml
 , ostree
 , patch
+, python2
 , rpm
 , unzip
 }:
 
 let
-  version = "1.0.6";
+  installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
+  installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
+  version = "1.0.7";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
-  outputs = [ "out" "doc" "man" ];
+  outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv";
+    sha256 = "04z9i2kahj4mffzq8ny0jvc4g3ah8kv8ilqv2rx9r1l8fhbq30jj";
   };
 
   nativeBuildInputs = [
@@ -95,8 +101,38 @@ in stdenv.mkDerivation rec {
       eustrip = "${elfutils}/bin/eu-strip";
       euelfcompress = "${elfutils}/bin/eu-elfcompress";
     })
+
+    # The test scripts in Flatpak repo were updated so we are basing
+    # this on our patch for Flatpak 0.99.
+    (substituteAll {
+      src = ./fix-test-paths.patch;
+      inherit glibcLocales python2;
+    })
   ];
 
+  configureFlags = [
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=${installed_testdir}"
+    "installed_test_metadir=${installed_test_metadir}"
+  ];
+
+  # Some scripts used by tests  need to use shebangs that are available in Flatpak runtimes.
+  dontPatchShebangs = true;
+
+  # Installed tests
+  postFixup = ''
+    for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh}; do
+      patchShebangs $file
+    done
+  '';
+
+  passthru = {
+    installedTestsDependencies = [ gnupg ostree python2 gnumake ];
+  };
+
   meta = with stdenv.lib; {
     description = "Tool to build flatpaks from source";
     homepage = https://flatpak.org/;
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
new file mode 100644
index 000000000000..96212a30fcf8
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
@@ -0,0 +1,111 @@
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -301,7 +301,7 @@
+ }
+ 
+ skip_without_python2 () {
+-    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
++    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
+         echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
+         exit 0
+     fi
+--- a/tests/make-test-runtime.sh
++++ b/tests/make-test-runtime.sh
+@@ -26,6 +26,7 @@
+ PATH="$PATH:/usr/sbin:/sbin"
+ 
+ # Add bash and dependencies
++mkdir -p ${DIR}/nix/store
+ mkdir -p ${DIR}/usr/bin
+ mkdir -p ${DIR}/usr/lib
+ ln -s ../lib ${DIR}/usr/lib64
+@@ -35,73 +36,28 @@
+ else
+     cp `which ldconfig` ${DIR}/usr/bin
+ fi
+-LIBS=`mktemp`
+-BINS=`mktemp`
+-
+-add_bin() {
+-    local f=$1
+-    shift
+-
+-    if grep -qFe "${f}" $BINS; then
+-        # Already handled
+-        return 0
+-    fi
+-
+-    echo $f >> $BINS
+-
+-    # Add library dependencies
+-    (ldd "${f}" | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -)  || true
+-
+-    local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}")
+-    if [ x$shebang != x ]; then
+-        add_bin "$shebang"
+-    fi
+-}
+ 
+ for i in $@; do
+-    I=`which $i`
+-    add_bin $I
+-    if test $i == python2; then
+-        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
+-        # This is a hardcoded minimal set of modules we need in the current tests.
+-        # Pretty hacky stuff. Add modules as needed.
+-        PYDIR=/usr/lib/python2.7
+-        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
+-        for py in site os stat posixpath genericpath warnings \
+-                       linecache types UserDict abc _abcoll \
+-                       _weakrefset copy_reg traceback sysconfig \
+-                       re sre_compile sre_parse sre_constants \
+-                       _sysconfigdata ; do
+-            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
+-        done
+-        # These might not exist, depending how Python was configured; and the
+-        # part after ${so} might be "module" or ".x86_64-linux-gnu" or
+-        # something else
+-        for so in _locale strop ; do
+-            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
+-        done
+-        for plat in $( cd ${PYDIR} && echo plat-* ); do
+-            test -e ${PYDIR}/${plat} || continue
+-            mkdir -p ${DIR}/usr/lib/python2.7/${plat}
+-            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
+-        done
+-    fi
+-done
+-for i in `cat $BINS`; do
+-    echo Adding binary $i 1>&2
+-    cp "$i" ${DIR}/usr/bin/
+-done
+-for i in `cat $LIBS`; do
+-    echo Adding library $i 1>&2
+-    cp "$i" ${DIR}/usr/lib/
++    I=$(readlink -f $(which $i))
++    requisites=$(nix-store --query --requisites "$I")
++    for r in $requisites; do
++        # a single store item can be needed by multiple paths, no need to copy it again
++        if [ ! -e ${DIR}/$r ]; then
++            cp -r $r ${DIR}/$r
++        fi
++    done
++    ln -s $I ${DIR}/usr/bin/$i
+ done
+ ln -s bash ${DIR}/usr/bin/sh
+ 
+-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
+-# the real en_US locale is often not available, because its in the
+-# local archive.
++mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
++chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
++find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
++find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
++
++# We copy the whole locale archive because we do not have C.UTF8 locale
+ mkdir -p ${DIR}/usr/lib/locale/
+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
++cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
+ 
+ if [ x$COLLECTION_ID != x ]; then
+     collection_args=--collection-id=${COLLECTION_ID}
diff --git a/nixpkgs/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix
index bd25a60f72c1..aaad6d31210c 100644
--- a/nixpkgs/pkgs/development/tools/kythe/default.nix
+++ b/nixpkgs/pkgs/development/tools/kythe/default.nix
@@ -1,12 +1,12 @@
 { stdenv, binutils , fetchurl, glibc, ncurses5 }:
 
 stdenv.mkDerivation rec {
-  version = "0.0.28";
-  name = "kythe-${version}";
+  version = "0.0.30";
+  pname = "kythe";
 
   src = fetchurl {
-    url = "https://github.com/google/kythe/releases/download/v0.0.28/kythe-v0.0.28.tar.gz";
-    sha256 = "1qc7cngpxw66m3krpr5x50ns7gb3bpv2bdfzpb5afl12qp0mi6zm";
+    url = "https://github.com/kythe/kythe/releases/download/v${version}/${pname}-v${version}.tar.gz";
+    sha256 = "12bwhqkxfbkh3mm4wfvqflwhmbzpmlhlfykdpy6h7p9ih9ky8w6r";
   };
 
   buildInputs =
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                 write_entries write_tables entrystream; do
       echo "Patching:" $exe
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
-      patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64:${ncurses5}/lib" $exe
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
     done
     cd ../
     cp -R ./ $out
diff --git a/nixpkgs/pkgs/development/tools/libsigrok/default.nix b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
index 93c8c6a6c716..a80b638625e5 100644
--- a/nixpkgs/pkgs/development/tools/libsigrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
 , libserialport, librevisa, doxygen, glibmm, python
-, version ? "0.5.0", sha256 ? "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"
+, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
 }:
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "libsigrok-${version}";
+  pname = "libsigrok";
 
   src = fetchurl {
-    url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
   firmware = fetchurl {
-    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
-    sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
+    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz";
+    sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index 97657075d463..05e0b1cd96f6 100644
--- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
     sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0";
   };
 
+  postPatch = if stdenv.isDarwin then ''
+    substituteInPlace gdb/darwin-nat.c \
+      --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"'
+  '' else null;
+
   patches = [
     ./debug-info-from-env.patch
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
diff --git a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
index 58aca8a8b5a4..c751c2755587 100644
--- a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libwhich";
-  version = "2019-03-20";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "vtjnash";
     repo = pname;
-    rev = "b348872107c77cba50b60475aa8ce2ddba86aac0";
-    sha256 = "0fd8hsdc9b9v83j89mxvisgrz77q9rlxnbzd6j63wq66h95r02r9";
+    rev = "v${version}";
+    sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
new file mode 100644
index 000000000000..65a7c9eef397
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "reviewdog";
+  version = "0.9.12";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0r7y8nbpwfbvinpapv6lgnlc93kwn4b6722cp5ihyf361fklcd02";
+  };
+
+  modSha256 = "1ydfirjhw238zbia5mk90fx9rrg3kvm2h54zjhiimlvnpls5y8c9";
+
+  subPackages = [ "cmd/reviewdog" ];
+
+  buildFlagsArray = [ "-ldflags=-X github.com/reviewdog/reviewdog/commands.Version=${version}" ];
+
+  meta = with lib; {
+    description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
+    homepage = "https://github.com/reviewdog/reviewdog";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
new file mode 100644
index 000000000000..8744b753a6e6
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
@@ -0,0 +1,15 @@
+diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
+index b514c46..5f96358 100644
+--- a/src/plugins/cpptools/headerpathfilter.cpp
++++ b/src/plugins/cpptools/headerpathfilter.cpp
+@@ -92,8 +92,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs)
+ {
+     // include/c++, include/g++, libc++\include and libc++abi\include
+     static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))"
+-                                       R"(|(.*libc\+\+\/include))"
+-                                       R"(|(.*libc\+\+abi\/include))";
++                                       R"(|(.*libc\+\+.*\/include))"
++                                       R"(|(.*libc\+\+abi.*\/include))";
+     static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
+ 
+     // The same as includeRegExp but also matches /usr/local/include
diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
index 3c892592d889..03b758cbdc6d 100644
--- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix
+++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper
-, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
+{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper
+, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
 , withDocumentation ? false
 }:
 
@@ -8,6 +8,17 @@ with stdenv.lib;
 let
   baseVersion = "4.9";
   revision = "1";
+
+  # Fetch clang from qt vendor, this contains submodules like this:
+  # clang<-clang-tools-extra<-clazy. 
+  clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec {
+    src = fetchgit {
+      url = "https://code.qt.io/clang/clang.git";
+      rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
+      sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0";
+    };
+    unpackPhase = "";
+  });
 in
 
 stdenv.mkDerivation rec {
@@ -19,10 +30,29 @@ stdenv.mkDerivation rec {
     sha256 = "10ddp1365rf0z4bs7yzc9hajisp3j6mzjshyd0vpi4ki126j5f3r";
   };
 
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
+  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ];
 
   nativeBuildInputs = [ qmake makeWrapper ];
 
+  # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to 
+  # find clang libc++ library include paths. By default it's not covering paths
+  # like libc++-version, which is default name for libc++ folder in nixos.
+  patches = [ ./0001-Fix-clang-libcpp-regexp.patch 
+
+    # Fix clazy plugin name. This plugin was renamed with clang8 
+    # release, and patch didn't make it into 4.9.1 release. Should be removed 
+    # on qtcreator update, if this problem is fixed.
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82";
+      sha256 = "1lanp7jg0x8jffajb852q8p4r34facg41l410xsz6s1k91jskbi9";
+    })
+
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangtools/clangtidyclazyrunner.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82";
+      sha256 = "1rl0rc2l297lpfhhawvkkmj77zb081hhp0bbi7nnykf3q9ch0clh";
+    })
+  ]; 
+
   doCheck = true;
 
   enableParallelBuilding = true;
@@ -34,6 +64,20 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     substituteInPlace src/plugins/plugins.pro \
       --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
+
+    # Fix paths for llvm/clang includes directories.
+    substituteInPlace src/shared/clang/clang_defines.pri \
+      --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
+      --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
+
+    # Fix include path to find clang and clang-c include directories.  
+    substituteInPlace src/plugins/clangtools/clangtools.pro \
+      --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}'
+
+    # Fix paths to libclang library.
+    substituteInPlace src/shared/clang/clang_installation.pri \
+      --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \
+      --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang'
   '';
 
   preBuild = optional withDocumentation ''
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index ab625d7ea357..da42e819ced6 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.19.4";
+  version = "0.19.5";
 
   src =
     let
@@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "019dn401p4bds144fbvqxbnn8vswcj0lxr8cvgpxb2y22640z60l";
+        sha256 = "0xjyzsi3n3lb5g4gl6v0s4p87nazkqgjf244m792iji9i568ynjb";
       };
       cargo-lock = fetchurl {
-        url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/c5b9fde279a9f6d55d97e0ba4e0b4cd62e0ab2bf/cargo-make-Cargo.lock";
-        sha256 = "1d5md3m8hxwf3pwvx059fsk1b3vvqm17pxbbyiisn9v4psrsmld5";
+        url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/285cf8f9b0ab33db0d656fdc8e759feed55c0167/cargo-make-Cargo.lock";
+        sha256 = "0l2i2hq43k482m2w6hpapaq53r8bjljfcszp6csljj4fvxcl62yj";
       };
     in
     runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0wf60ck0w3m9fa19dz99q84kw05sxlj2pp6bd8r1db3cfy8f8h8j";
+  cargoSha256 = "1rmdmvr5wc2m0yv3dy07cv9y1xrwlfri3hk97zjwv5f73wgncspy";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 5f74932a6920..413e1c2debff 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04vgb443bmrfklvzhjfidpi3pp2svbc3bwq674m9fn7sbdp6rnwm";
+    sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1";
   };
 
   cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv";
 
   meta = with stdenv.lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
-    homepage = https://github.com/rust-osdev/cargo-xbuild;
+    homepage = "https://github.com/rust-osdev/cargo-xbuild";
     license = with licenses; [ mit asl20 ];
     maintainers = with maintainers; [ xrelkd ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix
index b4d78ef08501..018c7f969697 100644
--- a/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/nixpkgs/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.9";
+  version = "3.3.10";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0xnwi9m9l8rz4wdwjp2i3yfzsq1szz37z886nc6lbfxd5mj19hnn";
+    sha256 = "1lykawfi47c2k6lq4vrnghlz8gcnmqsslxsnaq4d2n78g0y3yyr2";
   };
 
   buildInputs = [ unzip ];
diff --git a/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/nixpkgs/pkgs/games/dwarf-fortress/default.nix
index 88a6d72bc485..2580e870321c 100644
--- a/nixpkgs/pkgs/games/dwarf-fortress/default.nix
+++ b/nixpkgs/pkgs/games/dwarf-fortress/default.nix
@@ -45,6 +45,12 @@ let
   # Converts a version to a package name.
   versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
 
+  dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
+    texlive = pkgs.texlive.combine {
+      inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+    };
+  };
+
   # A map of names to each Dwarf Fortress package we know about.
   df-games = lib.listToAttrs (map (dfVersion: {
     name = versionToName dfVersion;
@@ -70,11 +76,7 @@ let
 
         dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
           inherit dwarf-fortress;
-          dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
-            texlive = pkgs.texlive.combine {
-              inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
-            };
-          };
+          dwarf-therapist = dwarf-therapist-original;
         };
       in
       callPackage ./wrapper {
@@ -93,6 +95,7 @@ let
 
     # Aliases for the latest Dwarf Fortress and the selected Therapist install
     dwarf-fortress = getAttr (versionToName latestVersion) df-games;
+    inherit dwarf-therapist-original;
     dwarf-therapist = dwarf-fortress.dwarf-therapist;
     dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
 
diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix
index 6bb021c4958c..d865a8906cfb 100644
--- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix
+++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix
@@ -7,7 +7,7 @@ libusb,
 sane-backends,
 rpm, cpio,
 getopt,
-patchelf, gcc
+patchelf, autoPatchelfHook, gcc
 }:
 
 let common_meta = {
@@ -161,6 +161,34 @@ let plugins = {
 
     meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; };
   };
+  network = stdenv.mkDerivation rec {
+    pname = "iscan-nt-bundle";
+    version = "1.0.0";
+    ntPluginVersion = "1.1.1-1";
+
+    buildInputs = [ stdenv.cc.cc.lib ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+
+    src = fetchurl {
+      url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz";
+      sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
+
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mkdir $out/share/esci
+      '';
+    passthru = {
+      registrationCommand = "";
+      hw = "network";
+    };
+
+    meta = common_meta // { description = "iscan network plugin"; };
+  };
 };
 in
 
@@ -226,6 +254,8 @@ stdenv.mkDerivation rec {
     cp backend/epkowa.conf $out/etc/sane.d
     echo "epkowa" > $out/etc/sane.d/dll.conf
     ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data
+    mkdir -p $out/lib/iscan
+    ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network
     '';
   postFixup = ''
     # iscan-registry is a shell script requiring getopt
diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix
index 0a41e9b33825..7a5ed31a5803 100644
--- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mgba-${version}";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "0q0yg2zna7gjbvpaswyykbg3lr9k3c8l8fydqa407xrgq77lahq4";
+    sha256 = "0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp";
   };
 
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix
index 95e94eeaff51..851c05c0578b 100644
--- a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix
+++ b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
       -DPACKAGE_MODE=TRUE \
       -DPLUGIN_DIR="$out/lib/pcsx2" \
       -DREBUILD_SHADER=TRUE \
+      -DXDG_STD=TRUE \
       ..
   '';
 
diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index f441ac36adde..e4958b8cfc32 100644
--- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "4.0";
+    version = "4.0.1";
     url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz";
-    sha256 = "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7";
+    sha256 = "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "4.8";
+    version = "4.9";
     url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
-    sha256 = "0dd1vw3bq47ypdpflgmmbi68pjw5z3wz26kfwvnkxqbp28fapfa8";
+    sha256 = "16vrzhhk0x862mfhninx5515s76j2kbjgmz7gzdigjzkzwi8x14i";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0npm44zdys78qbqqyvjczqqjdgacpsfds3jxyy1y4yj2xjqzagsq";
+    sha256 = "17v66rsxvm3grglidxxzllw4msfrgwg35hmzanvrf8x8jfzjlvv2";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
diff --git a/nixpkgs/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix
index fb17e5e5a2d7..7738c9b1c091 100644
--- a/nixpkgs/pkgs/misc/lilypond/default.nix
+++ b/nixpkgs/pkgs/misc/lilypond/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
+{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile
 , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex
 , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
-, fetchsvn, makeWrapper, t1utils
+, makeWrapper, t1utils
 , texlive, tex ? texlive.combine {
     inherit (texlive) scheme-small lh metafont epsf;
   }
 }:
 
-stdenv.mkDerivation rec{
-  majorVersion="2.18";
-  minorVersion="2";
-  version="${majorVersion}.${minorVersion}";
-  name = "lilypond-${version}";
+let
 
-  urwfonts = fetchsvn {
-    url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44";
-    sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn";
-  };
+  version = "2.18.2";
+
+in
+
+stdenv.mkDerivation {
+  pname = "lilypond";
+  inherit version;
 
-  src = fetchurl {
-    url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
-    sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j";
+  src = fetchgit {
+    url = "https://git.savannah.gnu.org/r/lilypond.git";
+    rev = "release/${version}-1";
+    sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x";
   };
 
   postInstall = ''
@@ -33,7 +33,10 @@ stdenv.mkDerivation rec{
     done
   '';
 
-  configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"];
+  configureFlags = [
+    "--disable-documentation"
+    "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"
+  ];
 
   preConfigure = ''
     sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl
@@ -56,8 +59,9 @@ stdenv.mkDerivation rec{
     description = "Music typesetting system";
     homepage = http://lilypond.org/;
     license = licenses.gpl3;
-    maintainers = [ maintainers.marcweber ];
+    maintainers = with maintainers; [ marcweber yurrriq ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
   };
 
   patches = [ ./findlib.patch ];
diff --git a/nixpkgs/pkgs/misc/lilypond/fonts.nix b/nixpkgs/pkgs/misc/lilypond/fonts.nix
index bb3487cd0a88..00335eddce86 100644
--- a/nixpkgs/pkgs/misc/lilypond/fonts.nix
+++ b/nixpkgs/pkgs/misc/lilypond/fonts.nix
@@ -1,45 +1,43 @@
 { stdenv, fetchFromGitHub, lilypond }:
 
-with stdenv.lib;
-
 let
-  olpFont = a@{
-    fontName,
-    rev,
-    sha256,
-    version ? rev,
-    ...
-  }:
-    stdenv.mkDerivation (a // rec {
+
+  olpFont = { fontName, rev, sha256, version ? rev, ... }:
+    stdenv.mkDerivation {
       inherit version;
-      name = "openlilypond-font-${fontName}-${version}";
+      pname = "openlilypond-font-${fontName}";
+
 
       src = fetchFromGitHub {
         inherit rev sha256;
         owner = "OpenLilyPondFonts";
-        repo = a.fontName;
+        repo = fontName;
       };
 
       phases = [ "unpackPhase" "installPhase" ];
 
       installPhase = ''
-        for f in {otf,supplementary-fonts}/**.{o,t}tf; do
-          install -Dt $out/otf -m755 $f
+        local fontsdir="$out/share/lilypond/${lilypond.version}/fonts"
+
+        install -m755 -d "$fontsdir/otf"
+        for font in {otf,supplementary-fonts}/**.{o,t}tf; do
+          install -Dt "$fontsdir/otf" -m755 "$font"
         done
 
-        for f in svg/**.{svg,woff}; do
-          install -Dt $out/svg -m755 $f
+        install -m755 -d "$fontsdir/svg"
+        for font in svg/**.{svg,woff}; do
+          install -Dt "$fontsdir/svg" -m755 "$font"
         done
       '';
 
-      meta = {
+      meta = with stdenv.lib; {
         inherit (src.meta) homepage;
+        inherit (lilypond.meta) platforms;
         description = "${fontName} font for LilyPond";
-        license = a.license or licenses.ofl;
-        platforms = lilypond.meta.platforms;
-        maintainers = (a.meta.maintainers or []) ++ [ maintainers.yurrriq ];
+        license = licenses.ofl;
+        maintainers = with maintainers; [ yurrriq ];
       };
-    });
+    };
 
 in
 
@@ -86,8 +84,8 @@ rec {
   };
   lilyjazz = olpFont {
     fontName = "lilyjazz";
-    rev = "8f1f2dd";
-    sha256 = "0k44dl5hfcn7wn2b6c51mbw6hsb1sprmx95xiabvcbpxnkplbmac";
+    rev = "8fa7d554";
+    sha256 = "1z7px7k2sn7snnj7yfjv0p9axwbn452vn9ww9icmb1249b0d1qry";
   };
   lv-goldenage = olpFont {
     fontName = "lv-goldenage";
diff --git a/nixpkgs/pkgs/misc/lilypond/unstable.nix b/nixpkgs/pkgs/misc/lilypond/unstable.nix
index df83502aa88a..ce72c1fdfee8 100644
--- a/nixpkgs/pkgs/misc/lilypond/unstable.nix
+++ b/nixpkgs/pkgs/misc/lilypond/unstable.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }:
+{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
 
-with stdenv.lib;
+let
 
-let urw-fonts = fetchgit {
-  url = "http://git.ghostscript.com/urw-core35-fonts.git";
-  rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9";
-  sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a";
-}; in
+  version = "2.19.83";
 
-overrideDerivation lilypond (p: rec {
-  majorVersion = "2.19";
-  minorVersion = "65";
-  version="${majorVersion}.${minorVersion}";
-  name = "lilypond-${version}";
+in
 
-  src = fetchurl {
-    url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
-    sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd";
-  };
-
-  configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"];
+lilypond.overrideAttrs (oldAttrs: {
+  inherit version;
 
-  buildInputs = p.buildInputs ++ [ rsync ];
+  src = fetchgit {
+    url = "https://git.savannah.gnu.org/r/lilypond.git";
+    rev = "release/${version}-1";
+    sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0";
+  };
 
+  configureFlags = [
+    "--disable-documentation"
+    "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts"
+    "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
+  ];
 })
diff --git a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
index 5bc74cb65ddf..829d2d4e02e4 100644
--- a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
+++ b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
@@ -1,35 +1,18 @@
-{ stdenv
-, lndir
-, lilypond
-, openlilylib-fonts
+{ stdenv, lndir, symlinkJoin, makeWrapper
+, lilypond, openlilylib-fonts
 , fonts ? openlilylib-fonts.all
 }:
 
-stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation {
-  inherit (lilypond) name;
-  phases = "installPhase";
-  buildInputs = fonts;
-  nativeBuildInputs = [ lndir ];
-  installPhase = ''
-    local fontsdir=$out/share/lilypond/${lilypond.version}/fonts
+stdenv.lib.appendToName "with-fonts" (symlinkJoin {
+  inherit (lilypond) meta name version ;
 
-    install -m755 -d $fontsdir/otf
-    install -m755 -d $fontsdir/svg
+  paths = [ lilypond ];
 
-    ${stdenv.lib.concatMapStrings (font: ''
-        lndir -silent ${font}/otf $fontsdir/otf
-        lndir -silent ${font}/svg $fontsdir/svg
-      '') fonts}
+  buildInputs = [ makeWrapper lndir ];
 
-      install -m755 -d $out/lib
-      lndir -silent ${lilypond}/lib $out/lib
-      install -m755 -d $out/share
-      lndir -silent ${lilypond}/share $out/share
-
-      install -m755 -Dt $out/bin ${lilypond}/bin/*
-
-      for p in $out/bin/*; do
-        substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out"
-      done
+  postBuild = ''
+    for p in $out/bin/*; do
+        wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
+    done
   '';
 })
diff --git a/nixpkgs/pkgs/misc/phabricator/default.nix b/nixpkgs/pkgs/misc/phabricator/default.nix
deleted file mode 100644
index 0dde5b2b6d7c..000000000000
--- a/nixpkgs/pkgs/misc/phabricator/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, pkgs }:
-
-stdenv.mkDerivation rec {
-  version = "2014-07-16";
-  name = "phabricator-${version}";
-  srcLibphutil = pkgs.fetchgit {
-      url = git://github.com/facebook/libphutil.git;
-      rev = "48a04395363d6c1dd9f66057bd11fd70d4665ba9";
-      sha256 = "198w4kq86py31m86sgpinz2va3m9j8k92q2pa2qzzi0lyf1sb8c3";
-  };
-  srcArcanist = pkgs.fetchgit {
-      url = git://github.com/facebook/arcanist.git;
-      rev = "97501da16416fbfdc6e84bd60abcbf5ad9506225";
-      sha256 = "1afn25db4pv3amjh06p8jk3s14i5139n59zk3h4awk84d2nj1kzk";
-  };
-  srcPhabricator = pkgs.fetchgit {
-      url = git://github.com/phacility/phabricator.git;
-      rev = "7ac5abb97934f7399b67762aa98f59f667711bf3";
-      sha256 = "1hk6fnvdfn5w82wnprjdkjm8akzw3zfqm460cjqd8v3q5n21ddpf";
-  };
-
-  buildCommand = ''
-    mkdir -p $out
-    cp -R ${srcLibphutil} $out/libphutil
-    cp -R ${srcArcanist} $out/arcanist
-    cp -R ${srcPhabricator} $out/phabricator
-  '';
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.asl20;
-  };
-}
diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 8e2747514ec4..e6f9e1a1b18f 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-06-05";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "7b78f2b846e2f3443dcb2ceacee54eb99e37f040";
-      sha256 = "1f6kldvcysa525xn6fnzg09chp39s63m7nxsq008lzykm30v00jr";
+      rev = "6e28eec243c4df3cf3b67bac9f87fdd30c846cbd";
+      sha256 = "15r479nwbxv29ryiiqn3yc7srg5yx1mj6whblxpnmjxjiwsy4yym";
     };
   };
 
@@ -182,12 +182,12 @@ let
 
   caw-vim = buildVimPluginFrom2Nix {
     pname = "caw-vim";
-    version = "2018-12-25";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "98805a60aef339e55e5b917fdb9f69c74e8d8340";
-      sha256 = "0nn3dg3lnbnfwgvxpjbalw9ff876798jrzlkrnzqkvrwxv6k7ks5";
+      rev = "05c6b113dd82d2ad4d424b696b14a2b89a337541";
+      sha256 = "1s56f8pqn5hldmi54qybjldi3lwyyznwf4jk2qnvp77civk8mjn9";
     };
   };
 
@@ -237,12 +237,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2019-06-07";
+    version = "2019-06-15";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "cbb5c031274f81a503ea0c0976252938de479980";
-      sha256 = "07i7fb12ai2xzknn624lvbl5qjazqx3mix390ymbscdskb726kaz";
+      rev = "02d34c39eb798f5902dd8c986842e14c479a7b17";
+      sha256 = "1ww9q2cs88zy74p1y07c480dsjgf6g1prl10w86rhpxhjp9d4jhw";
     };
   };
 
@@ -414,23 +414,23 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-06-07";
+    version = "2019-06-15";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "bfc010bfeed56681929b67e70662f8bb11977da7";
-      sha256 = "0gppzj0l83ldwxb3z41fvjlvyxalcnw90bfw4vvm6aghx0clxpkx";
+      rev = "54f322011a3a94d27e0814f1a7ae55385eab0a3e";
+      sha256 = "08nvp4vr29g8q666cmnqv436p42i1l9bh7qgh4qnv62kms40jp3f";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol-nvim";
-    version = "2019-04-21";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "98e1d68336a757dd736a10f1dc7564458d52f5b7";
-      sha256 = "09fgyh8yipgcd525jgjj3ci6xsg7zqq7rwlfx593mw5afsnwa7gi";
+      rev = "6ef9abb552873a53857ef9b4381a5a1eca95cd35";
+      sha256 = "0n07xg5v2pyxhzk9rn37yc3i47c5qvni0vlsrpj6015q4g48v2z1";
     };
   };
 
@@ -549,12 +549,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2019-06-01";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "a356d856702c275360ba5cfb91fc98542c2f075f";
-      sha256 = "1iml5v8cinanr6wq7rg3g6grg71vsyc6shvzc0q3s411fldmcmra";
+      rev = "c12d2e683fb749f9c0d4a099d894baa3d9d5f330";
+      sha256 = "1w8awylby9qasy0z6x4l5k9gw5sqqmsmpcvckj9ax1sp34psdzhx";
     };
   };
 
@@ -650,12 +650,12 @@ let
 
   ferret = buildVimPluginFrom2Nix {
     pname = "ferret";
-    version = "2019-06-01";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "80c9f12cd0b7e0bce86b6b2142a8f8d1f1937519";
-      sha256 = "1w9ak71c3m588xkhqlr6alddhshmimvq0y3m1grz9s4jcv7zsgr0";
+      rev = "f6d7d01de8a92baee83218001c0bdbade8458a72";
+      sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr";
     };
   };
 
@@ -706,12 +706,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2019-05-14";
+    version = "2019-06-08";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "5c87ab86c0e7b0ec8a5edd39a4ce5500bb9e9333";
-      sha256 = "0ippj4xpxx8yypfp4fa66hahz9ciy2inyq9275ajpgs7gxs6yx7n";
+      rev = "91ed5f4b39b6e4a2ca50be1c8cec7e1148145fab";
+      sha256 = "1aij5xzcsi56pjns39y5ybg31qi8zaka949habakfy3jwl1wyrjf";
     };
   };
 
@@ -750,12 +750,12 @@ let
 
   goyo-vim = buildVimPluginFrom2Nix {
     pname = "goyo-vim";
-    version = "2019-04-29";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "goyo.vim";
-      rev = "012290431a834752d2fce3dfc197dba3d7d1d0f8";
-      sha256 = "0vqd75c2a5yjmiakv26cgd9wkqwzfbi93qm1vw9g2j5s96dcwa6a";
+      rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d";
+      sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz";
     };
   };
 
@@ -816,12 +816,12 @@ let
 
   iceberg-vim = buildVimPluginFrom2Nix {
     pname = "iceberg-vim";
-    version = "2019-06-05";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
-      rev = "ccd0c64a8e731233c12e5d8884495b121f8b1808";
-      sha256 = "1ifmw5sdh2y270gycdsa79wn6ldb5fdkq2ysipndyk2xc28bhv6w";
+      rev = "e8316001e1130a042f8b4c8f49d78ed87b624f53";
+      sha256 = "0p228laa5na7izink982ahksqhzwlxj8knb2wh5440z7chixmycc";
     };
   };
 
@@ -869,6 +869,17 @@ let
     };
   };
 
+  indentLine = buildVimPluginFrom2Nix {
+    pname = "indentLine";
+    version = "2019-02-22";
+    src = fetchFromGitHub {
+      owner = "Yggdroot";
+      repo = "indentLine";
+      rev = "47648734706fb2cd0e4d4350f12157d1e5f4c465";
+      sha256 = "0739hdvdfa1lm209q4sl75jvmf2k03cvlka7wv1gwnfl00krvszs";
+    };
+  };
+
   intero-neovim = buildVimPluginFrom2Nix {
     pname = "intero-neovim";
     version = "2018-08-07";
@@ -960,12 +971,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2019-06-03";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "3b7c7b83d2ef5f559158c84c5afb0f51656ccade";
-      sha256 = "01q4rwjbk65nhacna0ai48adhqy7iq3ix23j9g70yz2awj9vq56i";
+      rev = "80c242c3c5394fd5143b5d7e2741989ba04ae46a";
+      sha256 = "0k42wzwwhiqj6i1s2zdkmdnay85kwl4aw129nwcrrc4ahqhhh9fy";
     };
   };
 
@@ -1147,23 +1158,23 @@ let
 
   neodark-vim = buildVimPluginFrom2Nix {
     pname = "neodark-vim";
-    version = "2018-10-17";
+    version = "2019-06-15";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
-      rev = "e95e924081f95ec18d9b6d7239a445db982669e8";
-      sha256 = "11mib0yf3kq626r9afw1127w2hxbqci3fgvh3lfl36mk06sm1qqb";
+      rev = "eeafb097ad5d9aa9db4ba43b8556306da9e3329f";
+      sha256 = "0n34980wdvxrgymnb0xgdy01mv201643xijr9czi0pf1hvfsbd70";
     };
   };
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2019-05-17";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "9fea982b33627eefbfdf2836458b224bd1c724e4";
-      sha256 = "1j9q2h41dpkn9g0j88s0daq0iy7c27xxz0cm5lw5ngpd2y6hnl40";
+      rev = "b60a530de93a1131a320fa10a289c9ffee771a1e";
+      sha256 = "0f6drp06f0r6c5d777i5dh3kks1j73945ip8ng51v4803m7m2g3g";
     };
   };
 
@@ -1180,12 +1191,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2019-06-05";
+    version = "2019-06-07";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "443dcc03b79b2402bd14600c9c4377266f07d1f4";
-      sha256 = "0byqhzir1nvkir0wp8bw9ikw7z24r3csx3zbwdl1av1rmf3m7ld8";
+      rev = "3e8f7c5b2f108e5a7e1cffff37321abd06edf997";
+      sha256 = "1h0fk2097zfilbfawcg5k4j7p4ff17396pb3yfipd4ik9hfnbgk0";
     };
   };
 
@@ -1268,23 +1279,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2019-06-04";
+    version = "2019-06-08";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "e6fd663def132bcbcd7fdb6ab34be117437b6944";
-      sha256 = "0r7qpy6m79j7vdq1p5ladfvclfly1vjxhwmj9xfcdbz2agpmkgj3";
+      rev = "17cec9747e464867676d8bee6cb7b411f17bd006";
+      sha256 = "1ph87m17liifmffaq3iizinhmq2z59jfpydlnsv6d67x5ia58dc5";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2019-05-09";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "67fa9b3116948466234978aa6287649f98e666bd";
-      sha256 = "0pzkcpqaalx3jncxfd3yf1ml7q5kkw4z1wqshilkr55nrb26chdg";
+      rev = "12dea6ccb2381a2b6b8ae0bf17b4078699bbfec3";
+      sha256 = "0r3w1anbg57mifavb7lg4gdyji03hc9jmjs006prs2w8zfc9zqds";
     };
   };
 
@@ -1664,12 +1675,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2019-06-05";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "de431dc161f8f839a47c6f1cb277e7318ddba6f5";
-      sha256 = "032i1isc558rz2hmh3dfxnwgbqn7wdlhzz1c05v6bd7yyv0k5g23";
+      rev = "e2503139a55f4c2631cca64feb596b44d5b88f73";
+      sha256 = "0zaa2dcgynwbhybyq3i3i9pxdz4hk2q3g0s48vm27sywr2kdzw63";
     };
   };
 
@@ -1873,12 +1884,12 @@ let
 
   traces-vim = buildVimPluginFrom2Nix {
     pname = "traces-vim";
-    version = "2019-05-14";
+    version = "2019-06-11";
     src = fetchFromGitHub {
       owner = "markonm";
       repo = "traces.vim";
-      rev = "d07bb40a3064ff5a2fb16c90946a6259ceb447a3";
-      sha256 = "18b9215ifp591hkirs9h09g7r7baal2kcxccpz0siq9939y32b9p";
+      rev = "ce382caed5aed6a8b8b26a4ad7a750bfd9529869";
+      sha256 = "18sxnf9k3bpyk6fsy3qhiy56k5w5d9izb1wazz9gyfwwbygq455c";
     };
   };
 
@@ -1983,12 +1994,12 @@ let
 
   vim = buildVimPluginFrom2Nix {
     pname = "vim";
-    version = "2019-06-02";
+    version = "2019-06-11";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "a4f6b0abe6cad85330867a54893864e0d5c59359";
-      sha256 = "0krgb3whdgir6rd82syrx7pvr9mlzabrzn3h3a9cvcc0la73irql";
+      rev = "42a51ef8d9656b7d126ce8ad554045da16fe37da";
+      sha256 = "03cxaxm2yvxa80lj78aqycj09crikpwdr8151w1l5rhlwwbg18n9";
     };
   };
 
@@ -2214,12 +2225,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2019-06-04";
+    version = "2019-06-14";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "826561daf34379a8ac4dc19395fb0e26f11ce036";
-      sha256 = "0ghmjidp1kva4888nfi3pckibrvvp47z6yzd9d612ij6pz9njvjr";
+      rev = "2db9b27e39bfd84cb432e001b4a3f41f633b3b7e";
+      sha256 = "07spj2jagg3vy8h5p2qyywk9lxb7hg8vq0n8cy88qfphi6hf27b7";
     };
   };
 
@@ -2357,12 +2368,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2019-04-17";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "fc45c30907106801f0bf443a9fa20300fc6ce100";
-      sha256 = "0rnlcvv6jw0q9hhy0f5l52hv8kajymii8c1qlc04bpwm8ibkxjkn";
+      rev = "3be5d149e38b2e3582d6c1122632de7b802cd6f1";
+      sha256 = "0m1nz8q7v6ljff7qgyzxc5qwadj6zmms26jzdxajq36a0l19n2yb";
     };
   };
 
@@ -2445,12 +2456,12 @@ let
 
   vim-css-color = buildVimPluginFrom2Nix {
     pname = "vim-css-color";
-    version = "2019-05-14";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "8a84356d5319cad3da2835bd5fbc6318500f31ce";
-      sha256 = "1yad8jrcna82ll893wf53ms2hqmcaa63g43yafxvlgmxw5yrh3im";
+      rev = "5a31c72cc51cb11118e44fb50ff77fc596348f77";
+      sha256 = "17a2i40z5145px4p4swvm003h4mdxd2hp89pyvrqal910d2g3hgb";
     };
   };
 
@@ -2511,12 +2522,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-06-06";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "eac3a56511119e3c2ca2eec2ba6e6bad72bc09a8";
-      sha256 = "1z3nh5v0kgbj3irmyx6b4l9zw8qsfzq8nvyly5v2xzbjsfyykwms";
+      rev = "2c5b28387ab50f6e6c6034a5b362b24be63734a3";
+      sha256 = "0angxakjzf3sanjdyykr9igsl3z2xrcfkicpylhnk1rvjjsxlcd9";
     };
   };
 
@@ -2632,12 +2643,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-06-05";
+    version = "2019-06-10";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "1f97b27e166c8b8f3e04808830fa8a4f8ae7620f";
-      sha256 = "0br3zkkdq13h5l7wly5n1rzhkyl5wn8ghm6nabyn298lgh1193i2";
+      rev = "cf0537f683ef6195fee453f330510b95536c8861";
+      sha256 = "1p8ll6p69aj0q0ygn3pignivss88sa12lfznbkc9xlrrcky4birq";
     };
   };
 
@@ -2687,12 +2698,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-06-04";
+    version = "2019-06-08";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "41a734ef49c78cfdb97426cda811ee99c39e011a";
-      sha256 = "1d7nfyrjr96q8m8z9ssqx5qmv46273gimw9rm519h2271bdy1cri";
+      rev = "6d42c7df44aa20252e5dac747c3ac9fa7450b21b";
+      sha256 = "002s7jsn8m4h98hpbcblhmxywsyxgajz23wm3w96awqqz4chrp0i";
     };
   };
 
@@ -2731,12 +2742,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2019-06-04";
+    version = "2019-06-14";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "07b60b584ea603693d24a72207de58a446e0b5ec";
-      sha256 = "1gzgbczrs3mqrj498gcb4hvq8vqf4ikj613x2ilalfq9jkw3q5xi";
+      rev = "5989eb882e8be27edef5c0738580917d0179626b";
+      sha256 = "02sng4vlpl8616125d7l4xjwc1c30lsplzbf8y2z90lk01vhv5zy";
     };
   };
 
@@ -2753,12 +2764,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-06-04";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "255f903c14350fb5d615b316661bac93db1544ce";
-      sha256 = "1zdxh13g1xfxcz4w1jw065d08mf6067pyxdqxhrpsl9hi9vxd01q";
+      rev = "b6a0bde7d4c64a063ea1b6365e3dd24e2d4f4df1";
+      sha256 = "1lnwp4qqbzl6cwy75hhkafnppv2pgbaw2lf5fpbprwyd5aa5qh1q";
     };
   };
 
@@ -2940,12 +2951,12 @@ let
 
   vim-isort = buildVimPluginFrom2Nix {
     pname = "vim-isort";
-    version = "2019-03-12";
+    version = "2019-06-08";
     src = fetchFromGitHub {
       owner = "fisadev";
       repo = "vim-isort";
-      rev = "a0663e91cd50686f39e96f4e51d10a37e2187df8";
-      sha256 = "1vfnhms2x2flmpkd2y6s95w628raip3h95d59wms5vizmhs2d3xg";
+      rev = "b749d009075a333634dc61a039a2dc0e7f34609c";
+      sha256 = "1h8s21kwbjdg632jvd46r2va7il4f1dbgwfw8fkds0n08rbnpdjw";
     };
   };
 
@@ -3150,12 +3161,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-05-29";
+    version = "2019-06-11";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "a29bf109afcf8e0b7517ca73c233579660e51d06";
-      sha256 = "1jxl3dxkvbzdkqm1psy9lnwig2wk1zi4mi81070v6c0jlv3aq24n";
+      rev = "d4d34070c74261d749a74c1990c7e6ecf7b500bb";
+      sha256 = "0gba7lhzd8l0mdkkgw2ahwq3n0x2kz3bghqx06ah77w642kq4sdr";
     };
   };
 
@@ -3326,12 +3337,12 @@ let
 
   vim-pandoc = buildVimPluginFrom2Nix {
     pname = "vim-pandoc";
-    version = "2019-05-21";
+    version = "2019-06-12";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "11e86deecb715fe1b9ca04d9b313f9432013b2b1";
-      sha256 = "171xkz7wvrb7c6c12sgf3v2clmbdand23wvi5rm6g8lf1x11kvsq";
+      rev = "f8fa0274c2727d81afaedd970059e4132fba96fd";
+      sha256 = "1y84cllyb7mkq0x6a07dffa3zlgw3pbawgsgpcgkhz3nwazivxaf";
     };
   };
 
@@ -3425,12 +3436,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2019-05-07";
+    version = "2019-06-14";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "aebef2c2e76b88384b1121c237c965e8cf8b3bcb";
-      sha256 = "1nb4i76y6rkznabr9nnnhaibyaig81gjvvpjv2afygllxh3cpqyx";
+      rev = "15727e7eb005a0eef76941e09d993754b86cb81d";
+      sha256 = "0qn328ypbqnddw8dz684rz9p18gqqxxw36wpvc5lskz8j1gb251f";
     };
   };
 
@@ -3931,12 +3942,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2019-06-03";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "727095b35430f0c7e4344cecfa3bf3d5aced2323";
-      sha256 = "0nchwk8v45rhsni6ccl9vz54f7hzykpq4c1argm2zcs0f1q55kwl";
+      rev = "c62107b163bc4f0bf718f32a019f19a548c8d332";
+      sha256 = "0455mdill779lqnjvy63pz8v7c8fz9clikylhy4xmcjw136j8325";
     };
   };
 
@@ -4085,12 +4096,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-06-05";
+    version = "2019-06-14";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "c725bf60cced15ed5b15d0162c9a56f651b3a992";
-      sha256 = "18wb76vhqy3a6yp4rzd2v9rrwqafhs1jgh67ir8sy5ga5xfwig81";
+      rev = "8c7cd088f1783cb8eed02955c031e9e4448a5fab";
+      sha256 = "0y6a6csgi05ip3hna5vpqs92ax8msj0027zhgzq5lba83mysfcck";
     };
   };
 
@@ -4221,8 +4232,8 @@ let
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "15792ab97b69df7cf24fd160cc7eff1aac145e33";
-      sha256 = "1hsr2pcswp3nx2a8x7nnkzd966kjhy3ac0xpnh6arjsigvckw1ij";
+      rev = "6f81b702ccd0259cf3a17647ece639900e7edece";
+      sha256 = "1zyk74i0i8c4cz9hg08ka05f7gz5rr0karpqs2hr9hp8a0gb1mmy";
       fetchSubmodules = true;
     };
   };
@@ -4252,12 +4263,12 @@ let
 
   zeavim-vim = buildVimPluginFrom2Nix {
     pname = "zeavim-vim";
-    version = "2018-03-22";
+    version = "2019-06-07";
     src = fetchFromGitHub {
       owner = "KabbAmine";
       repo = "zeavim.vim";
-      rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa";
-      sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj";
+      rev = "298e52ad683680b4aa19b53d009cf0e6b9197664";
+      sha256 = "1qj6z0vd7y89wfwh84rndl4iz6cvilncih2fc5xgmljaarg914fs";
     };
   };
 
@@ -4274,12 +4285,12 @@ let
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2019-05-29";
+    version = "2019-06-13";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "d5b47fecf461ce2541c9b4810a5aa0728816d257";
-      sha256 = "0mwy8ybv9klrslzlil22nd71j45n12vnvgczgj955d8rcra7cnyn";
+      rev = "636fc7a21f63a884d6065afbc773b23013cea1cf";
+      sha256 = "1v30wdpslj74llqdpcwqhxz5sfqqiry9qwh3fmxmdfrg17qbr4g9";
     };
   };
 
diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index 8e5870253cba..5ee03077d712 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
+++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
@@ -111,10 +111,10 @@ self: super: {
 
 
   coc-nvim = let
-    version = "0.0.67";
+    version = "0.0.69";
     index_js = fetchzip {
         url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz";
-        sha256 = "0cqgrfyaq9nck1y6mb63gmwgdrxqzgdgns5gjshpp1xzfq6asrqj";
+        sha256 = "1qnznpb39bbhimzbhsvpsdkg87dv3yxzs1vr3kaikl3kpakik9p8";
       };
   in super.coc-nvim.overrideAttrs(old: {
     # you still need to enable the node js provider in your nvim config
diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index 3a2db91afd99..1c52f339d426 100644
--- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -382,6 +382,7 @@ wincent/ferret
 xolox/vim-easytags
 xolox/vim-misc
 xuhdev/vim-latex-live-preview
+Yggdroot/indentLine
 zah/nim.vim
 zchee/deoplete-clang
 zchee/deoplete-go
diff --git a/nixpkgs/pkgs/os-specific/darwin/trash/default.nix b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix
index e1606383c0dc..4044ee4d0ddc 100644
--- a/nixpkgs/pkgs/os-specific/darwin/trash/default.nix
+++ b/nixpkgs/pkgs/os-specific/darwin/trash/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.2";
   name = "trash-${version}";
 
   src = fetchFromGitHub {
     owner = "ali-rantakari";
     repo = "trash";
     rev = "v${version}";
-    sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41";
+    sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff
index 546c760b10e3..fa6edf98b3de 100644
--- a/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff
+++ b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff
@@ -6,8 +6,8 @@ index 5e4306f..9c975fc 100644
  	@echo
  	@echo ---- Compiling:
  	@echo ======================================
--	$(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
-+	$(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
+-	$(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
++	$(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
  
  analyze:
  	@echo
diff --git a/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix
index 013c847112bb..014ebe80cdcc 100644
--- a/nixpkgs/pkgs/os-specific/linux/bcc/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix
@@ -4,7 +4,7 @@
 }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "0.9.0";
+  version = "0.10.0";
   name = "bcc-${version}";
 
   srcs = [
@@ -12,7 +12,7 @@ python.pkgs.buildPythonApplication rec {
       owner  = "iovisor";
       repo   = "bcc";
       rev    = "v${version}";
-      sha256 = "0gi12bsjaw1d77rx11wkdg4szcydwy55z6mkx558nfvdym0qj7yw";
+      sha256 = "0qbqygj7ia494fbira9ajavvnxlpffx1jlzbb1vsf1wa8h3y4xn1";
       name   = "bcc";
     })
 
@@ -21,8 +21,8 @@ python.pkgs.buildPythonApplication rec {
     (fetchFromGitHub {
       owner  = "libbpf";
       repo   = "libbpf";
-      rev    = "5beb8a2ebffd1045e3edb9b522d6ff5bb477c541";
-      sha256 = "19n6baqj0mbaphzxkpn09m5a7cbij7fxap8ckk488nxqdz7nbsal";
+      rev    = "0e37e0d03ac99987401e4496d3d76d44237b9963";
+      sha256 = "0wjf9dhvqkwiwnygzikamrgmpxgq77h2pxx6mi4pnbw0lxlppivr";
       name   = "libbpf";
     })
   ];
diff --git a/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
index a0f0a4c47e34..7270877c52e4 100644
--- a/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
+  buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
index fac62597013c..ebd09759be6e 100644
--- a/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lgcc_s";
 
   configureFlags = [
-    "--disable-kernel_crypto"
     "--enable-cryptsetup-reencrypt"
     "--with-crypto_backend=openssl"
   ] ++ stdenv.lib.optional enablePython "--enable-python";
diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix
index 15470479a3a2..f72b3cac7371 100644
--- a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix
@@ -28,7 +28,9 @@ in stdenv.mkDerivation rec {
         url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
         sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
       })
-    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
+    ++ (if isFuse3
+      then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ]
+      else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkgconfig ]
diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix
index 0d7ce559c66d..a4dfda41a0ce 100644
--- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.5.0";
-    sha256Hash = "01gs25pk58nm5il91lgwiivphk38009ihfk5l956zyzmgr9wa9a5";
+    version = "3.6.1";
+    sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb";
   };
 }
diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
new file mode 100644
index 000000000000..8ff40f34f938
--- /dev/null
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
@@ -0,0 +1,11 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ AUTOMAKE_OPTIONS = subdir-objects
+-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+  -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26
+ 
+ lib_LTLIBRARIES = libfuse.la libulockmgr.la
diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
new file mode 100644
index 000000000000..1d41a26b0a4d
--- /dev/null
+++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
@@ -0,0 +1,12 @@
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
+                   soversion: '3', include_directories: include_dirs,
+                   dependencies: deps, install: true,
+                   link_depends: 'fuse_versionscript',
+-                  c_args: [ '-DFUSE_USE_VERSION=34',
+-                            '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
++                  c_args: [ '-DFUSE_USE_VERSION=34' ],
+                   link_args: ['-Wl,--version-script,' + meson.current_source_dir()
+                               + '/fuse_versionscript' ])
+ 
diff --git a/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/nixpkgs/pkgs/os-specific/linux/iptables/default.nix
index ff6ce3b4889d..b2fee6184e24 100644
--- a/nixpkgs/pkgs/os-specific/linux/iptables/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/iptables/default.nix
@@ -2,42 +2,14 @@
 , libnetfilter_conntrack, libnftnl, libmnl, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "iptables-${version}";
-  version = "1.8.2";
+  pname = "iptables";
+  version = "1.8.3";
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "1bqj9hf3szy9r0w14iy23w00ir8448nfhpcprbwmcchsxm88nxx3";
+    url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
+    sha256 = "106xkkg5crsscjlinxvqvprva23fwwqfgrzl8m2nn841841sqg52";
   };
 
-  patches = [
-    # Adds missing bits to extensions' libipt_icmp.c and libip6t_icmp6.c that were causing build to fail
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=907e429d7548157016cd51aba4adc5d0c7d9f816";
-      sha256 = "0vc7ljcglz5152lc3jx4p44vjfi6ipvxdrgkdb5dmkhlb5v93i2h";
-    })
-    # Build with musl libc fails because of conflicting struct ethhdr definitions
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=51d374ba41ae4f1bb851228c06b030b83dd2092f";
-      sha256 = "05fwrq03f9sm0v2bfwshbrg7pi2p978w1460arnmpay3135gj266";
-    })
-    # Extensions: libip6t_mh: fix bogus translation error
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=5839d7fe62ff667af7132fc7d589b386951f27b3";
-      sha256 = "0578jn1ip710z9kijwg9g2vjq2kfrbafl03m1rgi4fasz215gvkf";
-    })
-    # Prevent headers collisions between linux and netfilter (in.h and in6.h)
-    # Fixed upstream with two commits
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=8d9d7e4b9ef4c6e6abab2cf35c747d7ca36824bd";
-      sha256 = "0q3wcspiqym1r6dg1jhg7h8hpvsjzx1k7cs39z36mzlbmj9lm0zb";
-    })
-    (fetchpatch {
-      url = "https://git.netfilter.org/iptables/patch/?id=2908eda10bf9fc81119d4f3ad672c67918ab5955";
-      sha256 = "1dci4c8b7gcdrf77l2aicrcwlbp320xjz76fhavams0b4kgs6yr3";
-    })
-  ];
-
   nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ];
 
   buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ];
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 8c39bc9ee1b1..5b54a86a2761 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.124";
+  version = "4.14.126";
 
   # 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 = "1fdwbj26pcnl23n6yw55j5yif6fkka7kvkdh31c8wczc3rw5h3bx";
+    sha256 = "0w1rccjz3i91jj0hbdwp4vznn0nfzw304fklmcrb2q459m88jbka";
   };
 } // (args.argsOverride or {}))
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index bfe5fc792d5d..be7b7ffdb189 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.49";
+  version = "4.19.51";
 
   # 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 = "1kdv72w9x72z126dycdqm4i5hvmy0njaywb2a6jvq39wjyrj1ncj";
+    sha256 = "0w4dbadmh1y3h84ha543qmhckk650b62cl7d7kya733gfw6r5yks";
   };
 } // (args.argsOverride or {}))
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index dc6998410cfb..f0a78b5fccd6 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.180";
+  version = "4.4.181";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s";
+    sha256 = "1lw1qsql9dv8dllz6hglahxdfgzg34rpl9c9gwdrpm4j660nkaxj";
   };
 } // (args.argsOverride or {}))
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 46cd944e4cee..1b81fef394e6 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/nixpkgs/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.180";
+  version = "4.9.181";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0pvw71yiwwf19qxqkm68dw4c9sl54n367q9kfdc6msd3c86ljnnj";
+    sha256 = "1vgwfjsn31fy0ikcnpaqbw8w0r0xb25xp3633f0258yb24z25kcg";
   };
 } // (args.argsOverride or {}))
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix
index 788e47335454..7953e48d019e 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.1.8";
+  version = "5.1.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1v56hzzb147mdnhajkgcjwjrmd7qyayky7bprjb3maz2qvy4y5nh";
+    sha256 = "1kzvm6zklfri5g3kkkc3qp0kjrlf78qkfn5bkxzcny95ad0k01ir";
   };
 } // (args.argsOverride or {}))
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 69900f044a3b..d2e1a35cb2e6 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -26,7 +26,7 @@ lib.overrideDerivation (buildLinux (args // rec {
   } // (args.features or {});
 
   extraMeta.hydraPlatforms = [ "aarch64-linux" ];
-})) (oldAttrs: {
+} // (args.argsOverride or {}))) (oldAttrs: {
   postConfigure = ''
     # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
     sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
diff --git a/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
index 14996fd76be5..0e90a0814767 100644
--- a/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd, liburcu }:
+{ stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
 
 stdenv.mkDerivation rec {
   name = "multipath-tools-${version}";
-  version = "0.6.2";
+  version = "0.8.1";
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${version};sf=tgz";
-    sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm";
+    url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
+    sha256 = "0669zl4dpai63dl04lf8vpwnpsff6qf19fifxfc4frawnh699k95";
   };
 
   postPatch = ''
+    substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lvm2}/include/libdevmapper.h
     sed -i -re '
       s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
     ' libmultipath/defaults.h
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
       Makefile.inc
   '';
 
-  nativeBuildInputs = [ gzip ];
-  buildInputs = [ systemd lvm2 libaio readline liburcu ];
+  nativeBuildInputs = [ gzip pkgconfig perl ];
+  buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];
 
   makeFlags = [
     "LIB=lib"
diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 56012aafea9c..a30f1d7f5936 100755
--- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -102,7 +102,11 @@ installPhase() {
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
       # Unfortunately --shrink-rpath would strip too much.
-      patchelf --set-rpath "$out/lib:$libPath" "$libname"
+      if [[ -n $lib32 && $libname == "$lib32/lib/"* ]]; then
+        patchelf --set-rpath "$lib32/lib:$libPath32" "$libname"
+      else
+        patchelf --set-rpath "$out/lib:$libPath" "$libname"
+      fi
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
 
diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4bbb9d92930e..eeb7b99bbaae 100644
--- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -13,8 +13,8 @@
 , broken ? false
 }:
 
-{ stdenv, callPackage, pkgsi686Linux, fetchurl
-, kernel ? null, xorg, zlib, perl, nukeReferences
+{ stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl
+, kernel ? null, perl, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -32,6 +32,8 @@ let
   pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
   i686bundled = versionAtLeast version "391";
 
+  libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.xorg.libXext pkgs.xorg.libX11
+    pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ];
 
   self = stdenv.mkDerivation {
     name = "nvidia-x11-${version}${nameSuffix}";
@@ -70,7 +72,8 @@ let
     dontStrip = true;
     dontPatchELF = true;
 
-    libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ];
+    libPath = libPathFor pkgs;
+    libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux);
 
     nativeBuildInputs = [ perl nukeReferences ]
       ++ optionals (!libsOnly) kernel.moduleBuildDependencies;
diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index 84890b569163..8aa518ed1d01 100644
--- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -9,16 +9,14 @@
 , patchelf
 , getent
 , buildPackages
+, perl
 , withSelinux ? false, libselinux
 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
 }:
 
-let
-  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
-
-in stdenv.mkDerivation rec {
-  version = "239.20190219";
+stdenv.mkDerivation rec {
+  version = "242";
   name = "systemd-${version}";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -27,27 +25,9 @@ in stdenv.mkDerivation rec {
     owner = "NixOS";
     repo = "systemd";
     rev = "nixos-v${version}";
-    sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x";
+    sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8";
   };
 
-  prePatch = let
-      # Upstream's maintenance branches are still too intrusive:
-      # https://github.com/systemd/systemd-stable/tree/v239-stable
-      patches-deb = fetchurl {
-        # This URL should point to a stable location that does not easily
-        # disappear.  In the past we were using `mirror://debian` but that
-        # eventually causes the files to disappear.  While that was a good sign
-        # for us to update our patch collection it does break reproducibility.
-        name = "systemd-debian-patches.tar.xz";
-        url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz;
-        sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg";
-      };
-      # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*
-    in ''
-      tar xf ${patches-deb}
-      patches="$patches $(cat debian/patches/series | grep -v '^debian/' | sed 's|^|debian/patches/|')"
-    '';
-
   outputs = [ "out" "lib" "man" "dev" ];
 
   nativeBuildInputs =
@@ -56,6 +36,9 @@ in stdenv.mkDerivation rec {
       coreutils # meson calls date, stat etc.
       glibcLocales
       patchelf getent m4
+      perl # to patch the libsystemd.so and remove dependencies on aarch64
+
+      (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]))
     ];
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
@@ -65,17 +48,24 @@ in stdenv.mkDerivation rec {
       stdenv.lib.optional withLibseccomp libseccomp ++
     [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
-      # This is actually native, but we already pull it from buildPackages
-      pythonLxmlEnv
     ] ++ stdenv.lib.optional withSelinux libselinux;
 
   #dontAddPrefix = true;
 
   mesonFlags = [
+    "-Ddbuspolicydir=${placeholder "out"}/etc/dbus-1/system.d"
+    "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services"
+    "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
+    "-Dpamconfdir=${placeholder "out"}/etc/pam.d"
+    "-Drootprefix=${placeholder "out"}"
+    "-Drootlibdir=${placeholder "lib"}/lib"
+    "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig"
+    "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig"
     "-Dloadkeys-path=${kbd}/bin/loadkeys"
     "-Dsetfont-path=${kbd}/bin/setfont"
     "-Dtty-gid=3" # tty in NixOS has gid 3
-    # "-Dtests=" # TODO
+    # while we do not run tests we should also not build them. Removes about 600 targets
+    "-Dtests=false"
     "-Dlz4=true"
     "-Dhostnamed=true"
     "-Dnetworkd=true"
@@ -92,6 +82,7 @@ in stdenv.mkDerivation rec {
     "-Dquotacheck=false"
     "-Dldconfig=false"
     "-Dsmack=true"
+    "-Db_pie=true"
     "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
     "-Dsystem-gid-max=499"
     # "-Dtime-epoch=1"
@@ -113,19 +104,10 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-    mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
-    mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
-    mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
-    mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
-    mesonFlagsArray+=(-Drootprefix=$out)
-    mesonFlagsArray+=(-Drootlibdir=$lib/lib)
-    mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
-    mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
-
     export LC_ALL="en_US.UTF-8";
     # FIXME: patch this in systemd properly (and send upstream).
     # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
-    for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
+    for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
       test -e $i
       substituteInPlace $i \
         --replace /usr/bin/getent ${getent}/bin/getent \
@@ -139,14 +121,8 @@ in stdenv.mkDerivation rec {
         --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
     done
 
-    for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
-      substituteInPlace $i \
-        --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
-    done
-
-    for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
-      substituteInPlace $i \
-        --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
+    for dir in tools src/resolve test src/test; do
+      patchShebangs $dir
     done
 
     substituteInPlace src/journal/catalog.c \
@@ -207,13 +183,37 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib
+  # output. The result of that is a dependency cycle between $out and $lib.
+  # Thus nix (rightfully) marks the build as failed. That reference originates
+  # from an array of strings (catalog_file_dirs) in systemd
+  # (src/src/journal/catalog.{c,h}).  The only consumer (as of v242) of the
+  # symbol is the main function of journalctl.  Still libsystemd.so contains
+  # the VALUE but not the symbol.  Systemd seems to be properly using function
+  # & data sections together with the linker flags to garbage collect unused
+  # sections (-Wl,--gc-sections).  For unknown reasons those flags do not
+  # eliminate the unused string constants, in this case on aarch64-linux. The
+  # hacky way is to just remove the reference after we finished compiling.
+  # Since it can not be used (there is no symbol to actually refer to it) there
+  # should not be any harm.  It is a bit odd and I really do not like starting
+  # these kind of hacks but there doesn't seem to be a straight forward way at
+  # this point in time.
+  # The reference will be replaced by the same reference the usual nukeRefs
+  # tooling uses.  The standard tooling can not / should not be uesd since it
+  # is a bit too excessive and could potentially do us some (more) harm.
+  postFixup = ''
+    nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,")
+    cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp
+    mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so)
+  '';
+
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
   # fine, of course.)  It should be increased whenever systemd changes
   # in a backwards-incompatible way.  If the interface version of two
   # systemd builds is the same, then we can switch between them at
   # runtime; otherwise we can't and we need to reboot.
-  passthru.interfaceVersion = 2;
+  passthru.interfaceVersion = 3;
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/systemd;
diff --git a/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix b/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix
index 37af3c92ea53..29e3fd2e2a8d 100644
--- a/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/udisks-glue/default.nix
@@ -19,5 +19,7 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [pSub];
     license = stdenv.lib.licenses.bsd2;
+    broken = true;
+    hydraPlatforms = [];
   };
 }
diff --git a/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix b/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix
index 03c48867b342..60bf2b9bc242 100644
--- a/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/udisks/1-default.nix
@@ -40,5 +40,7 @@ stdenv.mkDerivation rec {
     description = "A daemon and command-line utility for querying and manipulating storage devices";
     platforms = platforms.linux;
     license = with licenses; [ gpl2 lgpl2Plus ];
+    broken = true;
+    hydraPlatforms = [];
   };
 }
diff --git a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
index 5e20f112fee2..b422fe2c3222 100644
--- a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix
@@ -130,6 +130,9 @@ let
 
         # Remove tests because they add a runtime dependency on gcc
         rm -rf $out/share/zfs/zfs-tests
+
+        # Add Bash completions.
+        install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs
       '';
 
       outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
diff --git a/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix b/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix
index 416ae7624c33..4fb92569a47a 100644
--- a/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/nixpkgs/pkgs/os-specific/windows/mingwrt/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "mingwrt-5.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
-    sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91p0";
+    url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz";
+    sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";
   };
 
   meta = {
diff --git a/nixpkgs/pkgs/servers/apache-kafka/default.nix b/nixpkgs/pkgs/servers/apache-kafka/default.nix
index 8b65fa65f22b..dca2c0721856 100644
--- a/nixpkgs/pkgs/servers/apache-kafka/default.nix
+++ b/nixpkgs/pkgs/servers/apache-kafka/default.nix
@@ -39,9 +39,9 @@ let
       sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0";
     };
     "2.2" = {
-      kafkaVersion = "2.2.0";
+      kafkaVersion = "2.2.1";
       scalaVersion = "2.12";
-      sha256 = "09q028kagpkzrvfdb040z8q9mspv8n7f2igrd1cs73v7mr7n42d0";
+      sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv";
     };
   };
 in
diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix
index 58893f83a923..1d0e28ac9f28 100644
--- a/nixpkgs/pkgs/servers/atlassian/crowd.nix
+++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "0bs3l2s5f8ymyvvxn6z3wwccbvac42giahmfqiam51m9zkfhf0rk";
+    sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix
index 99888c488ac2..9b83a7e4c3a9 100644
--- a/nixpkgs/pkgs/servers/atlassian/jira.nix
+++ b/nixpkgs/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "8.1.0";
+  version = "8.2.1";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0mi1xknly44haf7gls3k212fx1dsl8k35rq82a1b3zj27kynwqr3";
+    sha256 = "1556hliywjiz6977249mlgxaq5xzpzq3xm9bcg9vk57s1hsv175i";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 223e2ff8f5ec..09c1ec3592d0 100644
--- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -302,7 +302,7 @@
     "hook" = ps: with ps; [  ];
     "horizon" = ps: with ps; [  ];
     "hp_ilo" = ps: with ps; [  ];
-    "html5" = ps: with ps; [ aiohttp-cors ];
+    "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "htu21d" = ps: with ps; [  ];
     "huawei_lte" = ps: with ps; [  ];
diff --git a/nixpkgs/pkgs/servers/jellyfin/default.nix b/nixpkgs/pkgs/servers/jellyfin/default.nix
index e481c7aaa037..45f58cc7ab92 100644
--- a/nixpkgs/pkgs/servers/jellyfin/default.nix
+++ b/nixpkgs/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "jellyfin";
-  version = "10.3.4";
+  version = "10.3.5";
 
   # Impossible to build anything offline with dotnet
   src = fetchurl {
     url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
-    sha256 = "0wc69dnc3bvzn26nw9ql814y2v7rypjlrw9iqkdganba9pkxa74j";
+    sha256 = "12asyrj2ax699gaf8402xfx049n6x0v8j5sba229vw1s66c2m8j2";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index acc3061e3f09..0efbefd6cd24 100644
--- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, python3
+{ lib, stdenv, python3, openssl
 , enableSystemd ? stdenv.isLinux
 }:
 
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "0.99.5.2";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c1kf9zq7cg9scwnvph4vwk449gypbprmdjzrzrg0wp1rcc8h3gn";
+    sha256 = "1n8hv0zd818z4fx39yz6svb07zsbrh8fd6wfmgvhdxhp6p1vl0wq";
   };
 
   patches = [
@@ -72,7 +72,7 @@ in buildPythonApplication rec {
     unpaddedbase64
   ] ++ lib.optional enableSystemd systemd;
 
-  checkInputs = [ mock parameterized ];
+  checkInputs = [ mock parameterized openssl ];
 
   checkPhase = ''
     PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
diff --git a/nixpkgs/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix
index b7770019f859..1ebd852380c4 100644
--- a/nixpkgs/pkgs/servers/miniflux/default.nix
+++ b/nixpkgs/pkgs/servers/miniflux/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "miniflux";
-  version = "2.0.15";
+  version = "2.0.16";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1k53dkmd41x5h81arb2fs5s9yb6sy6113nbbzls6dc179slfg9zj";
+    sha256 = "09fwhbcpp84l5lw4zizm46ssri6irzvjx2w7507a1xhp6iq73p2d";
   };
 
-  modSha256 = "0n5j4rns2w1klgrf5jz0bng9cih9aifjx55hhkf4dfj1x4wsxjdj";
+  modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr";
 
   doCheck = true;
 
diff --git a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
index eaa85e69bec0..05f572c8caaa 100644
--- a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper coreutils ];
 
   installPhase = ''
     mkdir $out
@@ -51,8 +51,17 @@ stdenv.mkDerivation rec {
                bin/sstablescrub \
                bin/sstableupgrade \
                bin/sstableutil \
-               bin/sstableverify \
-               tools/bin/cassandra-stress \
+               bin/sstableverify; do
+      # Check if file exists because some don't exist across all versions
+      if [ -f $out/$cmd ]; then
+        wrapProgram $out/bin/$(basename "$cmd") \
+          --suffix-each LD_LIBRARY_PATH : ${libPath} \
+          --prefix PATH : ${binPath} \
+          --set JAVA_HOME ${jre}
+      fi
+    done
+
+    for cmd in tools/bin/cassandra-stress \
                tools/bin/cassandra-stressd \
                tools/bin/sstabledump \
                tools/bin/sstableexpiredblockers \
@@ -62,11 +71,9 @@ stdenv.mkDerivation rec {
                tools/bin/sstablerepairedset \
                tools/bin/sstablesplit \
                tools/bin/token-generator; do
-
-      # check if file exists because some bin tools don't exist across all
-      # cassandra versions
+      # Check if file exists because some don't exist across all versions
       if [ -f $out/$cmd ]; then
-        makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \
+        makeWrapper $out/$cmd $out/bin/$(basename "$cmd") \
           --suffix-each LD_LIBRARY_PATH : ${libPath} \
           --prefix PATH : ${binPath} \
           --set JAVA_HOME ${jre}
diff --git a/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix
index 082506cddfd7..eda4b1238585 100644
--- a/nixpkgs/pkgs/servers/plex/raw.nix
+++ b/nixpkgs/pkgs/servers/plex/raw.nix
@@ -8,14 +8,14 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.15.6.1079-78232c603";
+  version = "1.15.8.1198-eadbcbb45";
   pname = "plexmediaserver";
   name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "1fvj58b91227wig51hi98rg9r48rdnd8s32xdajjgspxy923mp5a";
+    sha256 = "1za33fcga5ysxcj8szlqzriihzcvlx9jxlnsbygh819arbbbpli3";
   };
 
   outputs = [ "out" "basedb" ];
diff --git a/nixpkgs/pkgs/servers/pulseaudio/default.nix b/nixpkgs/pkgs/servers/pulseaudio/default.nix
index 06693303ff92..13b5d4c3c9f0 100644
--- a/nixpkgs/pkgs/servers/pulseaudio/default.nix
+++ b/nixpkgs/pkgs/servers/pulseaudio/default.nix
@@ -59,7 +59,21 @@ stdenv.mkDerivation rec {
       ++ lib.optionals bluetoothSupport [ bluez5 sbc ]
       ++ lib.optional remoteControlSupport lirc
       ++ lib.optional zeroconfSupport  avahi
-    );
+  );
+
+  patches = [
+    # The following two patches fix alsalib headers move, remove after the next release
+    (fetchpatch {
+      name = "alsa-asoundlib-include.patch";
+      url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch";
+      sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71";
+    })
+    (fetchpatch {
+      name = "alsa-use-case-include.patch";
+      url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch";
+      sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb";
+    })
+  ];
 
   preConfigure = ''
     # Performs and autoreconf
@@ -117,19 +131,6 @@ stdenv.mkDerivation rec {
      --prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "alsa-asoundlib-include.patch";
-      url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/993d3fd89e5611997f1e165bf03edefb0204b0a4.patch";
-      sha256 = "17icnf8026947j1dqw4k16f91vy6zyg7q41zv2j6pxh9fncb1s71";
-    })
-    (fetchpatch {
-      name = "alsa-use-case-include.patch";
-      url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch";
-      sha256 = "0jccpc0dgkb0v4xrkyca2pm2k4i6pvahs9bq4hbg34173p23g5nb";
-    })
-  ];
-
   meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix
index 0b8a63e63f6a..7dcc6cbe686d 100644
--- a/nixpkgs/pkgs/servers/samba/4.x.nix
+++ b/nixpkgs/pkgs/servers/samba/4.x.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
-, fetchpatch
+{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
+, fetchpatch, fixDarwinDylibNames
 , docbook_xml_dtd_42, readline
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
 , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
       ./4.x-fix-makeflags-parsing.patch
     ];
 
+  nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
+
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline popt iniparser jansson
@@ -60,6 +62,9 @@ stdenv.mkDerivation rec {
     sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
 
     patchShebangs ./buildtools/bin
+  '' + optionalString stdenv.isDarwin ''
+     substituteInPlace libcli/dns/wscript_build \
+       --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'"
   '';
 
   configureFlags =
@@ -70,6 +75,7 @@ stdenv.mkDerivation rec {
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
+      "--disable-rpath"
     ]
     ++ [(if enableDomainController
          then "--with-experimental-mit-ad-dc"
diff --git a/nixpkgs/pkgs/servers/sql/mysql/5.5.x.nix b/nixpkgs/pkgs/servers/sql/mysql/5.5.x.nix
index d5fbe0bf2494..e089640a5b6f 100644
--- a/nixpkgs/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/nixpkgs/pkgs/servers/sql/mysql/5.5.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
-, cctools, CoreServices }:
+{ stdenv, fetchpatch, fetchurl, cmake, bison, ncurses, openssl
+, readline, zlib, perl, cctools, CoreServices }:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -13,10 +13,17 @@ self = stdenv.mkDerivation rec {
     sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi";
   };
 
-  patches = if stdenv.isCygwin then [
-    ./5.5.17-cygwin.patch
-    ./5.5.17-export-symbols.patch
-  ] else null;
+  patches =
+    # Minor type error that is a build failure as of clang 6.
+    stdenv.lib.optional stdenv.cc.isClang (fetchpatch {
+      url = "https://svn.freebsd.org/ports/head/databases/mysql55-server/files/patch-sql_sql_partition.cc?rev=469888";
+      extraPrefix = "";
+      sha256 = "09sya27z3ir3xy5mrv3x68hm274594y381n0i6r5s627x71jyszf";
+    }) ++
+    stdenv.lib.optionals stdenv.isCygwin [
+      ./5.5.17-cygwin.patch
+      ./5.5.17-export-symbols.patch
+    ];
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
     ln -s /bin/ps $TMPDIR/ps
@@ -51,7 +58,10 @@ self = stdenv.mkDerivation rec {
     "-DINSTALL_SQLBENCHDIR="
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
+  NIX_CFLAGS_COMPILE =
+    stdenv.lib.optionals stdenv.cc.isGNU [ "-fpermissive" ] # since gcc-7
+    ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-c++11-narrowing" ]; # since clang 6
+
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
@@ -78,6 +88,6 @@ self = stdenv.mkDerivation rec {
       artistic1 bsd0 bsd2 bsd3 bsdOriginal
       gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib
     ];
-    broken = stdenv.isAarch64 && stdenv.isDarwin;
+    broken = stdenv.isAarch64;
   };
 }; in self
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
index d46f0cc6317a..701670187b60 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
@@ -38,7 +38,7 @@ let
 
     enableParallelBuilding = !stdenv.isDarwin;
 
-    makeFlags = [ "world" ];
+    buildFlags = [ "world" ];
 
     NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ];
 
@@ -60,6 +60,7 @@ let
         (if atLeast "9.6" then ./patches/less-is-more-96.patch             else ./patches/less-is-more.patch)
         (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch       else ./patches/hardcode-pgxs-path.patch)
         ./patches/specify_pkglibdir_at_runtime.patch
+        ./patches/findstring.patch
       ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch;
 
     installTargets = [ "install-world" ];
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
new file mode 100644
index 000000000000..2cc9d7060f6b
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "pg_bigm";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "mirror://osdn/pgbigm/66565/${pname}-${version}-20161011.tar.gz";
+    sha256 = "1jp30za4bhwlas0yrhyjs9m03b1sj63km61xnvcbnh0sizyvhwis";
+  };
+
+  buildInputs = [ postgresql ];
+
+  makeFlags = [ "USE_PGXS=1" ];
+
+  installPhase = ''
+    mkdir -p $out/bin    # For buildEnv to setup proper symlinks. See #22653
+    mkdir -p $out/{lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Text similarity measurement and index searching based on bigrams";
+    homepage = "https://pgbigm.osdn.jp/";
+    maintainers = [ maintainers.marsam ];
+    platforms = postgresql.meta.platforms;
+    license = licenses.postgresql;
+  };
+}
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
new file mode 100644
index 000000000000..b835141e2ca7
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "pg-safeupdate";
+  version = "1.2";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "eradman";
+    repo   = pname;
+    rev    = version;
+    sha256 = "010m57jcv5v8pyfm1cqs3a306y750lvnvla9m5d98v5vdx3349jg";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653
+    install -D safeupdate.so -t $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE";
+    homepage    = "https://github.com/eradman/pg-safeupdate";
+    platforms   = postgresql.meta.platforms;
+    license     = licenses.postgresql;
+  };
+}
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
new file mode 100644
index 000000000000..b4f85c4c53f7
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "temporal_tables";
+  version = "1.2.0";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "mlt";
+    repo   = pname;
+    rev    = "6cc86eb03d618d6b9fc09ae523f1a1e5228d22b5";
+    sha256 = "0ykv37rm511n5955mbh9dcp7pgg88z1nwgszav7z6pziaj3nba8x";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Temporal Tables PostgreSQL Extension ";
+    homepage    = https://github.com/mlt/temporal_tables;
+    maintainers = with maintainers; [ ggpeti ];
+    platforms   = postgresql.meta.platforms;
+    license     = licenses.bsd2;
+  };
+}
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 055195c1b045..17270e34f759 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "1wg95ryr5z55aghlqaz0jhz6rliinvfin2i4xpqwg7ir6nz773qm";
+    sha256 = "1q3c4qsy4vb00a4p15km4w5d5xcppigf7rp4mqr3wln7i4d4lvnx";
   };
 
   # Fix the install phase which tries to install into the pgsql extension dir,
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
index f3d2ac68884d..ebce90d34518 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix
@@ -9,6 +9,8 @@ self: super: {
 
     pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { };
 
+    pg_bigm = super.callPackage ./ext/pg_bigm.nix { };
+
     pg_repack = super.callPackage ./ext/pg_repack.nix { };
 
     pg_similarity = super.callPackage ./ext/pg_similarity.nix { };
@@ -35,6 +37,8 @@ self: super: {
 
     pipelinedb = super.callPackage ./ext/pipelinedb.nix { };
 
+    temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
+
     timescaledb = super.callPackage ./ext/timescaledb.nix { };
 
     tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
@@ -44,4 +48,6 @@ self: super: {
     pgrouting = super.callPackage ./ext/pgrouting.nix { };
 
     pg_partman = super.callPackage ./ext/pg_partman.nix { };
+
+    pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
 }
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/patches/findstring.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/findstring.patch
new file mode 100644
index 000000000000..959bf6a6caa4
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/findstring.patch
@@ -0,0 +1,59 @@
+From: Matthew Bauer <mjbauer95@gmail.com>
+Date: Wed, 29 May 2019 22:51:52 -0400
+Subject: [PATCH] Add /postgresql suffix for Nix outputs
+
+Nix outputs put the `name' in each store path like
+/nix/store/...-<name>. This was confusing the Postgres make script
+because it thought its data directory already had postgresql in its
+directory. This lead to Postgres installing all of its fils in
+$out/share. To fix this, we just look for postgres or psql in the part
+after the / using make's notdir.
+
+---
+From: Matthew Bauer <mjbauer95@gmail.com>
+Date: Wed, 29 May 2019 22:51:52 -0400
+Subject: [PATCH] Add /postgresql suffix for Nix outputs
+
+Nix outputs put the `name' in each store path like
+/nix/store/...-<name>. This was confusing the Postgres make script
+because it thought its data directory already had postgresql in its
+directory. This lead to Postgres installing all of its fils in
+$out/share. To fix this, we just look for postgres or psql in the part
+after the / using make's notdir.
+
+---
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index b9d86acaa9..bce05464c3 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -102,15 +102,15 @@ datarootdir := @datarootdir@
+ bindir := @bindir@
+ 
+ datadir := @datadir@
+-ifeq "$(findstring pgsql, $(datadir))" ""
+-ifeq "$(findstring postgres, $(datadir))" ""
++ifeq "$(findstring pgsql, $(notdir $(datadir)))" ""
++ifeq "$(findstring postgres, $(notdir $(datadir)))" ""
+ override datadir := $(datadir)/postgresql
+ endif
+ endif
+ 
+ sysconfdir := @sysconfdir@
+-ifeq "$(findstring pgsql, $(sysconfdir))" ""
+-ifeq "$(findstring postgres, $(sysconfdir))" ""
++ifeq "$(findstring pgsql, $(notdir $(sysconfdir)))" ""
++ifeq "$(findstring postgres, $(notdir $(sysconfdir)))" ""
+ override sysconfdir := $(sysconfdir)/postgresql
+ endif
+ endif
+@@ -136,8 +136,8 @@ endif
+ mandir := @mandir@
+ 
+ docdir := @docdir@
+-ifeq "$(findstring pgsql, $(docdir))" ""
+-ifeq "$(findstring postgres, $(docdir))" ""
++ifeq "$(findstring pgsql, $(notdir $(docdir)))" ""
++ifeq "$(findstring postgres, $(notdir $(docdir)))" ""
+ override docdir := $(docdir)/postgresql
+ endif
+ endif
diff --git a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
index ac0348482ead..eafe916d02ca 100644
--- a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.3.7";
+  version = "2.3.8";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-    sha256 = "1kv2jy47darj6lysyxyaw5d5z5kwqdalbpv0hsg8i7zav09dw8z2";
+    sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq";
   };
 
   outputs = [ "out" ];
diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 34aa18465c86..1f5de9dba105 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -1405,11 +1405,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
-    name = "xcalc-1.0.7";
+    name = "xcalc-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2;
-      sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh";
+      url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2;
+      sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 8a1eef6ac1d3..6bcf4d08f386 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
@@ -699,4 +699,15 @@ self: super:
       rm $out/bin/xkeystone
     '';
   });
+
+  xcalc = super.xcalc.overrideAttrs (attrs: {
+    configureFlags = attrs.configureFlags or [] ++ [
+      "--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
+    ];
+    nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ];
+    postInstall = ''
+      wrapProgram $out/bin/xcalc \
+        --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults
+    '';
+  });
 }
diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 5326ab5a55a6..6ae5443f2ed8 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -28,7 +28,7 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
-mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
+mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
 mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
 mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 437ee86fcc63..9e39248c1d2f 100644
--- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-06-08";
+  version = "2019-06-15";
   name = "oh-my-zsh-${version}";
-  rev = "d69bad8eb4157e5fd5c1a4ce98f93cf522477a8c";
+  rev = "fec2e56bc9361edb8d403d231117686630c1b85b";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0j6x1kzki3k5p75lr50l48c7wdgi59h8l9lvixvkzp5bknsmsmrd";
+    sha256 = "0r94ccydajgylp7sj709ww7v6y4rnrxqk4g5nd934h6xk86v2c7j";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/nixpkgs/pkgs/tools/X11/xpra/default.nix b/nixpkgs/pkgs/tools/X11/xpra/default.nix
index 1d6ea45c9c5e..efafbb3692ed 100644
--- a/nixpkgs/pkgs/tools/X11/xpra/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xpra/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
 , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
 , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
-, ffmpeg, x264, libvpx, libwebp
+, ffmpeg_4, x264, libvpx, libwebp, x265
 , libfakeXinerama
 , gst_all_1, pulseaudio, gobject-introspection
 , pam }:
@@ -14,11 +14,11 @@ let
   xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
   pname = "xpra";
-  version = "2.3.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "https://xpra.org/src/${pname}-${version}.tar.xz";
-    sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija";
+    sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x";
   };
 
   patches = [
@@ -28,7 +28,11 @@ in buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ];
+  postPatch = ''
+    substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security'
+  '';
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
   buildInputs = with xorg; [
     libX11 xorgproto libXrender libXi
     libXtst libXfixes libXcomposite libXdamage
@@ -36,9 +40,9 @@ in buildPythonApplication rec {
     ] ++ [
     cython
 
-    pango cairo gdk_pixbuf atk gtk3 glib
+    pango cairo gdk_pixbuf atk.out gtk3 glib
 
-    ffmpeg libvpx x264 libwebp
+    ffmpeg_4 libvpx x264 libwebp x265
 
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
@@ -47,11 +51,13 @@ in buildPythonApplication rec {
     gst_all_1.gst-libav
 
     pam
+    gobject-introspection
   ];
-
   propagatedBuildInputs = with python3.pkgs; [
     pillow rencode pycrypto cryptography pycups lz4 dbus-python
-    netifaces numpy websockify pygobject3 pycairo gst-python pam
+    netifaces numpy pygobject3 pycairo gst-python pam
+    pyopengl paramiko opencv python-uinput pyxdg
+    ipaddress idna
   ];
 
   NIX_CFLAGS_COMPILE = [
@@ -64,6 +70,9 @@ in buildPythonApplication rec {
     "--without-strict"
     "--with-gtk3"
     "--without-gtk2"
+    # Override these, setup.py checks for headers in /usr/* paths
+    "--with-pam"
+    "--with-vsock"
   ];
 
   preFixup = ''
@@ -76,6 +85,8 @@ in buildPythonApplication rec {
 
   doCheck = false;
 
+  enableParallelBuilding = true;
+
   passthru = { inherit xf86videodummy; };
 
   meta = {
@@ -85,8 +96,6 @@ in buildPythonApplication rec {
     description = "Persistent remote applications for X";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    # https://github.com/NixOS/nixpkgs/pull/48872#issuecomment-433559636
-    broken = true;
     maintainers = with maintainers; [ tstrobel offline numinit ];
   };
 }
diff --git a/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch b/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch
index c50ec28c35e2..ac8107235be5 100644
--- a/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch
+++ b/nixpkgs/pkgs/tools/X11/xpra/fix-paths.patch
@@ -9,25 +9,26 @@
      cython_add(Extension("xpra.client.gtk3.cairo_workaround",
                  ["xpra/client/gtk3/cairo_workaround.pyx"],
                  **pkgconfig(pycairo)
---- a/xpra/client/gtk3/cairo_workaround.pyx
-+++ b/xpra/client/gtk3/cairo_workaround.pyx
-@@ -65,7 +65,7 @@
-     void cairo_surface_flush (cairo_surface_t *surface)
-     void cairo_surface_mark_dirty (cairo_surface_t *surface)
- 
--cdef extern from "pycairo/pycairo.h":
-+cdef extern from "py3cairo.h":
-     ctypedef struct Pycairo_CAPI_t:
-         pass
-     ctypedef struct PycairoSurface:
+@@ -2363,10 +2363,7 @@
+     v4l2_pkgconfig = pkgconfig()
+     #fuly warning: cython makes this difficult,
+     #we have to figure out if "device_caps" exists in the headers:
+-    ENABLE_DEVICE_CAPS = False
+-    if os.path.exists("/usr/include/linux/videodev2.h"):
+-        hdata = open("/usr/include/linux/videodev2.h").read()
+-        ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0
++    ENABLE_DEVICE_CAPS = True
+     kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS}
+     make_constants("xpra", "codecs", "v4l2", "constants", **kwargs)
+     cython_add(Extension("xpra.codecs.v4l2.pusher",
 --- a/xpra/x11/bindings/keyboard_bindings.pyx
 +++ b/xpra/x11/bindings/keyboard_bindings.pyx
 @@ -19,7 +19,7 @@
  
  DEF PATH_MAX = 1024
- DEF DFLT_XKB_RULES_FILE = "base"
--DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb"
-+DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb"
+ DEF DFLT_XKB_RULES_FILE = b"base"
+-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
++DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"
  
  ###################################
  # Headers, python magic
diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
new file mode 100644
index 000000000000..e04e49c62e74
--- /dev/null
+++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "eksctl";
+  version = "0.1.35";
+
+  src = fetchFromGitHub {
+    owner = "weaveworks";
+    repo = "eksctl";
+    rev = version;
+    sha256 = "0b3s7vh85k68wawmsdp96q9l4yhikwhyjn1c7cwxys0aia4i8wkv";
+  };
+
+  goPackagePath = "github.com/weaveworks/eksctl";
+
+  subPackages = [ "cmd/eksctl" ];
+
+  buildFlags =
+  ''
+    -ldflags=-s
+    -ldflags=-w
+    -tags netgo
+    -tags release
+  '';
+
+  postInstall =
+  ''
+    mkdir -p "$bin/share/"{bash-completion/completions,zsh/site-functions}
+    $bin/bin/eksctl completion bash > "$bin/share/bash-completion/completions/eksctl"
+    $bin/bin/eksctl completion zsh > "$bin/share/zsh/site-functions/_eksctl"
+  '';
+
+  meta = with lib; {
+    description = "A CLI for Amazon EKS";
+    homepage = "https://github.com/weaveworks/eksctl";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ xrelkd ];
+  };
+}
diff --git a/nixpkgs/pkgs/tools/admin/iamy/default.nix b/nixpkgs/pkgs/tools/admin/iamy/default.nix
index cfe336a7e830..d4ee4d612932 100644
--- a/nixpkgs/pkgs/tools/admin/iamy/default.nix
+++ b/nixpkgs/pkgs/tools/admin/iamy/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   name = "iamy-${version}";
-  version = "2.1.1";
+  version = "2.3.2";
 
   goPackagePath = "github.com/99designs/iamy";
 
@@ -10,9 +10,15 @@ buildGoPackage rec {
     owner = "99designs";
     repo = "iamy";
     rev = "v${version}";
-    sha256 = "0b55hxcvgil8rl6zh2kyndfi7s5nzclawjb0sby14wpys3v08bjf";
+    sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z";
   };
 
+  modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl";
+
+  buildFlagsArray = [''-ldflags=
+    -X main.Version=v${version} -s -w
+  ''];
+
   meta = with stdenv.lib; {
     description = "A cli tool for importing and exporting AWS IAM configuration to YAML files";
     homepage = https://github.com/99designs/iamy;
diff --git a/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/nixpkgs/pkgs/tools/backup/grab-site/default.nix
index 2947c5fc1b47..e30b0af45a52 100644
--- a/nixpkgs/pkgs/tools/backup/grab-site/default.nix
+++ b/nixpkgs/pkgs/tools/backup/grab-site/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python3Packages, fetchFromGitHub }:
 
 python3Packages.buildPythonApplication rec {
-  version = "2.1.15";
+  version = "2.1.16";
   name = "grab-site-${version}";
 
   src = fetchFromGitHub {
     rev = "${version}";
     owner = "ArchiveTeam";
     repo = "grab-site";
-    sha256 = "1h3ajsj1c2wlxji1san97vmjd9d97dv0rh0jw1p77irkcvhzfpj8";
+    sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z";
   };
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
index 015408351fde..3a29d272b15b 100644
--- a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "android-file-transfer";
-  version = "3.8";
+  version = "3.9";
 
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
     rev = "v${version}";
-    sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc";
+    sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3";
   };
 
   nativeBuildInputs = [ cmake readline pkgconfig ];
diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index ebf5291f43a6..dd44f16c3fec 100644
--- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.13.11";
+  version = "1.14.0";
   name    = "bindfs-${version}";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${name}.tar.gz";
-    sha256 = "0ayadwlc6j1ba0n0dkry4iyp49nxkkj5l4dazzqybl5d5c4n605b";
+    sha256 = "1f1znixdaz4wnr9j6rkrplhbnkz7pdw9927yfikbjvxz8cl6qsdz";
   };
 
   dontStrip = true;
diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
index c06b5eeff4b9..babb3d844fe9 100644
--- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "e2fsprogs";
-  version = "1.45.1";
+  version = "1.45.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0zi8jz28hs66vhjvrfxmkmr1via19aygcbzpnw3lp0crhizaasgf";
+    sha256 = "1bhqljgcngys1diaxh7rnxc85d1jsril8xd7bach9imdjwr1wlm8";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index c4d52462906e..a5f5f632c682 100644
--- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, fuse3 }:
 
 stdenv.mkDerivation rec {
-  name = "fuse-overlayfs-${version}";
-  version = "0.3";
+  pname = "fuse-overlayfs";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "containers";
-    repo = "fuse-overlayfs";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1cch2j397hydrhh62faqa663vas75qbmylqd06fk6nafasa3ri0l";
+    sha256 = "1hm1swgv9fi4kdwqssb6rh83i62qyfzv0yrh0z73kwrwdbqbg8m9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/nixpkgs/pkgs/tools/graphics/grim/default.nix b/nixpkgs/pkgs/tools/graphics/grim/default.nix
index 813c1c987807..b84f498fa2f0 100644
--- a/nixpkgs/pkgs/tools/graphics/grim/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/grim/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }:
 
 stdenv.mkDerivation rec {
-  name = "grim-${version}";
-  version = "1.1";
+  pname = "grim";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "emersion";
-    repo = "grim";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz";
+    sha256 = "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
new file mode 100644
index 000000000000..ecf982c21cda
--- /dev/null
+++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
@@ -0,0 +1,28 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "svgbob";
+  version = "unstable-2018-10-05";
+
+  src = fetchFromGitHub {
+    owner = "ivanceras";
+    repo = pname;
+    rev = "43fb0364e989d0e9a7656b148c947d47cc769622";
+    sha256 = "1imjj57dx1af3wrs214yzaa2qfk8ld00nj3nx4z450gw2xjjj1gw";
+  };
+
+  sourceRoot = "source/svgbob_cli";
+
+  cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd";
+
+  # Test tries to build outdated examples
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Convert your ascii diagram scribbles into happy little SVG";
+    homepage = "https://github.com/ivanceras/svgbob";
+    license = licenses.asl20;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix
index 2d14c0809721..56fd53502444 100644
--- a/nixpkgs/pkgs/tools/graphics/wallutils/default.nix
+++ b/nixpkgs/pkgs/tools/graphics/wallutils/default.nix
@@ -4,16 +4,16 @@
 
 buildGoModule rec {
   name = "wallutils-${version}";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
     rev = version;
-    sha256 = "1s9k2fwckpm1zpdxywckwbql38h0sp6y9ji88rxss7yjc2g12zaf";
+    sha256 = "095pgvk4yp2l6xgl63qp61rr2dij51awndwrs5ha9vpdd1jqgvfi";
   };
 
-  modSha256 = "0rfmqmm0jld7zrv192dqv7khwb2xm9i77sa1wgr7q6afdhbkrm21";
+  modSha256 = "1kbggry1qrf0nkvysnaky2nl73l5f0bnc4wx0hfr6ifyagfjzy77";
 
   patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];
 
diff --git a/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
index c11fae3888e4..9214edfefb05 100644
--- a/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
+++ b/nixpkgs/pkgs/tools/inputmethods/anthy/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "anthy-9100h";
 
   meta = with stdenv.lib; {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
-    homepage    = http://sourceforge.jp/projects/anthy/;
+    homepage    = "https://anthy.osdn.jp/";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ ericsagnes ];
     platforms   = platforms.linux;
   };
 
   src = fetchurl {
-    url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz";
+    url = "mirror://osdn/anthy/37536/${name}.tar.gz";
     sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj";
   };
 }
diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix
index cd8f975bdd14..8b1cf6318e38 100644
--- a/nixpkgs/pkgs/tools/misc/broot/default.nix
+++ b/nixpkgs/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.7.5";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pwbz4ac2zb40g6q6ykzhzfbn0jr5xarkvgw9wxv455mbi67rd6y";
+    sha256 = "0xgjpdy12b77hgf0vfgs2ayxaajjv8vs0v8fn4rnrgn3hz8ldhyc";
   };
 
-  cargoSha256 = "0yph5mwxn6arfbxbvri5qa7wzwj1q0s675j6vblia9akn02fyqd9";
+  cargoSha256 = "1hsrp9xbi6bj3461y58hmzfwakx4vakpzkjvi6174gy8xq7cdvg1";
 
   meta = with stdenv.lib; {
     description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands";
diff --git a/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
index 9b09fb35cf5a..caefcb835a3f 100644
--- a/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
+++ b/nixpkgs/pkgs/tools/misc/ipad_charge/default.nix
@@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Makefile \
       --replace " -o root -g root" "" \
+      --replace "/usr" "$out" \
+      --replace "/etc/udev" "$out/lib/udev"
+    substituteInPlace *.rules \
       --replace "/usr" "$out"
-    sed "/rules\.d/d" -i Makefile
   '';
 
   enableParallelBuilding = true;
 
   preInstall = ''
-    mkdir -p $out/bin
+    mkdir -p $out/{bin,lib/udev/rules.d}
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
index c3c1d4aa48ba..5e0d0aa80892 100644
--- a/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
+++ b/nixpkgs/pkgs/tools/misc/pgcenter/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "pgcenter";
-  version = "0.6.1";
-
-  goPackagePath = "github.com/lesovsky/pgcenter";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner  = "lesovsky";
     repo   = "pgcenter";
     rev    = "v${version}";
-    sha256 = "12wyi6vc3i0dq76mrvv5r632ks90xppcra5g7rjf54vg4291kycy";
+    sha256 = "0mh0s83gkjhrm9ip5r1bb6y5n0nl1rlh99570yv7p3yvyhmh2292";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj";
 
   meta = with stdenv.lib; {
     homepage = https://pgcenter.org/;
diff --git a/nixpkgs/pkgs/tools/misc/pgcenter/deps.nix b/nixpkgs/pkgs/tools/misc/pgcenter/deps.nix
deleted file mode 100644
index 1b12538155c6..000000000000
--- a/nixpkgs/pkgs/tools/misc/pgcenter/deps.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-[
-
-  {
-    goPackagePath = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev = "v1.0.0";
-      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/jehiah/go-strftime";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jehiah/go-strftime";
-      rev = "1d33003b3869";
-      sha256 = "056zagn4zhmrcqg8y5k5wql01x4ijbxn4pv75bh1bn45by6qx1gv";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/jroimartin/gocui";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jroimartin/gocui";
-      rev = "v0.4.0";
-      sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev = "v1.0.0";
-      sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "v0.0.3";
-      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/nsf/termbox-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nsf/termbox-go";
-      rev = "b66b20ab708e";
-      sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.0";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "v0.0.3";
-      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
-    };
-  }
-
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "v1.0.2";
-      sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
-    };
-  }
-
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "0e37d006457b";
-      sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r";
-    };
-  }
-
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "ee1b12c67af4";
-      sha256 = "0cgp0xzbhg3fr77n2qrfmmsvhc287srnwi4mghwcjdxp6rx0s988";
-    };
-  }
-]
diff --git a/nixpkgs/pkgs/tools/misc/shelldap/default.nix b/nixpkgs/pkgs/tools/misc/shelldap/default.nix
new file mode 100644
index 000000000000..9686955e1dd0
--- /dev/null
+++ b/nixpkgs/pkgs/tools/misc/shelldap/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, perlPackages }:
+perlPackages.buildPerlPackage rec {
+  name = "shelldap-${version}";
+  version = "1.4.0";
+  src = fetchurl {
+    url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
+    sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
+  };
+  buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
+  prePatch = ''
+    touch Makefile.PL
+  '';
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 -t $out/bin shelldap
+    runHook preInstall
+  '';
+  outputs = [ "out" ];
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/mahlon/shelldap/;
+    description = "A handy shell-like interface for browsing LDAP servers and editing their content";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ tobiasBora ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index 495ea3925fd6..9b0f5e477a1c 100644
--- a/nixpkgs/pkgs/tools/misc/z-lua/default.nix
+++ b/nixpkgs/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
     rev = "v${version}";
-    sha256 = "1f8iafv81xsypa78prazq6k2xz8az09kjhl97vn330drxkcpj7i7";
+    sha256 = "01n4x84rpmyjyfga90s2s63gdk17z944hz35fk95qnshc5fapfq8";
   };
 
   dontBuild = true;
diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix
index 9f81e0d57211..98d2625aade9 100644
--- a/nixpkgs/pkgs/tools/networking/mosh/default.nix
+++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig
+{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkgconfig
 , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion
 , libutempter ? null, withUtempter ? stdenv.isLinux }:
 
@@ -15,7 +15,15 @@ stdenv.mkDerivation rec {
     ++ (with perlPackages; [ perl IOTty ])
     ++ lib.optional withUtempter libutempter;
 
-  patches = [ ./ssh_path.patch ./utempter_path.patch ];
+  patches = [
+    ./ssh_path.patch
+    ./utempter_path.patch
+    # Fix w/c++17, ::bind vs std::bind
+    (fetchpatch {
+      url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
+      sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
+    })
+  ];
   postPatch = ''
     substituteInPlace scripts/mosh.pl \
         --subst-var-by ssh "${openssh}/bin/ssh"
diff --git a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
index b22a3f464d3c..8a2dee19b957 100644
--- a/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
+++ b/nixpkgs/pkgs/tools/networking/shadowfox/default.nix
@@ -2,27 +2,21 @@
 
 buildGoModule rec {
   pname = "shadowfox";
-  version = "2.0.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "SrKomodo";
     repo = "shadowfox-updater";
     rev = "v${version}";
-    sha256 = "0j8ljnx281a5nwd3zpw7b25ndsxc26b52glk2hqhm5fh08f9w0d8";
+    sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
   };
 
   goPackagePath = "github.com/SrKomodo/shadowfox-updater";
 
-  modSha256 = "0anxrff09r5aw3a11iph0gigmcbmpfczm8him6ly57ywfzc5c850";
+  modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r";
 
   buildFlags = "--tags release";
 
-  postInstall = ''
-    # Contains compiler package only used by projects CI, and buildGoModule
-    # installs all binaries by default. So we remove this again.
-    rm $out/bin/compiler
-  '';
-
   meta = with stdenv.lib; {
     description = ''
       This project aims at creating a universal dark theme for Firefox while
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 6d0e07d60f98..7ba83b700375 100644
--- a/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -11,7 +11,7 @@ let
 common =
   { lib, stdenv, fetchurl, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
   , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline
-  , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
+  , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
   , busybox-sandbox-shell
   , storeDir
   , stateDir
@@ -37,7 +37,7 @@ common =
       nativeBuildInputs =
         [ pkgconfig ]
         ++ lib.optionals (!is20) [ curl perl ]
-        ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ];
+        ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
 
       buildInputs = [ curl openssl sqlite xz bzip2 ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
@@ -193,4 +193,18 @@ in rec {
     inherit storeDir stateDir confDir boehmgc;
   });
 
+  nixFlakes = lib.lowPrio (callPackage common rec {
+    name = "nix-2.3${suffix}";
+    suffix = "pre20190612_06010ea";
+    src = fetchFromGitHub {
+      owner = "NixOS";
+      repo = "nix";
+      rev = "06010eaf199005a393f212023ec5e8bc97978537";
+      sha256 = "1fq99fmlag5hxvgzxrclgfsnc1fhhfwnslyshad1934wi9nzx1s2";
+    };
+    fromGit = true;
+
+    inherit storeDir stateDir confDir boehmgc;
+  });
+
 }
diff --git a/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/nixpkgs/pkgs/tools/package-management/opkg/default.nix
index df1fe5f80f2f..e02c0a2c66ff 100644
--- a/nixpkgs/pkgs/tools/package-management/opkg/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/opkg/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.4.1";
   name = "opkg-${version}";
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "1zp6gyggqv359myagjsr0knq66ax64q3irx889kqzbd2v0ahbh7n";
+    sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/nixpkgs/pkgs/tools/package-management/reuse/default.nix b/nixpkgs/pkgs/tools/package-management/reuse/default.nix
new file mode 100644
index 000000000000..4e2c8a7b3a7a
--- /dev/null
+++ b/nixpkgs/pkgs/tools/package-management/reuse/default.nix
@@ -0,0 +1,30 @@
+{ lib, python3Packages, fetchFromGitLab }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  pname = "reuse";
+  version = "0.3.4";
+
+  src = fetchFromGitLab {
+    owner = "reuse";
+    repo = "reuse";
+    rev = "v${version}";
+    sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3";
+  };
+
+  propagatedBuildInputs = [ chardet debian pygit2 ];
+
+  checkInputs = [ pytest jinja2 ];
+
+  # Some path based tests are currently broken under nix
+  checkPhase = ''
+    pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path"
+  '';
+
+  meta = with lib; {
+    description = "A tool for compliance with the REUSE Initiative recommendations";
+    license = with licenses; [ cc-by-sa-40 cc0 gpl3 ];
+    maintainers = [ maintainers.FlorianFranzen ];
+  };
+}
diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix
index fbb370027d7e..b360992c6bef 100644
--- a/nixpkgs/pkgs/tools/security/gnupg/22.nix
+++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix
@@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.15";
+  version = "2.2.16";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b";
+    sha256 = "1jqlzp9b3kpfp1dkjqskm67jjrhvf9nh3lzf45321p7m9d2qvgkc";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/nixpkgs/pkgs/tools/security/shc/default.nix b/nixpkgs/pkgs/tools/security/shc/default.nix
index 42a4b04ddfee..e3f5f72c1414 100644
--- a/nixpkgs/pkgs/tools/security/shc/default.nix
+++ b/nixpkgs/pkgs/tools/security/shc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "shc-${version}";
-  version = "4.0.1";
+  version = "4.0.2";
   rev = "${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "neurobin";
     repo = "shc";
-    sha256 = "03f5hq1wkwfcm6b1q9956zqd05l2am91ij8lxbc8akiwz14dmkw7";
+    sha256 = "1vd9dldm6h234awn5fhpgq4lb85ylcawr2p2108332ffy70kvdix";
   };
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/tools/security/sops/default.nix b/nixpkgs/pkgs/tools/security/sops/default.nix
index 4940ce8372d7..fcc455422148 100644
--- a/nixpkgs/pkgs/tools/security/sops/default.nix
+++ b/nixpkgs/pkgs/tools/security/sops/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "sops";
-  version = "3.3.0";
+  version = "3.3.1";
 
   goPackagePath = "go.mozilla.org/sops";
 
@@ -10,12 +10,13 @@ buildGoPackage rec {
     rev = version;
     owner = "mozilla";
     repo = pname;
-    sha256 = "0h02iy1dfn4874gyj3k07gbw8byb7rngvsi9kjglnad2pkf0pq2d";
+    sha256 = "0jbrz3yz6cj08h8cx6y98m8r0lpclh9367cw5apy6w3v71i3svfi";
   };
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
+    maintainers = [ maintainers.marsam ];
     license = licenses.mpl20;
   };
 }
diff --git a/nixpkgs/pkgs/tools/system/clinfo/default.nix b/nixpkgs/pkgs/tools/system/clinfo/default.nix
new file mode 100644
index 000000000000..cc59aa5121c6
--- /dev/null
+++ b/nixpkgs/pkgs/tools/system/clinfo/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocl-icd, opencl-headers }:
+
+stdenv.mkDerivation rec {
+  pname = "clinfo";
+  version = "2.2.18.04.06";
+
+    src = fetchFromGitHub {
+      owner = "Oblomov";
+      repo = "clinfo";
+      rev = "${version}";
+      sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx";
+    };
+
+  buildInputs = [ ocl-icd opencl-headers ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  meta = with stdenv.lib; {
+    description = "Print all known information about all available OpenCL platforms and devices in the system";
+    homepage = https://github.com/Oblomov/clinfo;
+    license = licenses.cc0;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ athas ];
+  };
+}
diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix
index c14fbc49e0d5..b3909a79d942 100644
--- a/nixpkgs/pkgs/tools/system/plan9port/default.nix
+++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
   '';
 
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [
+  buildInputs = [
     which perl libX11 fontconfig xorgproto libXt libXext
     freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
   ];
@@ -60,6 +60,27 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS="-lgcc_s";
   enableParallelBuilding = true;
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    $out/bin/9 rc -c 'echo rc is working.'
+
+    # 9l can find and use its libs
+    cd $TMP
+    cat >test.c <<EOF
+    #include <u.h>
+    #include <libc.h>
+    #include <thread.h>
+    void
+    threadmain(int argc, char **argv)
+    {
+        threadexitsall(nil);
+    }
+    EOF
+    $out/bin/9 9c -o test.o test.c
+    $out/bin/9 9l -o test test.o
+    ./test
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://9fans.github.io/plan9port/;
     description = "Plan 9 from User Space";
diff --git a/nixpkgs/pkgs/tools/system/throttled/default.nix b/nixpkgs/pkgs/tools/system/throttled/default.nix
new file mode 100644
index 000000000000..4f52b5e09455
--- /dev/null
+++ b/nixpkgs/pkgs/tools/system/throttled/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+stdenv.mkDerivation rec {
+  pname = "throttled";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "erpalma";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4";
+  };
+
+  nativeBuildInputs = [ python3Packages.wrapPython ];
+
+  pythonPath = with python3Packages; [ 
+    configparser
+    dbus-python
+    pygobject3
+  ];
+
+  # The upstream unit both assumes the install location, and tries to run in a virtualenv 
+  postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service'';
+
+  installPhase = ''
+    runHook preInstall
+    install -D -m755 -t $out/bin lenovo_fix.py
+    install -D -t $out/bin lenovo_fix.py mmio.py
+    install -D -m644 -t $out/etc etc/*
+    install -D -m644 -t $out/lib/systemd/system systemd/*
+    runHook postInstall
+  '';
+
+  postFixup = ''wrapPythonPrograms'';
+
+  meta = with stdenv.lib; {
+    description = "Fix for Intel CPU throttling issues";
+    homepage = https://github.com/erpalma/throttled;
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ michaelpj ];
+  };
+}
diff --git a/nixpkgs/pkgs/tools/system/xe/default.nix b/nixpkgs/pkgs/tools/system/xe/default.nix
index 934aa6fc2793..519cae03c5a5 100644
--- a/nixpkgs/pkgs/tools/system/xe/default.nix
+++ b/nixpkgs/pkgs/tools/system/xe/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "xe-${version}";
   version = "0.11";
-  
+
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "xe";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = "PREFIX=$(out)";
-  
+
   meta = with lib; {
     description = "Simple xargs and apply replacement";
     homepage = https://github.com/chneukirchen/xe;
     license = licenses.publicDomain;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ cstrahan ndowens ];
   };
 }
diff --git a/nixpkgs/pkgs/tools/text/nkf/default.nix b/nixpkgs/pkgs/tools/text/nkf/default.nix
index ae236cc22263..8a314d448439 100644
--- a/nixpkgs/pkgs/tools/text/nkf/default.nix
+++ b/nixpkgs/pkgs/tools/text/nkf/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nkf-${version}";
-  version = "2.1.4";
+  pname = "nkf";
+  version = "2.1.5";
 
   src = fetchurl {
-    url = "mirror://sourceforgejp/nkf/64158/${name}.tar.gz";
-    sha256 = "b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb";
+    url = "mirror://osdn/nkf/70406/${pname}-${version}.tar.gz";
+    sha256 = "0i5dbcb9aipwr8ym4mhvgf1in3frl6y8h8x96cprz9s7b11xz9yi";
   };
 
-  makeFlags = "prefix=\${out}";
+  makeFlags = [ "prefix=$(out)" ];
 
   meta = {
     description = "Tool for converting encoding of Japanese text";
-    homepage = http://sourceforge.jp/projects/nkf/;
+    homepage = "https://nkf.osdn.jp/";
     license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.auntie ];
diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
index 54509c601e36..4edebabc4cdd 100644
--- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 gem 'asciidoctor'
 gem 'asciidoctor-diagram'
-gem 'asciidoctor-bespoke'
 gem 'asciidoctor-pdf'
-gem 'asciidoctor-latex'
 gem 'asciidoctor-mathematical'
 gem 'coderay'
 gem 'pygments.rb'
diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 59e8fd06ef2d..7416bd0268e2 100644
--- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -2,51 +2,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     afm (0.2.2)
-    asciidoctor (1.5.7.1)
-    asciidoctor-bespoke (1.0.0.alpha.1)
-      asciidoctor (>= 1.5.0)
-      slim (~> 3.0.6)
-      thread_safe (~> 0.3.5)
-    asciidoctor-diagram (1.5.9)
-      asciidoctor (~> 1.5.0)
-    asciidoctor-latex (1.5.0.17.dev)
-      asciidoctor (~> 1.5, >= 1.5.2)
-      htmlentities (~> 4.3)
-      opal (~> 0.6.3)
-    asciidoctor-mathematical (0.2.2)
-      asciidoctor (~> 1.5, >= 1.5.0)
+    asciidoctor (2.0.10)
+    asciidoctor-diagram (1.5.18)
+      asciidoctor (>= 1.5.0, < 3.x)
+    asciidoctor-mathematical (0.3.0)
+      asciidoctor (~> 2.0, >= 2.0.0)
       mathematical (~> 1.5, >= 1.5.8)
       ruby-enum (~> 0.4)
-    asciidoctor-pdf (1.5.0.alpha.16)
-      asciidoctor (>= 1.5.0)
-      prawn (>= 1.3.0, < 2.3.0)
-      prawn-icon (= 1.3.0)
-      prawn-svg (>= 0.21.0, < 0.28.0)
-      prawn-table (= 0.2.2)
-      prawn-templates (>= 0.0.3, <= 0.1.1)
-      safe_yaml (~> 1.0.4)
-      thread_safe (~> 0.3.6)
-      treetop (= 1.5.3)
+    asciidoctor-pdf (1.5.0.alpha.18)
+      asciidoctor (>= 1.5.3, < 3.0.0)
+      concurrent-ruby (~> 1.1.0)
+      prawn (~> 2.2.0)
+      prawn-icon (~> 2.3.0)
+      prawn-svg (~> 0.29.0)
+      prawn-table (~> 0.2.0)
+      prawn-templates (~> 0.1.0)
+      safe_yaml (~> 1.0.0)
+      thread_safe (~> 0.3.0)
+      treetop (~> 1.5.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    css_parser (1.6.0)
+    concurrent-ruby (1.1.5)
+    css_parser (1.7.0)
       addressable
     hashery (2.1.2)
-    htmlentities (4.3.4)
-    i18n (1.1.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    mathematical (1.6.11)
+    mathematical (1.6.12)
       ruby-enum (~> 0.4)
     multi_json (1.13.1)
-    opal (0.6.3)
-      source_map
-      sprockets
     pdf-core (0.7.0)
-    pdf-reader (2.1.0)
+    pdf-reader (2.2.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -56,35 +44,24 @@ GEM
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
-    prawn-icon (1.3.0)
+    prawn-icon (2.3.0)
       prawn (>= 1.1.0, < 3.0.0)
-    prawn-svg (0.27.1)
-      css_parser (~> 1.3)
+    prawn-svg (0.29.1)
+      css_parser (~> 1.6)
       prawn (>= 0.11.1, < 3)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prawn-templates (0.1.1)
       pdf-reader (~> 2.0)
       prawn (~> 2.2)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
-    rack (2.0.6)
     ruby-enum (0.7.2)
       i18n
     ruby-rc4 (0.1.5)
-    safe_yaml (1.0.4)
-    slim (3.0.9)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 1.3.3, < 2.1)
-    source_map (3.0.1)
-      json
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    temple (0.8.0)
+    safe_yaml (1.0.5)
     thread_safe (0.3.6)
-    tilt (2.0.8)
     treetop (1.5.3)
       polyglot (~> 0.3)
     ttfunk (1.5.1)
@@ -94,13 +71,11 @@ PLATFORMS
 
 DEPENDENCIES
   asciidoctor
-  asciidoctor-bespoke
   asciidoctor-diagram
-  asciidoctor-latex
   asciidoctor-mathematical
   asciidoctor-pdf
   coderay
   pygments.rb
 
 BUNDLED WITH
-   1.16.4
+   1.17.2
diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
index 8c4b93ab2656..760cc41609e5 100644
--- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -11,8 +11,6 @@ bundlerApp {
 
   exes = [
     "asciidoctor"
-    "asciidoctor-bespoke"
-    "asciidoctor-latex"
     "asciidoctor-pdf"
     "asciidoctor-safe"
   ];
diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 034ab174e8a3..aef9061e1302 100644
--- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
       type = "gem";
     };
-    version = "2.5.2";
+    version = "2.6.0";
   };
   afm = {
     groups = ["default"];
@@ -35,21 +35,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v52bzc72cvg7zfgq27pa4mgyf29dx9m20fghrw1xmvwgd519n1w";
+      sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
       type = "gem";
     };
-    version = "1.5.7.1";
-  };
-  asciidoctor-bespoke = {
-    dependencies = ["asciidoctor" "slim" "thread_safe"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk";
-      type = "gem";
-    };
-    version = "1.0.0.alpha.1";
+    version = "2.0.10";
   };
   asciidoctor-diagram = {
     dependencies = ["asciidoctor"];
@@ -57,21 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r";
-      type = "gem";
-    };
-    version = "1.5.9";
-  };
-  asciidoctor-latex = {
-    dependencies = ["asciidoctor" "htmlentities" "opal"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz";
+      sha256 = "095ar1hj96mi9vxnjjdkj7yzc3lp4wjxh4qsijx9inqflbcw7x71";
       type = "gem";
     };
-    version = "1.5.0.17.dev";
+    version = "1.5.18";
   };
   asciidoctor-mathematical = {
     dependencies = ["asciidoctor" "mathematical" "ruby-enum"];
@@ -79,21 +57,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f";
+      sha256 = "1n6qhfp6xc5jlqkscr9g7zzp9f2cv28jzcqzawhl8vjgcny7i6j3";
       type = "gem";
     };
-    version = "0.2.2";
+    version = "0.3.0";
   };
   asciidoctor-pdf = {
-    dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"];
+    dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg";
+      sha256 = "19rgi43abhkyv85r2gnwqq6kxwsn29hhv4clnnmln58d7s589n0j";
       type = "gem";
     };
-    version = "1.5.0.alpha.16";
+    version = "1.5.0.alpha.18";
   };
   coderay = {
     groups = ["default"];
@@ -110,10 +88,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.5";
   };
   css_parser = {
     dependencies = ["addressable"];
@@ -121,10 +99,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61";
+      sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   hashery = {
     groups = ["default"];
@@ -136,36 +114,16 @@
     };
     version = "2.1.2";
   };
-  htmlentities = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
-      type = "gem";
-    };
-    version = "4.3.4";
-  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  json = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "1.6.0";
   };
   mathematical = {
     dependencies = ["ruby-enum"];
@@ -173,10 +131,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21";
+      sha256 = "19f9icaixg60wl8dvcxp6glbm5vpx2rsyx53sfk2rvwnzgsr42qh";
       type = "gem";
     };
-    version = "1.6.11";
+    version = "1.6.12";
   };
   multi_json = {
     groups = ["default"];
@@ -188,17 +146,6 @@
     };
     version = "1.13.1";
   };
-  opal = {
-    dependencies = ["source_map" "sprockets"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k";
-      type = "gem";
-    };
-    version = "0.6.3";
-  };
   pdf-core = {
     groups = ["default"];
     platforms = [];
@@ -215,10 +162,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45";
+      sha256 = "0aas2f5clgwpgryywrh4gihdi10afx3kbyfs1n31cinri02psd43";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   polyglot = {
     groups = ["default"];
@@ -247,10 +194,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk";
+      sha256 = "1nc810wdpa93z162yzjgvf7mdanfxm4bjwinjjxx5smq6wdvhdqi";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.3.0";
   };
   prawn-svg = {
     dependencies = ["css_parser" "prawn"];
@@ -258,10 +205,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx";
+      sha256 = "1wwfv6lw2diywgjp15pd3awpr8g7xkjfi10jzhmvziikakzsz6gj";
       type = "gem";
     };
-    version = "0.27.1";
+    version = "0.29.1";
   };
   prawn-table = {
     dependencies = ["prawn"];
@@ -290,10 +237,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+      sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.1.0";
   };
   "pygments.rb" = {
     dependencies = ["multi_json"];
@@ -306,14 +253,6 @@
     };
     version = "1.2.1";
   };
-  rack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
   ruby-enum = {
     dependencies = ["i18n"];
     groups = ["default"];
@@ -340,53 +279,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  slim = {
-    dependencies = ["temple" "tilt"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl";
-      type = "gem";
-    };
-    version = "3.0.9";
-  };
-  source_map = {
-    dependencies = ["json"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  sprockets = {
-    dependencies = ["concurrent-ruby" "rack"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
-      type = "gem";
-    };
-    version = "3.7.2";
-  };
-  temple = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
+      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "1.0.5";
   };
   thread_safe = {
     groups = ["default"];
@@ -398,16 +294,6 @@
     };
     version = "0.3.6";
   };
-  tilt = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
-      type = "gem";
-    };
-    version = "2.0.8";
-  };
   treetop = {
     dependencies = ["polyglot"];
     groups = ["default"];
diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix
index acd02e0d8f7b..71f20b4ae820 100644
--- a/nixpkgs/pkgs/top-level/aliases.nix
+++ b/nixpkgs/pkgs/top-level/aliases.nix
@@ -303,6 +303,7 @@ mapAliases ({
   shared_mime_info = shared-mime-info; # added 2018-02-25
   skrooge2 = skrooge; # added 2017-02-18
   skype = skypeforlinux; # added 2017-07-27
+  slic3r-prusa3d = prusa-slicer; # added 2019-05-21
   slurm-llnl = slurm; # renamed July 2017
   slurm-llnl-full = slurm-full; # renamed July 2017
   slurm-full = slurm; # added 2018-05-1
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix
index 38b38ce1472b..da75aaf2e6d8 100644
--- a/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/nixpkgs/pkgs/top-level/all-packages.nix
@@ -1465,6 +1465,8 @@ in
 
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
+  eksctl = callPackage ../tools/admin/eksctl { };
+
   elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
 
   ell = callPackage ../os-specific/linux/ell { };
@@ -4210,9 +4212,9 @@ in
 
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = hiPrio nodejs-8_x;
+  nodejs = hiPrio nodejs-10_x;
 
-  nodejs-slim = nodejs-slim-8_x;
+  nodejs-slim = nodejs-slim-10_x;
 
   nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
   nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
@@ -4647,9 +4649,7 @@ in
     docbook-xsl = docbook_xsl;
   };
 
-  mosh = callPackage ../tools/networking/mosh {
-    stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
-  };
+  mosh = callPackage ../tools/networking/mosh { };
 
   motuclient = callPackage ../applications/science/misc/motu-client { };
 
@@ -5344,7 +5344,6 @@ in
   podiff = callPackage ../tools/text/podiff { };
 
   podman = callPackage ../applications/virtualization/podman { };
-  conmon = callPackage ../applications/virtualization/podman/conmon.nix { };
 
   pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
 
@@ -5623,6 +5622,8 @@ in
 
   rescuetime = callPackage ../applications/misc/rescuetime { };
 
+  reuse = callPackage ../tools/package-management/reuse { };
+
   rewritefs = callPackage ../os-specific/linux/rewritefs { };
 
   rdiff-backup = callPackage ../tools/backup/rdiff-backup { };
@@ -5826,6 +5827,8 @@ in
 
   sharutils = callPackage ../tools/archivers/sharutils { };
 
+  shelldap = callPackage ../tools/misc/shelldap { };
+
   schema2ldif = callPackage ../tools/text/schema2ldif { };
 
   shocco = callPackage ../tools/text/shocco { };
@@ -6026,6 +6029,8 @@ in
 
   super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { };
 
+  svgbob = callPackage ../tools/graphics/svgbob { };
+
   svgcleaner = callPackage ../tools/graphics/svgcleaner { };
 
   ssdeep = callPackage ../tools/security/ssdeep { };
@@ -8047,8 +8052,9 @@ in
 
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
   scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
-  scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; };
-  scala = scala_2_12;
+  scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; };
+  scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; };
+  scala = scala_2_13;
 
   scalafix = callPackage ../development/tools/scalafix { };
   scalafmt = callPackage ../development/tools/scalafmt { };
@@ -8854,7 +8860,9 @@ in
 
   bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { };
 
-  bazel-watcher = callPackage ../development/tools/bazel-watcher { };
+  bazel-watcher = callPackage ../development/tools/bazel-watcher {
+    buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; };
+  };
 
   bazelisk = callPackage ../development/tools/bazelisk { };
 
@@ -9594,6 +9602,8 @@ in
     withPEPatterns = true;
   };
 
+  reviewdog = callPackage ../development/tools/misc/reviewdog { };
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rolespec = callPackage ../development/tools/misc/rolespec { };
@@ -9948,7 +9958,7 @@ in
   belr = callPackage ../development/libraries/belr { };
 
   beignet = callPackage ../development/libraries/beignet {
-    inherit (llvmPackages_39) llvm clang-unwrapped;
+    inherit (llvmPackages_6) llvm clang-unwrapped;
   };
 
   belle-sip = callPackage ../development/libraries/belle-sip { };
@@ -10012,6 +10022,8 @@ in
 
   capnproto = callPackage ../development/libraries/capnproto { };
 
+  captive-browser = callPackage ../applications/networking/browsers/captive-browser { };
+
   ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
 
   cddlib = callPackage ../development/libraries/cddlib {};
@@ -11249,9 +11261,7 @@ in
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
-  libchamplain = callPackage ../development/libraries/libchamplain {
-    inherit (gnome2) libsoup;
-  };
+  libchamplain = callPackage ../development/libraries/libchamplain { };
 
   libchardet = callPackage ../development/libraries/libchardet { };
 
@@ -13917,9 +13927,7 @@ in
 
   smack = callPackage ../development/libraries/java/smack { };
 
-  swt = callPackage ../development/libraries/java/swt {
-    inherit (gnome2) libsoup;
-  };
+  swt = callPackage ../development/libraries/java/swt { };
 
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
@@ -14717,6 +14725,7 @@ in
   samba3 = callPackage ../servers/samba/3.x.nix { };
 
   samba4 = callPackage ../servers/samba/4.x.nix {
+    rpcgen = netbsd.rpcgen;
     python = python3;
   };
 
@@ -16342,6 +16351,8 @@ in
 
   iwona = callPackage ../data/fonts/iwona { };
 
+  jost = callPackage ../data/fonts/jost { };
+
   junicode = callPackage ../data/fonts/junicode { };
 
   kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {};
@@ -17296,6 +17307,7 @@ in
   deadbeefPlugins = {
     headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
     infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { };
+    lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };
     mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
   };
 
@@ -17666,7 +17678,7 @@ in
       inherit (pythonPackages) elpy;
       inherit
         autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib
-        substituteAll rustPlatform;
+        substituteAll rustPlatform cmake llvmPackages;
     };
   };
 
@@ -19224,6 +19236,8 @@ in
 
   natron = callPackage ../applications/video/natron { };
 
+  neocomp  = callPackage ../applications/window-managers/neocomp { };
+
   nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus {
     geoip = geoipWithDatabase;
   };
@@ -20146,8 +20160,6 @@ in
 
   slic3r = callPackage ../applications/misc/slic3r { };
 
-  slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { };
-
   curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
   cura_stable = callPackage ../applications/misc/cura/stable.nix {
     curaengine = curaengine_stable;
@@ -20158,6 +20170,8 @@ in
   };
   cura = qt5.callPackage ../applications/misc/cura { };
 
+  curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
+
   curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };
 
   curaByDagoma = callPackage ../applications/misc/curabydagoma { };
@@ -20170,6 +20184,8 @@ in
 
   printrun = callPackage ../applications/misc/printrun { };
 
+  prusa-slicer = callPackage ../applications/misc/prusa-slicer { };
+
   sddm = libsForQt5.callPackage ../applications/display-managers/sddm { };
 
   skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
@@ -20298,7 +20314,7 @@ in
 
   symlinks = callPackage ../tools/system/symlinks { };
 
-  syncplay = callPackage ../applications/networking/syncplay { };
+  syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
 
   inherit (callPackages ../applications/networking/syncthing { })
     syncthing
@@ -21372,6 +21388,8 @@ in
 
   confd = callPackage ../tools/system/confd { };
 
+  conmon = callPackage ../applications/virtualization/conmon { };
+
   construoBase = lowPrio (callPackage ../games/construo {
     libGL = null;
     freeglut = null;
@@ -22302,6 +22320,8 @@ in
 
   bftools = callPackage ../applications/science/biology/bftools { };
 
+  cd-hit = callPackage ../applications/science/biology/cd-hit { };
+
   cmtk = callPackage ../applications/science/biology/cmtk { };
 
   clustal-omega = callPackage ../applications/science/biology/clustal-omega { };
@@ -23106,6 +23126,8 @@ in
 
   click = callPackage ../applications/networking/cluster/click { };
 
+  clinfo = callPackage ../tools/system/clinfo { };
+
   cups = callPackage ../misc/cups {
     libusb = libusb1;
   };
@@ -23337,12 +23359,16 @@ in
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
+
   lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
+
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
     lilypond = lilypond-unstable;
   };
 
-  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
+  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix {
+    lilypond = lilypond-unstable;
+  };
 
   loop = callPackage ../tools/misc/loop { };
 
@@ -23380,7 +23406,8 @@ in
     nix
     nix1
     nixStable
-    nixUnstable;
+    nixUnstable
+    nixFlakes;
 
   nixops = callPackage ../tools/package-management/nixops { };
 
@@ -23630,8 +23657,6 @@ in
 
   pgfplots = callPackage ../tools/typesetting/tex/pgfplots { };
 
-  phabricator = callPackage ../misc/phabricator { };
-
   physlock = callPackage ../misc/screensavers/physlock { };
 
   pjsip = callPackage ../applications/networking/pjsip { };
@@ -23833,6 +23858,8 @@ in
 
   thermald = callPackage ../tools/system/thermald { };
 
+  throttled = callPackage ../tools/system/throttled { };
+
   thinkfan = callPackage ../tools/system/thinkfan { };
 
   tup = callPackage ../development/tools/build-managers/tup { };
diff --git a/nixpkgs/pkgs/top-level/emacs-packages.nix b/nixpkgs/pkgs/top-level/emacs-packages.nix
index f1fdf30f61c2..1975f6aad43e 100644
--- a/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/nixpkgs/pkgs/top-level/emacs-packages.nix
@@ -288,6 +288,45 @@ let
 
   icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
+  irony = melpaBuild rec {
+    pname = "irony";
+    ename = "irony";
+    version = "20190516";
+    src = fetchFromGitHub {
+      owner = "Sarcasm";
+      repo = "irony-mode";
+      rev = "c3ae899b61124a747ebafc705086345e460ac08e";
+      sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
+    };
+    recipe = fetchurl {
+      url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
+      sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
+      name = "recipe";
+    };
+    preConfigure = ''
+      cd server
+    '';
+    preBuild = ''
+      make
+    '';
+    postInstall = ''
+      mkdir -p $out
+      mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
+      rm -rf $out/share/emacs/site-lisp/*/server
+    '';
+    preCheck = ''
+      cd source/server
+    '';
+    dontUseCmakeBuildDir = true;
+    doCheck = true;
+    packageRequires = [ emacs ];
+    nativeBuildInputs = [ external.cmake external.llvmPackages.llvm ];
+    meta = {
+      homepage = "https://melpa.org/#/irony";
+      license = lib.licenses.gpl3;
+    };
+  };
+
   redshank = callPackage ../applications/editors/emacs-modes/redshank { };
 
   rtags = melpaBuild rec {
diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix
index 5df75d4e4605..a15982fe8b93 100644
--- a/nixpkgs/pkgs/top-level/lua-packages.nix
+++ b/nixpkgs/pkgs/top-level/lua-packages.nix
@@ -258,18 +258,23 @@ with self; {
 
   luadbi = buildLuaPackage rec {
     name = "luadbi-${version}";
-    version = "0.7.1";
+    version = "0.7.2";
 
     src = fetchFromGitHub {
       owner = "mwild1";
       repo = "luadbi";
       rev = "v${version}";
-      sha256 = "01i8018zb7w2bhaqglm7cnvbiirgd95b9d07irgz3sci91p08cwp";
+      sha256 = "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh";
     };
 
-    MYSQL_INC="-I${mysql.connector-c}/include/mysql";
+    MYSQL_INC = [ "-I${mysql.connector-c}/include/mysql" ];
+    MYSQL_LDFLAGS= [
+      "-lmysqlclient"
+      "-L${mysql.connector-c}/lib/mysql"
+    ];
 
-    buildInputs = [ mysql.client mysql.connector-c postgresql sqlite ];
+    nativeBuildInputs = [ mysql.client ];
+    buildInputs = [ mysql.connector-c postgresql sqlite ];
 
     preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace Makefile \
diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix
index 62a48c52d703..9bb86da861e2 100644
--- a/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -1157,6 +1157,20 @@ let
     };
   };
 
+  Carton = buildPerlPackage rec {
+    name = "Carton-v1.0.34";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45";
+    };
+    propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ];
+    meta = {
+      homepage = https://github.com/perl-carton/carton;
+      description = "Perl module dependency manager (aka Bundler for Perl)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   CatalystActionRenderView = buildPerlPackage rec {
     name = "Catalyst-Action-RenderView-0.16";
     src = fetchurl {
@@ -2779,6 +2793,21 @@ let
     };
   };
 
+  CPANCommonIndex = buildPerlPackage rec {
+    name = "CPAN-Common-Index-0.010";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0";
+    };
+    buildInputs = [ TestDeep TestFailWarnings TestFatal ];
+    propagatedBuildInputs = [ CPANDistnameInfo ClassTiny TieHandleOffset URI ];
+    meta = {
+      homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index;
+      description = "Common library for searching CPAN modules, authors and distributions";
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   CPANDistnameInfo = buildPerlPackage rec {
      name = "CPAN-DistnameInfo-0.12";
      src = fetchurl {
@@ -7566,6 +7595,20 @@ let
      };
   };
 
+  HTTPTinyish = buildPerlPackage rec {
+    name = "HTTP-Tinyish-0.15";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5";
+    };
+    propagatedBuildInputs = [ FileWhich IPCRun3 ];
+    meta = {
+      homepage = https://github.com/miyagawa/HTTP-Tinyish;
+      description = "HTTP::Tiny compatible HTTP client wrappers";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   iCalParser = buildPerlPackage rec {
     name = "iCal-Parser-1.21";
     src = fetchurl {
@@ -8016,11 +8059,11 @@ let
 
   ImageExifTool = buildPerlPackage rec {
     name = "Image-ExifTool-${version}";
-    version = "11.48";
+    version = "11.50";
 
     src = fetchurl {
       url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-      sha256 = "0whbwrrmwvj311fxksf47i47cyfgzd2d5cnh6ixg74rb1n6k9986";
+      sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3";
     };
 
     meta = with stdenv.lib; {
@@ -8029,11 +8072,11 @@ let
 
       longDescription = ''
         ExifTool is a platform-independent Perl library plus a command-line
-        application for reading, writing and editing meta information in
-        image, audio and video files.  ExifTool supports many different types
-        of metadata including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC
-        Profile, Photoshop IRB, FlashPix, AFCP and ID3, as well as the maker
-        notes of many digital cameras by Canon, Casio, DJI, FLIR, FujiFilm, HP,
+        application for reading, writing and editing meta information in a wide
+        variety of files. ExifTool supports many different metadata formats
+        including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC Profile, Photoshop
+        IRB, FlashPix, AFCP and ID3, as well as the maker notes of many digital
+        cameras by Canon, Casio, DJI, FLIR, FujiFilm, GE, GoPro, HP,
         JVC/Victor, Kodak, Leaf, Minolta/Konica-Minolta, Motorola, Nikon,
         Nintendo, Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Phase One,
         Reconyx, Ricoh, Samsung, Sanyo, Sigma/Foveon and Sony.
@@ -9608,6 +9651,34 @@ let
      };
   };
 
+  Menlo = buildPerlPackage rec {
+    name = "Menlo-1.9019";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565";
+    };
+    propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ];
+    meta = {
+      homepage = https://github.com/miyagawa/cpanminus;
+      description = "A CPAN client";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+  MenloLegacy = buildPerlPackage rec {
+    name = "Menlo-Legacy-1.9022";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201";
+    };
+    propagatedBuildInputs = [ Menlo ];
+    meta = {
+      homepage = https://github.com/miyagawa/cpanminus;
+      description = "Legacy internal and client support for Menlo";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MetaBuilder = buildPerlModule {
     name = "Meta-Builder-0.004";
     src = fetchurl {
@@ -14920,6 +14991,20 @@ let
     };
   };
 
+  TermShell = buildPerlModule rec {
+    name = "Term-Shell-0.10";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "7d1f824c2db22769b60000b5b9ca2ad469c154939f9ec1cd3f0e06e9c967dda3";
+    };
+    propagatedBuildInputs = [ TermReadKey TextAutoformat ];
+    meta = with stdenv.lib; {
+      homepage = http://metacpan.org/release/Term-Shell;
+      description = "A simple command-line shell framework";
+      license = with licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TermShellUI = buildPerlPackage rec {
     name = "Term-ShellUI-0.92";
     src = fetchurl {
@@ -16733,6 +16818,19 @@ let
     };
   };
 
+  TextNSP = buildPerlPackage rec {
+    name = "Text-NSP-1.31";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TP/TPEDERSE/${name}.tar.gz";
+      sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595";
+    };
+    meta = {
+      description = "Extract collocations and Ngrams from text";
+      license = stdenv.lib.licenses.free;
+      maintainers = [ maintainers.bzizou ];
+    };
+  };
+
   TextvFileasData = buildPerlPackage rec {
     name = "Text-vFile-asData-0.08";
     src = fetchurl {
@@ -16884,6 +16982,19 @@ let
     };
   };
 
+  TieHandleOffset = buildPerlPackage rec {
+    name = "Tie-Handle-Offset-0.004";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e";
+    };
+    meta = {
+      homepage = https://github.com/dagolden/tie-handle-offset;
+      description = "Tied handle that hides the beginning of a file";
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   TieHashIndexed = buildPerlPackage {
     name = "Tie-Hash-Indexed-0.05";
     src = fetchurl {
@@ -17510,6 +17621,18 @@ let
     };
   };
 
+  Win32ShellQuote = buildPerlPackage rec {
+    name = "Win32-ShellQuote-0.003001";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
+      sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc";
+    };
+    meta = {
+      description = "Quote argument lists for Win32";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   Workflow = buildPerlModule rec {
     name = "Workflow-1.45";
     src = fetchurl {
diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix
index 119b99c3a56e..114b107418d9 100644
--- a/nixpkgs/pkgs/top-level/php-packages.nix
+++ b/nixpkgs/pkgs/top-level/php-packages.nix
@@ -4,7 +4,7 @@ let
   self = with self; {
     buildPecl = import ../build-support/build-pecl.nix {
       inherit php;
-      inherit (pkgs) stdenv autoreconfHook fetchurl;
+      inherit (pkgs) stdenv autoreconfHook fetchurl re2c;
     };
 
     # Wrap mkDerivation to prepend pname with "php-" to make names consistent
@@ -73,12 +73,12 @@ let
   };
 
   composer = mkDerivation rec {
-    version = "1.8.5";
+    version = "1.8.6";
     pname = "composer";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "05qfgh2dz8pjf47ndyhkicqbnqzwypk90cczd4c6d8jl9gbiqk2f";
+      sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn";
     };
 
     unpackPhase = ":";
@@ -143,12 +143,17 @@ let
   };
 
   event = buildPecl rec {
-    version = "2.5.1";
+    version = "2.5.2";
     pname = "event";
 
-    sha256 = "0hnvmlbl994fjliqc3c65gv6f6syh9zmlfcbizqs3k67bbmkhiad";
+    sha256 = "0b9zbwyyfcrzs1gcpqn2dkjq6jliw89g2m981f8ildbp84snkpcf";
 
-    configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" ];
+    configureFlags = [
+      "--with-event-libevent-dir=${pkgs.libevent.dev}"
+      "--with-event-core"
+      "--with-event-extra"
+      "--with-event-pthreads"
+    ];
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = with pkgs; [ openssl libevent ];
 
@@ -216,7 +221,7 @@ let
 
     sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
 
-    buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ];
+    buildInputs = [ pkgs.oracle-instantclient ];
     configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ];
   };
 
diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix
index b4446ffa415f..61801eee1581 100644
--- a/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/nixpkgs/pkgs/top-level/python-packages.nix
@@ -492,6 +492,8 @@ in {
 
   hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };
 
+  http-ece = callPackage ../development/python-modules/http-ece { };
+
   httpsig = callPackage ../development/python-modules/httpsig { };
 
   httptools = callPackage ../development/python-modules/httptools { };
@@ -859,6 +861,8 @@ in {
 
   python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
 
+  python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
+
   python-sql = callPackage ../development/python-modules/python-sql { };
 
   python-snappy = callPackage ../development/python-modules/python-snappy {
@@ -875,8 +879,12 @@ in {
 
   pytricia =  callPackage ../development/python-modules/pytricia { };
 
+  py-vapid = callPackage ../development/python-modules/py-vapid { };
+
   PyWebDAV = callPackage ../development/python-modules/pywebdav { };
 
+  pywebpush = callPackage ../development/python-modules/pywebpush { };
+
   pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });
 
   pyvcd = callPackage ../development/python-modules/pyvcd { };
@@ -1020,7 +1028,7 @@ in {
 
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
-  aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { };
+  aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
@@ -3626,9 +3634,8 @@ in {
 
   cachetools = callPackage ../development/python-modules/cachetools {};
 
-  cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {};
   cmd2_9 = callPackage ../development/python-modules/cmd2 {};
-  cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9;
+  cmd2 = self.cmd2_9;
 
   warlock = callPackage ../development/python-modules/warlock { };
 
@@ -4444,6 +4451,8 @@ in {
 
   statsmodels = callPackage ../development/python-modules/statsmodels { };
 
+  strategies = callPackage ../development/python-modules/strategies { };
+
   stravalib = callPackage ../development/python-modules/stravalib { };
 
   streamz = callPackage ../development/python-modules/streamz { };
diff --git a/nixpkgs/pkgs/top-level/release-cross.nix b/nixpkgs/pkgs/top-level/release-cross.nix
index 339973f05748..bc822b466c90 100644
--- a/nixpkgs/pkgs/top-level/release-cross.nix
+++ b/nixpkgs/pkgs/top-level/release-cross.nix
@@ -107,7 +107,6 @@ in
     mapTestEqual = lib.mapAttrsRecursive testEqual;
 
   in mapTestEqual {
-    androidndk = nativePlatforms;
     boehmgc = nativePlatforms;
     libffi = nativePlatforms;
     libiconv = nativePlatforms;
author	Alyssa Ross <hi@alyssa.is>	2019-06-18 18:30:18 +0000
committer	Alyssa Ross <hi@alyssa.is>	2019-06-18 18:30:18 +0000
commit	ef93931efff0323fd13c4270415b578c73b5ef35 (patch)
tree	e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs
parent	c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff)
parent	a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff)
download	nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip