From abdc77e7d5c1fe413d1bff591a97a4b276798335 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Jul 2021 09:15:22 +0200
Subject: [PATCH 01/57] python3Packages.motioneye-client: 0.3.9 -> 0.3.10

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

diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix
index a769128fd861..a7981feb2055 100644
--- a/pkgs/development/python-modules/motioneye-client/default.nix
+++ b/pkgs/development/python-modules/motioneye-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "motioneye-client";
-  version = "0.3.9";
+  version = "0.3.10";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "dermotduffy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pLdAxBipmr+HUr9NSupm7h/68PK95r3zY/qZTBs1m54=";
+    sha256 = "0ilh9wfzggnbfz068vkz66g64ar6isl3m2vcp7jf2zbaj0bqsjax";
   };
 
   nativeBuildInputs = [

From 4c842cc4d83f80a26ab98e1a1a8ec51f6c1ac5c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 25 Jul 2021 08:24:38 +0000
Subject: [PATCH 02/57] gnome.gdm: 40.0 -> 40.1

---
 pkgs/desktops/gnome/core/gdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix
index f30449773495..e3c693836374 100644
--- a/pkgs/desktops/gnome/core/gdm/default.nix
+++ b/pkgs/desktops/gnome/core/gdm/default.nix
@@ -42,13 +42,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gdm";
-  version = "40.0";
+  version = "40.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4=";
+    sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0=";
   };
 
   mesonFlags = [

From d78400378bb96329e0d35f530f8c741a864ffb4d Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Mon, 26 Jul 2021 08:19:29 +0530
Subject: [PATCH 03/57] ouch: init at 0.1.5

---
 .../compression/ouch/add-Cargo.lock.patch     | 434 ++++++++++++++++++
 pkgs/tools/compression/ouch/default.nix       |  28 ++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 464 insertions(+)
 create mode 100644 pkgs/tools/compression/ouch/add-Cargo.lock.patch
 create mode 100644 pkgs/tools/compression/ouch/default.nix

diff --git a/pkgs/tools/compression/ouch/add-Cargo.lock.patch b/pkgs/tools/compression/ouch/add-Cargo.lock.patch
new file mode 100644
index 000000000000..368ce6aab0b2
--- /dev/null
+++ b/pkgs/tools/compression/ouch/add-Cargo.lock.patch
@@ -0,0 +1,434 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..4bea8c1
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,428 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "adler"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "byteorder"
++version = "1.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
++
++[[package]]
++name = "bzip2"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
++dependencies = [
++ "bzip2-sys",
++ "libc",
++]
++
++[[package]]
++name = "bzip2-sys"
++version = "0.1.11+1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
++dependencies = [
++ "cc",
++ "libc",
++ "pkg-config",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "crc32fast"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
++dependencies = [
++ "cfg-if",
++]
++
++[[package]]
++name = "filetime"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "redox_syscall",
++ "winapi",
++]
++
++[[package]]
++name = "flate2"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
++dependencies = [
++ "cfg-if",
++ "crc32fast",
++ "libc",
++ "miniz_oxide",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++
++[[package]]
++name = "getrandom"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.98"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
++
++[[package]]
++name = "lzma-sys"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619"
++dependencies = [
++ "cc",
++ "libc",
++ "pkg-config",
++]
++
++[[package]]
++name = "miniz_oxide"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
++dependencies = [
++ "adler",
++ "autocfg",
++]
++
++[[package]]
++name = "ouch"
++version = "0.1.5"
++dependencies = [
++ "bzip2",
++ "flate2",
++ "rand 0.8.4",
++ "strsim",
++ "tar",
++ "tempdir",
++ "walkdir",
++ "xz2",
++ "zip",
++]
++
++[[package]]
++name = "pkg-config"
++version = "0.3.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.28"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
++dependencies = [
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "rdrand",
++ "winapi",
++]
++
++[[package]]
++name = "rand"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
++dependencies = [
++ "libc",
++ "rand_chacha",
++ "rand_core 0.6.3",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.6.3",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++dependencies = [
++ "rand_core 0.4.2",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++
++[[package]]
++name = "rand_core"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++dependencies = [
++ "rand_core 0.3.1",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "strsim"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
++
++[[package]]
++name = "syn"
++version = "1.0.74"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tar"
++version = "0.4.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
++dependencies = [
++ "filetime",
++ "libc",
++ "xattr",
++]
++
++[[package]]
++name = "tempdir"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++dependencies = [
++ "rand 0.4.6",
++ "remove_dir_all",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.26"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
++dependencies = [
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.26"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "time"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
++dependencies = [
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
++
++[[package]]
++name = "walkdir"
++version = "2.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
++dependencies = [
++ "same-file",
++ "winapi",
++ "winapi-util",
++]
++
++[[package]]
++name = "wasi"
++version = "0.10.2+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "xattr"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "xz2"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
++dependencies = [
++ "lzma-sys",
++]
++
++[[package]]
++name = "zip"
++version = "0.5.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
++dependencies = [
++ "byteorder",
++ "bzip2",
++ "crc32fast",
++ "flate2",
++ "thiserror",
++ "time",
++]
diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix
new file mode 100644
index 000000000000..c46e83ab91b2
--- /dev/null
+++ b/pkgs/tools/compression/ouch/default.nix
@@ -0,0 +1,28 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ouch";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "vrmiguel";
+    repo = pname;
+    rev = version;
+    sha256 = "00ah8hgrppa61jhwb74zl5b509q0yp2pp27w9frm814iqx70qn38";
+  };
+
+  cargoPatches = [
+    # a patch file to add Cargo.lock in the source code
+    # https://github.com/vrmiguel/ouch/pull/46
+    ./add-Cargo.lock.patch
+  ];
+
+  cargoSha256 = "181aq8r78g4bl1ndlwl54ws5ccrwph0mmk9506djxvfdy3hndxkg";
+
+  meta = with lib; {
+    description = "Taking the pain away from file (de)compression";
+    homepage = "https://github.com/vrmiguel/ouch";
+    license = licenses.mit;
+    maintainers = [ maintainers.psibi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0ac74a862c..d2862a7ddebe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8276,6 +8276,8 @@ in
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  ouch = callPackage ../tools/compression/ouch { };
+
   mpi = openmpi; # this attribute should used to build MPI applications
 
   ucx = callPackage ../development/libraries/ucx {};

From f5de4158dd462c51741ec48be2e47a3f8015930d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 29 Jul 2021 04:20:00 +0000
Subject: [PATCH 04/57] nodejs-16_x: 16.5.0 -> 16.6.0

https://github.com/nodejs/node/releases/tag/v16.6.0
---
 pkgs/development/web/nodejs/v16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix
index 766df734a4aa..c89b48ae3dd7 100644
--- a/pkgs/development/web/nodejs/v16.nix
+++ b/pkgs/development/web/nodejs/v16.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "16.5.0";
-    sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz";
+    version = "16.6.0";
+    sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw";
   }

From 946ad968ffcb623d6473228c4390bf4262024e91 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 28 Jul 2021 21:29:23 +0200
Subject: [PATCH 05/57] rott: init at 1.1.2

---
 pkgs/games/rott/default.nix     | 54 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  6 ++++
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/games/rott/default.nix

diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix
new file mode 100644
index 000000000000..cac357faf2e0
--- /dev/null
+++ b/pkgs/games/rott/default.nix
@@ -0,0 +1,54 @@
+{stdenv, lib, fetchurl, SDL, SDL_mixer, makeDesktopItem, copyDesktopItems, runtimeShell, buildShareware ? false}:
+
+stdenv.mkDerivation rec {
+  pname = "rott";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "https://icculus.org/rott/releases/${pname}-${version}.tar.gz";
+    sha256 = "1zr7v5dv2iqx40gzxbg8mhac7fxz3kqf28y6ysxv1xhjqgl1c98h";
+  };
+
+  nativeBuildInputs = [ copyDesktopItems ];
+  buildInputs = [ SDL SDL_mixer ];
+
+  preBuild = ''
+    cd rott
+    make clean
+    make SHAREWARE=${if buildShareware then "1" else "0"}
+  '';
+
+  # Include a wrapper script to allow the game to be launched from a user's PATH and load the game data from the user's home directory.
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp rott $out/bin
+
+    cat > $out/bin/launch-rott <<EOF
+    #! ${runtimeShell} -e
+    cd ~/.rott/data
+    exec $out/bin/rott
+    EOF
+
+    chmod +x $out/bin/launch-rott
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "rott";
+      exec = "launch-rott";
+      desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}";
+      categories = "Game;";
+    })
+  ];
+
+  meta = with lib; {
+    description = "SDL port of Rise of the Triad";
+    homepage = "https://icculus.org/rott/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ sander ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3be8bcac730a..4626d533e5ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29471,6 +29471,12 @@ in
 
   rocksndiamonds = callPackage ../games/rocksndiamonds { };
 
+  rott = callPackage ../games/rott { };
+
+  rott-shareware = rott.override {
+    buildShareware = true;
+  };
+
   rrootage = callPackage ../games/rrootage { };
 
   saga = libsForQt5.callPackage ../applications/gis/saga {

From 51b1d4b421740ceddf556b9e425b955d1ca3c53a Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 29 Jul 2021 21:30:34 +0200
Subject: [PATCH 06/57] arrow-cpp: 4.0.1 -> 5.0.0

---
 pkgs/development/libraries/arrow-cpp/default.nix | 16 ++++++++--------
 .../python-modules/pyarrow/default.nix           |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index a13ebf281934..bea566174689 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -9,25 +9,25 @@ let
   arrow-testing = fetchFromGitHub {
     owner = "apache";
     repo = "arrow-testing";
-    rev = "d6c4deb22c4b4e9e3247a2f291046e3c671ad235";
-    sha256 = "0cwhnqijam632zp07j98i8ym967wz6kd35fim1msv88x2rhqky1i";
+    rev = "6d98243093c0b36442da94de7010f3eacc2a9909";
+    hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw=";
   };
 
   parquet-testing = fetchFromGitHub {
     owner = "apache";
     repo = "parquet-testing";
     rev = "ddd898958803cb89b7156c6350584d1cda0fe8de";
-    sha256 = "0n16xqlpxn2ryp43w8pppxrbwmllx6sk4hv3ycgikfj57nd3ibc0";
+    hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg=";
   };
 
 in stdenv.mkDerivation rec {
   pname = "arrow-cpp";
-  version = "4.0.1";
+  version = "5.0.0";
 
   src = fetchurl {
     url =
       "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m";
+    hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo=";
   };
   sourceRoot = "apache-arrow-${version}/cpp";
 
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     # ./cpp/thirdparty/versions.txt
     url =
       "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2";
-    sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl";
+    hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y=";
   };
 
   ARROW_MIMALLOC_URL = fetchurl {
@@ -45,8 +45,8 @@ in stdenv.mkDerivation rec {
     # ./cpp/cmake_modules/ThirdpartyToolchain.cmake
     # ./cpp/thirdparty/versions.txt
     url =
-      "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz";
-    sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs";
+      "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz";
+    hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 989433b499d3..e9510d9552ce 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -41,9 +41,9 @@ buildPythonPackage rec {
     # enabled in nixpkgs.
     # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
     "--deselect=pyarrow/tests/test_memory.py::test_env_var"
-    # Deselect the parquet dataset write test because it erroneously fails to find the
+    # Deselect a parquet dataset test because it erroneously fails to find the
     # pyarrow._dataset module.
-    "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem"
+    "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties"
   ];
 
   dontUseSetuptoolsCheck = true;

From 2be2b75dec148156f8f4da0fba53ffe7a1f10ec6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Jul 2021 22:24:30 +0200
Subject: [PATCH 07/57] nuclei: 2.4.1 -> 2.4.2

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

diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 3a205ebdb1e0..24ab55900f97 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A=";
+    sha256 = "0qgpkxb3wm5lwg8kvhfnirw60l81nrs0qv4z07740amnqzd6by4b";
   };
 
-  vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s";
+  vendorSha256 = "1ddr986rqmd57m8k4x78c4xkbja580ix6xdj5rbysfkr6g073qmq";
 
   modRoot = "./v2";
   subPackages = [

From 594a143e0e5dafbce1a2f400e233388d4461b7ae Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Wed, 28 Jul 2021 02:28:25 +0200
Subject: [PATCH 08/57] lua: normalize package name

---
 maintainers/scripts/update-luarocks-packages | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages
index da4d224bd330..c7180083da20 100755
--- a/maintainers/scripts/update-luarocks-packages
+++ b/maintainers/scripts/update-luarocks-packages
@@ -89,6 +89,10 @@ function convert_pkg() {
         echo "Skipping comment ${*}" >&2
         return
     fi
+
+    # Normalize package name
+    nix_pkg_name_normalized=$(sed 's/\./-/' <(echo "$nix_pkg_name"))
+
     if [ -z "$lua_pkg_name" ]; then
         echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2
         lua_pkg_name="$nix_pkg_name"
@@ -111,7 +115,7 @@ function convert_pkg() {
         luarocks_args+=("$pkg_version")
     fi
     echo "Running 'luarocks ${luarocks_args[*]}'" >&2
-    if drv="$nix_pkg_name = $(luarocks "${luarocks_args[@]}")"; then
+    if drv="$nix_pkg_name_normalized = $(luarocks "${luarocks_args[@]}")"; then
         echo "$drv"
     else
         echo "Failed to convert $nix_pkg_name" >&2

From 9a70fbc593389b35d5e83fe489d857cf3756632a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Wed, 28 Jul 2021 02:54:42 +0200
Subject: [PATCH 09/57] luarocks-nix: nix_v3.5.0 -> nix_v3.5.0-1

that changes some rules as how to normalize nix names
---
 pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
index 30e02a3623fa..6e55292722fd 100644
--- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
+++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix
@@ -5,7 +5,7 @@ luarocks.overrideAttrs(old: {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "luarocks-nix";
-    rev = "v3.5.0_nix";
-    sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk=";
+    rev = "nix_v3.5.0-1";
+    sha256 = "sha256-jcgshxAuuc8QizpYL/2K3PKYWiKsnF/8BJAUaryvEvQ=";
   };
 })

From a2a2bb32fb3cb254a10b88570366e221cb49fe37 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Fri, 30 Jul 2021 00:05:53 +0200
Subject: [PATCH 10/57] lua51Packages.plenary-nvim: init

there is no version yet
---
 maintainers/scripts/luarocks-packages.csv     |  3 +-
 .../lua-modules/generated-packages.nix        | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index a387430245ab..b092a58b2d10 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -78,10 +78,11 @@ mpack,,,,,
 moonscript,,,,,arobyn
 nvim-client,,,,,
 penlight,,,,,
+plenary.nvim,,,,lua5_1,
 rapidjson,,,,,
 readline,,,,,
 say,,,,,
-std__debug,std._debug,,,,
+std-_debug,std._debug,,,,
 std_normalize,std.normalize,,,,
 stdlib,,,,,vyp
 vstruct,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 07a91f96ff31..5cd7a7c8fe79 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1479,6 +1479,36 @@ penlight = buildLuarocksPackage {
     license.fullName = "MIT/X11";
   };
 };
+plenary-nvim = buildLuarocksPackage {
+  pname = "plenary.nvim";
+  version = "scm-1";
+
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/plenary.nvim-scm-1.rockspec";
+    sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash";
+  }).outPath;
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "git://github.com/nvim-lua/plenary.nvim",
+  "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974",
+  "date": "2021-07-12T11:07:18-04:00",
+  "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim",
+  "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny",
+  "fetchSubmodules": true,
+  "deepClone": false,
+  "leaveDotGit": false
+}
+ '') ["date" "path"]) ;
+
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua luassert ];
+
+  meta = with lib; {
+    homepage = "http://github.com/nvim-lua/plenary.nvim";
+    description = "lua functions you don't want to write ";
+    license.fullName = "MIT/X11";
+  };
+};
 rapidjson = buildLuarocksPackage {
   pname = "rapidjson";
   version = "0.6.1-1";

From 7b83ef98fd0e8b4634ac2e1093a1d53dbc0d2127 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 29 Jul 2021 19:33:10 -0300
Subject: [PATCH 11/57] org-packages 2021-07-29

---
 .../editors/emacs/elisp-packages/org-generated.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
index 4dbf968ee26a..6bfe29fc2e7d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
@@ -4,10 +4,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "20210719";
+        version = "20210726";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-20210719.tar";
-          sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6";
+          url = "https://orgmode.org/elpa/org-20210726.tar";
+          sha256 = "0bz5dwnknxb5mwb3rk6ckwq8a5imd2cjsx40ql9p9vc0c8rirqd4";
         };
         packageRequires = [];
         meta = {
@@ -19,10 +19,10 @@
       elpaBuild {
         pname = "org-plus-contrib";
         ename = "org-plus-contrib";
-        version = "20210719";
+        version = "20210726";
         src = fetchurl {
-          url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar";
-          sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476";
+          url = "https://orgmode.org/elpa/org-plus-contrib-20210726.tar";
+          sha256 = "0fxjmb1773skyq76qmgx1jqfcglxrxxxqysqiirm48cc6yf13kp7";
         };
         packageRequires = [];
         meta = {

From 3bf28a824a5c7ca832fc1eed1ce74f4f8fd07aa2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 29 Jul 2021 19:42:26 -0300
Subject: [PATCH 12/57] melpa-packages 2021-07-29

---
 .../elisp-packages/recipes-archive-melpa.json | 1539 +++++++++--------
 1 file changed, 807 insertions(+), 732 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index e0cb7878bc8b..3d5880c039ee 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -1600,8 +1600,8 @@
   "repo": "chumpage/ack-menu",
   "unstable": {
    "version": [
-    20130107,
-    640
+    20150504,
+    2022
    ],
    "deps": [
     "mag-menu"
@@ -1951,8 +1951,8 @@
     "annotation",
     "eri"
    ],
-   "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
-   "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
+   "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d",
+   "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln"
   },
   "stable": {
    "version": [
@@ -2182,16 +2182,16 @@
   "fetcher": "github",
   "repo": "alan-platform/AlanForEmacs",
   "unstable": {
-   "version": [
-    20210721,
-    1343
+  "version": [
+    20210728,
+    1427
    ],
    "deps": [
     "flycheck",
     "s"
    ],
-   "commit": "c1c4205d2cdf8bf69b22e62548568ed4a8529807",
-   "sha256": "023lzr112gjscmyqgfz5ib3a80s3bis72acsaxnk4jw32knjy4yl"
+   "commit": "6e2005441af34fe54872c00ed793f6084f25c3f8",
+   "sha256": "0fqbjklfglgiy838j37p0v0rcvzj48vps8zsn0bmnabnd5vsrc3b"
   },
   "stable": {
    "version": [
@@ -2333,8 +2333,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "f3688475bba4c451fdfe52ad95fb25c7050ec9f9",
-   "sha256": "02h6xhnnbx27gq3xm2f2j3py5h94kcg8m8399j7dhski60ncn4b4"
+   "commit": "8089607dc118827e832d4bd524b3c0f0f56e8cdd",
+   "sha256": "1im0k28skb9skxxfkh279j91xjfc4c7qnmwc8l6sgazhglj5rqs6"
   },
   "stable": {
    "version": [
@@ -2441,11 +2441,11 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20210703,
-    2203
+    20210728,
+    2330
    ],
-   "commit": "9d97c074b08000eacefc03ebc5dadbdc33888cc2",
-   "sha256": "06ya21isl47cfs4fsl8k3qzh7d27gss0snxv7mmv8a0c7rgjyx7j"
+   "commit": "e01eeb40858f971e45c014726a14c75556d8cc8f",
+   "sha256": "0psyfmajz2rsi5asv07514zd7vlwzk42hff4dcbmycyf7s998ifn"
   },
   "stable": {
    "version": [
@@ -2513,14 +2513,14 @@
   "repo": "seagle0128/all-the-icons-ibuffer",
   "unstable": {
    "version": [
-    20210721,
-    651
+    20210727,
+    808
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "a3cc2d96f619a2a6cf1cb6ad881ab6e509ac8fc3",
-   "sha256": "09l0y99lqi3p7h0ll3hm13zi6kp2pbya8rdpvqrx7jpkg3w5slfk"
+   "commit": "c1c0606a793b71c8c1efc3c55dfcc22182214f24",
+   "sha256": "0p0icyj9084q7gm3bjknxgxd6g36sgy3b1kpxlm3fmh93j0v6l32"
   },
   "stable": {
    "version": [
@@ -2575,15 +2575,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20210721,
-    653
+    20210727,
+    757
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "b20df3e2c901a107441b6246b9d03fa3dc57f47f",
-   "sha256": "1hqf3jqpq0viygxnbkq7rsabpyygz2kr6nl6jrarm8wdczs55rpr"
+   "commit": "2a4baba0343d1e4dcabc29e5ccca596fd032ac90",
+   "sha256": "1fy86vkn5j0v9brkfzfjrwr1zrp792i7pxywlrflahcbxd8v68pp"
   },
   "stable": {
    "version": [
@@ -3217,8 +3217,8 @@
     20200914,
     644
    ],
-   "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
-   "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
+   "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d",
+   "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln"
   },
   "stable": {
    "version": [
@@ -4102,7 +4102,7 @@
   "unstable": {
    "version": [
     20210501,
-    1536
+    1527
    ],
    "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19",
    "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5"
@@ -4604,14 +4604,14 @@
   "repo": "emacscollective/auto-compile",
   "unstable": {
    "version": [
-    20210615,
-    1457
+    20210728,
+    2054
    ],
    "deps": [
     "packed"
    ],
-   "commit": "0f3afc6b057f9c9a3b60966f36e34cb46008cf61",
-   "sha256": "0grb9y7v7ibbcjv1yhssnavz43cij16ys5c68my8mv12wg5ld86z"
+   "commit": "504863340fa82cf8aca785ad1f2a541be598c3d6",
+   "sha256": "0d1z6k4gcx9yxvvsi9m3pz0nfbql1f2vs29ccjcdycaxlq04k7ls"
   },
   "stable": {
    "version": [
@@ -5532,8 +5532,8 @@
     "avy",
     "embark"
    ],
-   "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
-   "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
+   "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86",
+   "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7"
   },
   "stable": {
    "version": [
@@ -7038,14 +7038,14 @@
   "repo": "bdarcus/bibtex-actions",
   "unstable": {
    "version": [
-    20210714,
-    1030
+    20210727,
+    1208
    ],
    "deps": [
     "bibtex-completion"
    ],
-   "commit": "6b9a075aebd85fee8a071ffbbada1158ecd470d4",
-   "sha256": "0ihpm7pnlx5acj7jmrqr9di92908mz7z3k1kg62k8vxj2q43a00c"
+   "commit": "a2569ef74b40ed6b6459ed1b1b19e12282b426d0",
+   "sha256": "02yvr60ri07igfq8c0v2a0hybqzkvnacqp34jv1y4dhd5igbhfdc"
   },
   "stable": {
    "version": [
@@ -7067,8 +7067,8 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20210718,
-    1044
+    20210725,
+    1459
    ],
    "deps": [
     "biblio",
@@ -7078,8 +7078,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
-   "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
+   "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762",
+   "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s"
   },
   "stable": {
    "version": [
@@ -8927,14 +8927,14 @@
   "repo": "alphapapa/burly.el",
   "unstable": {
    "version": [
-    20210709,
-    415
+    20210726,
+    125
    ],
    "deps": [
     "map"
    ],
-   "commit": "a67a026db0937b26c0b7a2fcf81bf44498ad2dd1",
-   "sha256": "0xck02i9l0yw7yzy6sgzg17k2hyqaj9lvafp7r229xzw8rdzl8cr"
+   "commit": "59fa9e92abdf1e730f8f3908d5a42852c10c5e2b",
+   "sha256": "1jbfsr28fhf945lhhbds89a9g5c8rbpmykwg8z5adp8ncfj6pw99"
   },
   "stable": {
    "version": [
@@ -9616,8 +9616,8 @@
   "repo": "beacoder/call-graph",
   "unstable": {
    "version": [
-    20210311,
-    830
+    20210728,
+    802
    ],
    "deps": [
     "anaconda-mode",
@@ -9626,8 +9626,8 @@
     "ivy",
     "tree-mode"
    ],
-   "commit": "3e5c510c51dd8b3491a32a1d67ad6268033348ee",
-   "sha256": "1jj8bj9a05dq0igxd2ddf0p9gc9sbffcn0wy3b26qlcspcvbpm1h"
+   "commit": "7a40f9ddb16a6ce9345e0bd632109b7e2048baa1",
+   "sha256": "18as7vq8cmhxkxgh0p8qlifyvza66n6xf9a2fi07wc4acp2gpn55"
   },
   "stable": {
    "version": [
@@ -9760,8 +9760,8 @@
     20210707,
     2310
    ],
-   "commit": "583f07515b3be254ec150ce1dadabb48fdfa5bd3",
-   "sha256": "1nccl2v2fvpmsmvga1ghb9kb72v90bgdqhxb153086qx69s7vlcn"
+   "commit": "c4c70235ebbfc1733789f07f084c2d071679feee",
+   "sha256": "063gfjlay5fdgd19q363np9p5s24hxrwvxbxahkjjfn40mnb6nqi"
   },
   "stable": {
    "version": [
@@ -10449,8 +10449,8 @@
     20171115,
     2108
    ],
-   "commit": "94d292543d4869c3c5b48bb4dd1e5d901ce6227e",
-   "sha256": "12pxnwgfr0ypf80hpgrqyb789wj41gv8cbzsr1jks7pinvpda65f"
+   "commit": "d33da533194106a0a30dc4a22f11acbd2846cfba",
+   "sha256": "0q89wmfa4pi2a3vs9qcy27dharxlqpxm9b4lpxbjzii9f08fad0x"
   },
   "stable": {
    "version": [
@@ -11240,8 +11240,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20210706,
-    1151
+    20210729,
+    521
    ],
    "deps": [
     "clojure-mode",
@@ -11252,8 +11252,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "fe8cf244fd3426261f9f630c981a6296afd433a4",
-   "sha256": "02xj7g6jnwd9vjr8jipqvwy89zadkzsak08pq8418hz2af26bvaf"
+   "commit": "52ad2bc4ebadf6692d9c2d5cfcae467e149beea6",
+   "sha256": "15vr53diq6q8sj9cnb3w8smxx6jlxp0ps4vjqk24yv1lgycfq0ng"
   },
   "stable": {
    "version": [
@@ -11522,8 +11522,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20210719,
-    918
+    20210727,
+    1320
    ],
    "deps": [
     "dash",
@@ -11533,8 +11533,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "b46d3c3c6e5a00237f62084c64a25c4b4efabe1b",
-   "sha256": "0gyyxaiky82km9c897vvslnin7yll3yzjfz0fd5zg7lz4kmjilqk"
+   "commit": "ad453630ced1fd1aa1f760b96da1cd702c77aaa9",
+   "sha256": "1v7k1psvj1n90y5nb8cflapfzn5hf75hxsfdmy4ppliw97b5bq9d"
   },
   "stable": {
    "version": [
@@ -11600,11 +11600,11 @@
   "repo": "universal-ctags/citre",
   "unstable": {
    "version": [
-    20210722,
-    1158
+    20210728,
+    125
    ],
-   "commit": "45e7f801744f471b43fdd96cfe734a4a3796bab6",
-   "sha256": "1sdj2nvgnbvsz2cvgzpr0axzm4gcb0sna0ps37mbxb0y356xyzfv"
+   "commit": "5c5958e467e4da7a8578039643d5036b3395e3d6",
+   "sha256": "1fal5cbj1wbji4ail1b8k9bc3c8mps7m68j7lk2086x67l1il9di"
   },
   "stable": {
    "version": [
@@ -12225,8 +12225,8 @@
     20210706,
     1318
    ],
-   "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1",
-   "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak"
+   "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a",
+   "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz"
   },
   "stable": {
    "version": [
@@ -12252,8 +12252,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1",
-   "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak"
+   "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a",
+   "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz"
   },
   "stable": {
    "version": [
@@ -12555,17 +12555,17 @@
     20210104,
     1831
    ],
-   "commit": "f7a3031b7defbc805a39a8b23dbefe10764d956b",
-   "sha256": "13036j6019viskahslw3vq28h5kn1xr6ap61l2hvgzpimriam012"
+   "commit": "9251205512c49bbdda5d82f48126dc5b8e79d70f",
+   "sha256": "0jkkb213w1zngask7n542rj8idjxvzbxy51pgydhas57m6xng4af"
   },
   "stable": {
    "version": [
     3,
     21,
-    0
+    1
    ],
-   "commit": "ff7a2e37bfff23ce1751a93b3eba179fbf32a9b6",
-   "sha256": "061cjj5mni91p6b0mpp6a2zrkrmw1hc3l4cci6lcqbx733y192fq"
+   "commit": "f7cf69e34a1607e8ea2b6d10fef6a6058377c24e",
+   "sha256": "18gwkb8p9086qg4acfbs74891nzh5wqs3id6iv5zqwc76kvcb4y7"
   }
  },
  {
@@ -13807,14 +13807,14 @@
   "repo": "redguardtoo/company-ctags",
   "unstable": {
    "version": [
-    20210629,
-    1038
+    20210723,
+    1322
    ],
    "deps": [
     "company"
    ],
-   "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174",
-   "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x"
+   "commit": "ff813c58e930d01fb55ee2f57fe810896a12c51b",
+   "sha256": "0v5a7aaqj1p2c6ci34v31r4jb1wd29rff7n779n3klaqjbkg3b6h"
   },
   "stable": {
    "version": [
@@ -13967,6 +13967,40 @@
    "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk"
   }
  },
+ {
+  "ename": "company-emojify",
+  "commit": "a83aa15fa8c6fa2e8fd22c8368be18714d97861f",
+  "sha256": "07rnpz30k38cmh20r1gf6zimch4y8kxyhrl5bk03x887hwkrwc4y",
+  "fetcher": "github",
+  "repo": "jcs-elpa/company-emojify",
+  "unstable": {
+   "version": [
+    20210718,
+    424
+   ],
+   "deps": [
+    "company",
+    "emojify",
+    "ht"
+   ],
+   "commit": "cebfff07a21f885f87a692ec4d5e7f84468c6565",
+   "sha256": "1ishjn1biv9irm3ih96b0larsz6jq81lxd7jjkh4nqjs1207gcij"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "company",
+    "emojify",
+    "ht"
+   ],
+   "commit": "015dc2cee7c9713794efd44d398a12eb62a94185",
+   "sha256": "0w1pvknlnbz9q9v9krq4cvfjmk1mzhcvyh61qqn5m9srgc3hdkg3"
+  }
+ },
  {
   "ename": "company-erlang",
   "commit": "ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219",
@@ -14766,8 +14800,8 @@
     "company",
     "prescient"
    ],
-   "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
-   "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
+   "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e",
+   "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr"
   },
   "stable": {
    "version": [
@@ -15720,11 +15754,11 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20210722,
-    1644
+    20210729,
+    844
    ],
-   "commit": "d42ccdca5bbc4c437819cf4d29c7b8728ed090bc",
-   "sha256": "134flhq2rx2qjhfc5fspsijpdiv7a3z5mk0j1pwipfwfkid27nqk"
+   "commit": "ebed71d554a5eda6914de6519cd30b867e9dbc28",
+   "sha256": "1bk9h3yh4r7l0jsmas83sa0hvzsbj8zvracf081jdhi7vl27p9zq"
   },
   "stable": {
    "version": [
@@ -15839,15 +15873,15 @@
   "url": "https://codeberg.org/jao/consult-notmuch.git",
   "unstable": {
    "version": [
-    20210701,
-    422
+    20210725,
+    2113
    ],
    "deps": [
     "consult",
     "notmuch"
    ],
-   "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e",
-   "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx"
+   "commit": "62462df58ecd888ae8a3a8421078227acdfd36d1",
+   "sha256": "0z4ayx6xh9x9rqj1shm4kw4q1xw99xncisd0c4m9g5qbn4mq6yas"
   },
   "stable": {
    "version": [
@@ -16219,8 +16253,8 @@
     "ivy",
     "swiper"
    ],
-   "commit": "56139df678d9886d0612c0a192cce2cf6f156628",
-   "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g"
+   "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c",
+   "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94"
   },
   "stable": {
    "version": [
@@ -16414,26 +16448,26 @@
   "repo": "redguardtoo/counsel-etags",
   "unstable": {
    "version": [
-    20210608,
-    206
+    20210725,
+    821
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "2c1f2161d36f70e0034e29abecfcb8878b30b6ac",
-   "sha256": "1hcsz773i67i82crzczm4csjkl9qj430m73lpvqkh7if543bs030"
+   "commit": "84fff26b0f207131c2e6669bd7f510eac43973aa",
+   "sha256": "07445bbr68q1pnwpj5bwqmml9ky1gq67g24zswv8fylnzjkhy9wc"
   },
   "stable": {
    "version": [
     1,
     9,
-    16
+    17
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "894cd7e25a2f96e29b70897ab799e7dd9e4f85fd",
-   "sha256": "01si554r0s6m7ypx1m2n0z6j6q6yihifz76dha6q6v56ixdlv626"
+   "commit": "84fff26b0f207131c2e6669bd7f510eac43973aa",
+   "sha256": "07445bbr68q1pnwpj5bwqmml9ky1gq67g24zswv8fylnzjkhy9wc"
   }
  },
  {
@@ -17389,25 +17423,20 @@
   "repo": "emacs-csharp/csharp-mode",
   "unstable": {
    "version": [
-    20210624,
-    1320
+    20210727,
+    1254
    ],
-   "deps": [
-    "tree-sitter",
-    "tree-sitter-indent",
-    "tree-sitter-langs"
-   ],
-   "commit": "093f0f21a9d04d79a380de145cbc42693ef8c76f",
-   "sha256": "1150s8zz9z6pmr9m8jny7g8qrhxdnpbk4nzrlyddhaf9hkw9nfi9"
+   "commit": "27cd2e8da1f374fd9db121826bf78484b0e4079e",
+   "sha256": "1qrcxyn9n2xn4k2is8q8brvicncc9x78gq3sl8xw00smww3i3rdj"
   },
   "stable": {
    "version": [
     0,
-    11,
+    12,
     0
    ],
-   "commit": "84664285a6d215998da763dc5d286d4f941df81e",
-   "sha256": "0aq6ln92jr3hcrd1592n4s5cb079fly7qaj2hm510p9zckyfx230"
+   "commit": "69fe52b5908e1b29b2765d7e01cd6a8f0fc16332",
+   "sha256": "1x40xm9d5sbxbnyxl12ppkzlgxzyn0bjg2vmc139jpkazmmw7r7k"
   }
  },
  {
@@ -17643,11 +17672,11 @@
   "repo": "raxod502/ctrlf",
   "unstable": {
    "version": [
-    20210418,
-    2044
+    20210724,
+    126
    ],
-   "commit": "dbe83710d06bc39315f1455f6f21479f3747c0aa",
-   "sha256": "0nl7mh1i9pw039gd0ma6xrv499aw2vs3a1fm1bxz71hh13jmbd4c"
+   "commit": "b78e129a8a4fabfebba8cdd5ef51278d0d57e0f4",
+   "sha256": "0j3rsax644x8753hginn0cd8sm86wf521p1rjqspdhgpi4dv0cdq"
   },
   "stable": {
    "version": [
@@ -17894,6 +17923,21 @@
    "sha256": "1idh5by5fzndaywf86lckz7mxr5kxggbzlgpjjvmahlnma110a1j"
   }
  },
+ {
+  "ename": "cursor-flash",
+  "commit": "6a269e5187fd244f67adb83b940eedcbd643a0c2",
+  "sha256": "0y7ngpxwid83rgw1fbmrp7xifkkvf04a9s6wdfd2l8jdyh0jvn65",
+  "fetcher": "github",
+  "repo": "Boruch-Baum/emacs-cursor-flash",
+  "unstable": {
+   "version": [
+    20210722,
+    445
+   ],
+   "commit": "6bb54a1e2e1bf9df80926718b1b8b9ee49080484",
+   "sha256": "1zav30zkf7ir5zwy9625wldg4kaf8bk3mn1py5sidihpn299319b"
+  }
+ },
  {
   "ename": "cursor-test",
   "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e",
@@ -18075,8 +18119,8 @@
     20190111,
     2150
    ],
-   "commit": "e46e9dd7c37d8d7ad432a94fff5daafa7fa444e3",
-   "sha256": "0lbla1pbqk2gaprkwdyxg5x381nmxx1jcc9snls6crlsf8bbhrm4"
+   "commit": "0574dbceef7b8ee16a9cc94091c3629dfa23133d",
+   "sha256": "1gnwy0pdxwwwicp46w9g9mcsnz070wb7hjvrj33nilsv796m3kss"
   },
   "stable": {
    "version": [
@@ -18173,11 +18217,11 @@
   "repo": "cbowdon/daemons.el",
   "unstable": {
    "version": [
-    20200421,
-    912
+    20210728,
+    1514
    ],
-   "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569",
-   "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd"
+   "commit": "cbab674d995022c1c223bfccf13d8009c7c4e2ba",
+   "sha256": "0h08k9g746j1kg4138am3v7lv9w6fg7yrz2hzm7x737qmg852chn"
   },
   "stable": {
    "version": [
@@ -19075,8 +19119,8 @@
     20201011,
     1543
    ],
-   "commit": "4fd5547a54ee931f4a16adde1d3b52bf01ce045a",
-   "sha256": "07yar2b0h8d16j3q55cw2mdk88akvsab6z7bpkzavyqalgvd061b"
+   "commit": "6f09126b2e97b2e195145204caba11d0d4f871df",
+   "sha256": "0qrjy3zs2xjf54b7kcwxbds99il76zxlx219c5d1siq6bkv0z0k4"
   },
   "stable": {
    "version": [
@@ -19889,8 +19933,8 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20210615,
-    1539
+    20210716,
+    241
    ],
    "deps": [
     "cl-lib"
@@ -20287,14 +20331,14 @@
   "repo": "tilmanrassy/emacs-dir-treeview",
   "unstable": {
    "version": [
-    20201003,
-    2206
+    20210625,
+    2358
    ],
    "deps": [
     "treeview"
    ],
-   "commit": "53dc9dae71d1be3a7a925332a53e72d2bd05366b",
-   "sha256": "0hgcargxbl58f4im57c1zqwnfxl52lfv78s8l69njjggvdki0hz1"
+   "commit": "c48b0e12eb02ae046cf6dc97fe006db31ded3f2b",
+   "sha256": "07hhy41h1qx38rrf6f9b2r13chs3v4mzyplhpx1r6wjrj0nmh2pv"
   }
  },
  {
@@ -21020,15 +21064,15 @@
   "repo": "ShuguangSun/dired-view-data",
   "unstable": {
    "version": [
-    20210529,
-    600
+    20210724,
+    1015
    ],
    "deps": [
     "ess",
     "ess-view-data"
    ],
-   "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c",
-   "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h"
+   "commit": "92dc267bcaac1b6258ad595488bf10b88882b5ae",
+   "sha256": "00zzcrhjkc3f0wfda3a843wk0ajkhyi8qi4jy0lax4myc0i8mpsk"
   },
   "stable": {
    "version": [
@@ -22014,14 +22058,14 @@
   "repo": "emacs-pe/docker-tramp.el",
   "unstable": {
    "version": [
-    20210526,
-    748
+    20210729,
+    508
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "aaee11cedf7b4c31700f24a1fd88dcef9c2a7c3d",
-   "sha256": "120sxrifn82hhrqhqdy0dhnni353vwzkkd5x7inqg1wpzsxjwhzl"
+   "commit": "7bfbb55417e7d2aac53adf92cb0e3fd329c495c1",
+   "sha256": "078hqc8rqw27v5li8dgmh9sspfrypha6h7hx4iagjwndb2llg2ix"
   },
   "stable": {
    "version": [
@@ -22306,14 +22350,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20210714,
-    1511
+    20210728,
+    2333
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b7995ac041f8dadb021cd2445e85d29c9bf718ae",
-   "sha256": "09hhplhb0832ja9nnsq3d4p6g0fdw2sp9kl2y4n2kk6zq909ar54"
+   "commit": "9e2680b9188ebd58c490598684bb7545ba01950d",
+   "sha256": "1yricwp9xndkqask5gg4frg5axmjn2g65z8bbazg9gixvsj4gbbq"
   },
   "stable": {
    "version": [
@@ -22510,8 +22554,8 @@
    "deps": [
     "debian-el"
    ],
-   "commit": "0f2a8257788a2f99e87326e52402f69e3f534903",
-   "sha256": "1hkabhnbiwygcx3blv3hc819m3bckkcngsf280pfg2y1xmd9n7b2"
+   "commit": "458f5230d02b15c94e94eca1af4eabaec30f45db",
+   "sha256": "0cdsi18vn3la9yaq4nbpvvhrblr36x0lc54wp7gv75rlg23fbl5a"
   },
   "stable": {
    "version": [
@@ -22970,8 +23014,8 @@
     20210715,
     548
    ],
-   "commit": "07dd21abc029f50c6a3a96f2867d31102366faba",
-   "sha256": "0pvbvzdljxq7mjfsx4fcm3782wdawx2mgzi4hy7kvw7z80n9zm7k"
+   "commit": "d1e683b1489ff830d61566876a94b1da35bc2aaa",
+   "sha256": "0yi88xd0h3mbggjhay66pz7j55hjvqln7cs0av2na9d5mf70asrb"
   },
   "stable": {
    "version": [
@@ -23543,15 +23587,15 @@
   "repo": "masasam/emacs-easy-hugo",
   "unstable": {
    "version": [
-    20210303,
-    2352
+    20210726,
+    2034
    ],
    "deps": [
     "popup",
     "request"
    ],
-   "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40",
-   "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf"
+   "commit": "279d242d66dd48f7a59405167dff332a569f4c1d",
+   "sha256": "0cvzq29299lsh6rq4sxmz2fdsnapbv4iqrx2bnsvld9dpm01m6j6"
   },
   "stable": {
    "version": [
@@ -24730,8 +24774,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20210522,
-    1036
+    20210723,
+    1958
    ],
    "deps": [
     "anaphora",
@@ -24742,8 +24786,8 @@
     "websocket",
     "with-editor"
    ],
-   "commit": "09af85821e4fce64675d5287fe9f3a6847d1c5d2",
-   "sha256": "12b8idh2mpd37nrc8ricr4s4hz4wgnp7cy1298qcpxl00xx99dqw"
+   "commit": "983ee612f81c1f976bc1ebce2bfe574a825ba9ed",
+   "sha256": "1hfsbw5fgxbxma7smzmdc7qa4f9affrgs19xxk3dk0p659789lip"
   },
   "stable": {
    "version": [
@@ -24767,24 +24811,6 @@
    "sha256": "0jnqi8pq83s8q0dy2y1518yz8lsc0graqrqf8frss21fcj7ny22g"
   }
  },
- {
-  "ename": "ein-mumamo",
-  "commit": "bd8fcf7f6332f94dc37697f9412c8043da8d4f76",
-  "sha256": "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w",
-  "fetcher": "github",
-  "repo": "millejoh/ein-mumamo",
-  "unstable": {
-   "version": [
-    20150302,
-    28
-   ],
-   "deps": [
-    "ein"
-   ],
-   "commit": "028fefec499598add1a87b92ed991891f38f0c7b",
-   "sha256": "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570"
-  }
- },
  {
   "ename": "eink-theme",
   "commit": "a1349c3f93ab60983f77c28f97048fa258b612a6",
@@ -25619,14 +25645,14 @@
   "repo": "Manoj321/elfeed-dashboard",
   "unstable": {
    "version": [
-    20201218,
-    347
+    20210727,
+    603
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "9e8e212da9ea471bdc58bc0a1f5932833029bb38",
-   "sha256": "182kr8nqrnf1lpiqbl04qm6871yvk0z53dxxdjc2y9xnh6dvx460"
+   "commit": "b143f8453aed2053e8fc6f05cef6233797408546",
+   "sha256": "1yvr3fg5dx0z6h7jbv3fvn5ccw5grpcaj2ynp7zri5y388g160ql"
   }
  },
  {
@@ -26294,11 +26320,21 @@
   "repo": "jcaw/elnode",
   "unstable": {
    "version": [
-    20190608,
-    1623
+    20190702,
+    1509
    ],
-   "commit": "305c532b6e59f58c4afcfb76466dbfbdc4e58b9c",
-   "sha256": "1214216wrdhfw3lbf59vnddk28hi4g3s1ksdi5walksihd3gh7my"
+   "deps": [
+    "creole",
+    "dash",
+    "db",
+    "fakir",
+    "kv",
+    "noflet",
+    "s",
+    "web"
+   ],
+   "commit": "29ef0f51a65a24fca7fdcdb4140d2e4556e4bb29",
+   "sha256": "1bks7aakhvdab56gbsa44ca9kbilajisdd9bns485d9wr62d2lgj"
   }
  },
  {
@@ -26456,20 +26492,20 @@
   "url": "https://thelambdalab.xyz/git/elpher.git",
   "unstable": {
    "version": [
-    20210720,
-    1520
+    20210729,
+    1123
    ],
-   "commit": "3cddc8bdcb0a05ecd308c310bcd020f7288af4de",
-   "sha256": "12xcra3a5bsihcfqs014bcayw0wmv5f22gdk6dipfx1pjygz1x1k"
+   "commit": "2cdf02e99dbd2d7f765c08ad2f8477b4ea07d5f7",
+   "sha256": "19gsy0q8qddsm7mcf8ijkw2f92cqg7q32x7yhqblmmwbqa7zcsjf"
   },
   "stable": {
    "version": [
-    2,
-    10,
-    2
+    3,
+    1,
+    0
    ],
-   "commit": "1edbaec565d413a9c7d4c55e9356c38b2037e0f5",
-   "sha256": "0xqiisirpvw4ka9417pq4r73x937wl3qbf8cpn2i03akm8d58smd"
+   "commit": "8c20802c5f2262440dadbdca60b7901d09ca022f",
+   "sha256": "0a6qfm7x4nbfanjv33h1zgcwnywd77qbc4adya5kx8lndcn0669l"
   }
  },
  {
@@ -27129,11 +27165,11 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20210723,
-    47
+    20210729,
+    1843
    ],
-   "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
-   "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
+   "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86",
+   "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7"
   },
   "stable": {
    "version": [
@@ -27152,15 +27188,15 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20210717,
-    1845
+    20210729,
+    1543
    ],
    "deps": [
     "consult",
     "embark"
    ],
-   "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
-   "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
+   "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86",
+   "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7"
   },
   "stable": {
    "version": [
@@ -27327,16 +27363,16 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20210619,
-    1246
+    20210726,
+    1926
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "6e0aaaf4c5598826b24c3079b80bf8af000a77c6",
-   "sha256": "016y0w1gy8z1gdri54njas20l3kw99jg5bjyrmcbmgzjmb1jq0y8"
+   "commit": "a0e26c1a143778f7378ec8a053725726e1e6aeef",
+   "sha256": "0j1jjwavdl3q33rn6zx9z3ka87d9fihd9s5bhrgw3x4fvgv8gikg"
   },
   "stable": {
    "version": [
@@ -27769,8 +27805,8 @@
   "repo": "rejeep/enclose.el",
   "unstable": {
    "version": [
-    20120618,
-    2019
+    20121008,
+    1614
    ],
    "commit": "2747653e84af39017f503064bc66ed1812a77259",
    "sha256": "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim"
@@ -27910,7 +27946,7 @@
   "unstable": {
    "version": [
     20130407,
-    1236
+    1348
    ],
    "commit": "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80",
    "sha256": "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd"
@@ -28714,8 +28750,8 @@
     20200914,
     644
    ],
-   "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
-   "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
+   "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d",
+   "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln"
   },
   "stable": {
    "version": [
@@ -28738,8 +28774,8 @@
     20210315,
     1640
    ],
-   "commit": "4adbbaa681d902cc342f20c4e153d0cb6d866238",
-   "sha256": "01nq7qdmdpasvay3jg9kmg8wamvf37pwqcc37sfc85h81qf2rvc4"
+   "commit": "4a12f98146fb5f0484ae04b6bf1e469c3d882e12",
+   "sha256": "09rpzlvygp83drcwgbq75bxgi7m8xrap51mrgqc4rfgcmmmc3zk3"
   },
   "stable": {
    "version": [
@@ -28959,8 +28995,8 @@
   "repo": "dakrone/es-mode",
   "unstable": {
    "version": [
-    20201112,
-    2317
+    20201125,
+    2059
    ],
    "deps": [
     "cl-lib",
@@ -30195,15 +30231,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20210721,
-    658
+    20210726,
+    2220
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f",
-   "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r"
+   "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720",
+   "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6"
   },
   "stable": {
    "version": [
@@ -30963,26 +30999,26 @@
   "repo": "redguardtoo/evil-matchit",
   "unstable": {
    "version": [
-    20210609,
-    1311
+    20210727,
+    1106
    ],
    "deps": [
     "evil"
    ],
-   "commit": "d7ad7f712b98aa64b7cc4fb16354b32666739c77",
-   "sha256": "1x7wpq0lgkp016yik6sc7b2abhixgcwk0mxx29dyycsjjkdlhp3a"
+   "commit": "80dc731ab736545541546ca64187e850bf0e39c8",
+   "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk"
   },
   "stable": {
    "version": [
     2,
     3,
-    12
+    13
    ],
    "deps": [
     "evil"
    ],
-   "commit": "9cd0ddaacb3476221d37344715c759ed3cb538d7",
-   "sha256": "0l4ash907d91vccqdxjz1v5spd8f4va0vrdri6h9y1qc67mjlsph"
+   "commit": "80dc731ab736545541546ca64187e850bf0e39c8",
+   "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk"
   }
  },
  {
@@ -31723,8 +31759,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f",
-   "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r"
+   "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720",
+   "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6"
   },
   "stable": {
    "version": [
@@ -31747,15 +31783,15 @@
   "repo": "iyefrat/evil-tex",
   "unstable": {
    "version": [
-    20210510,
-    1809
+    20210728,
+    2155
    ],
    "deps": [
     "auctex",
     "evil"
    ],
-   "commit": "87445d4d2339436179e792609bfbff0eaf056a9c",
-   "sha256": "014bwsnry6v07n9cv194gsiwny0jp6rxs5gl4dhqfwq9hbj74p84"
+   "commit": "9b3a560cc43cca73d2947747892f7d4f92c2c573",
+   "sha256": "0hain42prqaa08fc116a0qy12j8pbj4a8i589s6h87h4hhy8dj8d"
   },
   "stable": {
    "version": [
@@ -32791,15 +32827,15 @@
   "repo": "Wilfred/ez-query-replace.el",
   "unstable": {
    "version": [
-    20210525,
-    2222
+    20210724,
+    2247
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "3202cf4644ed3b6549284c3816b90bb230970a5b",
-   "sha256": "1xsvwf7g7c3v4p59svmahhn9pkr6zgp6vyr6dyvfy24mgaqw4jzv"
+   "commit": "2b68472f4007a73908c3b242e83ac5a7587967ff",
+   "sha256": "0zdgdqd9zi9fz6rn2z24jmpr83rzwbgxq0q38ynmskkd7n42a8ds"
   },
   "stable": {
    "version": [
@@ -32946,14 +32982,11 @@
   "url": "https://git.sr.ht/~pkal/face-shift",
   "unstable": {
    "version": [
-    20210707,
-    1127
+    20210725,
+    2146
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "0170ab2993211eb0f514f7d1ce14e8194a11f6b2",
-   "sha256": "0zj9h3nmswpc7q02a76rrzw3ypjwn1lwq5mkm6s28q0xrdpmrgq3"
+   "commit": "14dce79fc42116c49eb4c8a4ab7ca3c4bd7cbf6f",
+   "sha256": "0k10dskv9fzs1y05h7mq0z798kpwgkwwhh9dd9d7hdk70vkvlg66"
   },
   "stable": {
    "version": [
@@ -33105,8 +33138,8 @@
    "deps": [
     "popup"
    ],
-   "commit": "1096582f68cda91fe9d9336756b7c044ab0d6096",
-   "sha256": "0qp1nqcni5a3m9iaqar07sii6mpcnnqxmaf5n2fpz1iaz6bwsxva"
+   "commit": "eff6cba7b09611ce9ade56972f0ceccf227cf174",
+   "sha256": "0nzg2l9wxyqkhr4wj0mmcc4ydm1lx1smdcnsf1hs2yqh7bdgi02k"
   }
  },
  {
@@ -33371,11 +33404,11 @@
   "repo": "yqrashawn/fd-dired",
   "unstable": {
    "version": [
-    20210605,
-    1057
+    20210723,
+    549
    ],
-   "commit": "c223aee30af7dc7f52fb20045226ed9f49f4ec49",
-   "sha256": "14dzn3ggq8vb6qb5babngrpgsb29k6y8ficgzwwd9wfd5npynrpa"
+   "commit": "458464771bb220b6eb87ccfd4c985c436e57dc7e",
+   "sha256": "0253r4fbi9b8vk5akp1wz0krvik500jhy1hclwp1p0bwrq2irlml"
   },
   "stable": {
    "version": [
@@ -33493,11 +33526,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20210720,
-    1516
+    20210724,
+    2039
    ],
-   "commit": "12bdd8ee09ce2ba7c232df96fb199461d25a89c5",
-   "sha256": "13fyadml9wa30f4brdwfnby067q6bp2dl1y6x7hz0pzzlbk4sbs5"
+   "commit": "128702146298dad3f4d5409992e985fe670581d1",
+   "sha256": "12mvxziyrzgbmcg9kcqbscjld42ybl7km027m0kaln39awc0nb03"
   },
   "stable": {
    "version": [
@@ -33834,11 +33867,11 @@
   "repo": "redguardtoo/find-file-in-project",
   "unstable": {
    "version": [
-    20210720,
-    244
+    20210729,
+    5
    ],
-   "commit": "cde02e549512742366a91ffb70c86c354117cfde",
-   "sha256": "1xkpyn5lh6nhsmnq50174lnir9c9xhwb9ihvj0lw721s57xq3aa0"
+   "commit": "136018df39520433840d67acbbf92908ab115532",
+   "sha256": "0rgvk4r1iy4kncmxvgzlgb39dsjvvmihnqwrjgkmzdqfx9891m02"
   },
   "stable": {
    "version": [
@@ -38551,11 +38584,11 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210723,
-    505
+    20210724,
+    1042
    ],
-   "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
-   "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
+   "commit": "00357953a736e21d0a1c8d76f5605820990544fe",
+   "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj"
   },
   "stable": {
    "version": [
@@ -38582,8 +38615,8 @@
     "avy-menu",
     "flyspell-correct"
    ],
-   "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
-   "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
+   "commit": "00357953a736e21d0a1c8d76f5605820990544fe",
+   "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj"
   },
   "stable": {
    "version": [
@@ -38614,8 +38647,8 @@
     "flyspell-correct",
     "helm"
    ],
-   "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
-   "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
+   "commit": "00357953a736e21d0a1c8d76f5605820990544fe",
+   "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj"
   },
   "stable": {
    "version": [
@@ -38646,8 +38679,8 @@
     "flyspell-correct",
     "ivy"
    ],
-   "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
-   "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
+   "commit": "00357953a736e21d0a1c8d76f5605820990544fe",
+   "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj"
   },
   "stable": {
    "version": [
@@ -38678,8 +38711,8 @@
     "flyspell-correct",
     "popup"
    ],
-   "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
-   "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
+   "commit": "00357953a736e21d0a1c8d76f5605820990544fe",
+   "sha256": "1jf1jd0y6pn61czgsb9bccj3zxwjyglv0cgvyjjkadk1biaz0chj"
   },
   "stable": {
    "version": [
@@ -39151,8 +39184,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20210716,
-    1447
+    20210727,
+    1934
    ],
    "deps": [
     "closql",
@@ -39165,8 +39198,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "49da45ac4515d7442ebd606f4ad4922a3e1439ff",
-   "sha256": "1vqhxckmkfbkvpnsigdb1625b5n0fpry2hxkympqnxspcccnijks"
+   "commit": "34cbaa7b6a77ba2e4c6750f4f922d3e887c08c67",
+   "sha256": "1bpkzzkm3r0ylfk319k0dr03ikllhps65yir5i7ybwafddj8albp"
   },
   "stable": {
    "version": [
@@ -39526,11 +39559,11 @@
   "repo": "tarsius/frameshot",
   "unstable": {
    "version": [
-    20200103,
-    1238
+    20210728,
+    1258
    ],
-   "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf",
-   "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6"
+   "commit": "63d42d913468cd0d75dcccb99e5517057fa34e25",
+   "sha256": "0ar5dxyxz7nwmh1b1rdiiy76fm43q0pxcpj5959pc7gqxbf5c1rh"
   },
   "stable": {
    "version": [
@@ -39652,11 +39685,11 @@
   "repo": "rnkn/freeze-it",
   "unstable": {
    "version": [
-    20210201,
-    731
+    20210727,
+    1535
    ],
-   "commit": "d5dc811fc892d78e042394bb4a1342dea2480b5c",
-   "sha256": "0n1w3rycc5cpqvhw6d1dzkwjdy1xx7bps7d994l4hcpdfx5c25lx"
+   "commit": "151d264a0d0593b413b5a984b391023e905a190b",
+   "sha256": "04cv6p9df7h6w9h2ina3y3mmkp0y1rs6d9wmzari0cbm7q50hz4l"
   },
   "stable": {
    "version": [
@@ -39989,8 +40022,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "d9b6d549251d4a1a7cec2e83b11bda2ef7ff4ed2",
-   "sha256": "0246kl945g5v539h1hvwg06jsmj10a4q8rld3g6jix2iy1jmnfw7"
+   "commit": "7b451bb813d242dbc0cd6c29d071e0b320f2200e",
+   "sha256": "0wvbjc40f3bph7vhkixnrqa7k18f5jl81zdvdrr3fplkqnm3vxwj"
   },
   "stable": {
    "version": [
@@ -40728,8 +40761,8 @@
   "repo": "emacs-geiser/gauche",
   "unstable": {
    "version": [
-    20200801,
-    2337
+    20200802,
+    1300
    ],
    "deps": [
     "geiser"
@@ -41316,15 +41349,15 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20210619,
-    1405
+    20210727,
+    1414
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "865424d4faf66048bfb3752856ac0cf68e1c6efe",
-   "sha256": "0kqjxwkm3n6r9zg6pi015g9ix4pyz7b2rngcmmrindcjb5h292a4"
+   "commit": "00a77b79c28e22db1b151c3f7857073ccbeff726",
+   "sha256": "0qrp2n53fhvwr5ndnmfzh841g88hzmcgz3i54hbcqq1gj6vwqd7f"
   },
   "stable": {
    "version": [
@@ -41690,8 +41723,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
-   "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
+   "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6",
+   "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8"
   },
   "stable": {
    "version": [
@@ -42343,11 +42376,11 @@
   "repo": "TxGVNN/github-explorer",
   "unstable": {
    "version": [
-    20210402,
-    1246
+    20210718,
+    824
    ],
-   "commit": "633b7371a6a00660422e195795c4b79f16bf29ae",
-   "sha256": "1wqnar0y6migb5n4hkz98r5bpxxx9m4qn15wg9cz213jpnykfkyy"
+   "commit": "98d759473ddfdddba0d82ff710aafc9ee6f0490b",
+   "sha256": "084scd1prj0i1ljz6l298a4yknqkj4rjl9yjvqmd605ac8ji3xh1"
   },
   "stable": {
    "version": [
@@ -44593,8 +44626,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "7822b34eb5d359ddae2f93d356c78c5ea05784d5",
-   "sha256": "0qkznd0a6cc32mwnmsa28lr8zji2nsi87kzcn467hq542zr61nz6"
+   "commit": "19e1a8188e003bae250ff6c40f61a31b638ce35d",
+   "sha256": "0iajd0qdcgh4vvl3f81z4r1pki9wkzy3hrywp1mmm5zhfncvhfis"
   },
   "stable": {
    "version": [
@@ -46645,16 +46678,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20210714,
-    1600
+    20210729,
+    1510
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c",
-   "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37"
+   "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9",
+   "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98"
   },
   "stable": {
    "version": [
@@ -46939,16 +46972,16 @@
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20201214,
-    2111
+    20210725,
+    1510
    ],
    "deps": [
     "bibtex-completion",
     "cl-lib",
     "helm"
    ],
-   "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
-   "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
+   "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762",
+   "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s"
   },
   "stable": {
    "version": [
@@ -47559,8 +47592,8 @@
    "deps": [
     "async"
    ],
-   "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c",
-   "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37"
+   "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9",
+   "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98"
   },
   "stable": {
    "version": [
@@ -48406,26 +48439,26 @@
   "repo": "masutaka/emacs-helm-ghq",
   "unstable": {
    "version": [
-    20190526,
-    1409
+    20210724,
+    744
    ],
    "deps": [
     "helm"
    ],
-   "commit": "d0d6aa0f407388e7012f0443df8ae657ece01779",
-   "sha256": "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082"
+   "commit": "7b47ac91e42762f2ecbbceeaadc05b86c9fe5f14",
+   "sha256": "0a4piipqnsj0rnwmqz3vj674ljmy1bl33qr9hv959pw5b3jzqfh0"
   },
   "stable": {
    "version": [
     1,
     8,
-    0
+    1
    ],
    "deps": [
     "helm"
    ],
-   "commit": "d0d6aa0f407388e7012f0443df8ae657ece01779",
-   "sha256": "08884pk0d6xplsn1z9slaf4b9mmam6s9dg4dcxi1na1inpi6y082"
+   "commit": "7b47ac91e42762f2ecbbceeaadc05b86c9fe5f14",
+   "sha256": "0a4piipqnsj0rnwmqz3vj674ljmy1bl33qr9hv959pw5b3jzqfh0"
   }
  },
  {
@@ -48734,26 +48767,26 @@
   "repo": "masutaka/emacs-helm-hatena-bookmark",
   "unstable": {
    "version": [
-    20190609,
-    1455
+    20210724,
+    732
    ],
    "deps": [
     "helm"
    ],
-   "commit": "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e",
-   "sha256": "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1"
+   "commit": "a6a2b37370ac84ca2cae5ef65b2b144a010b1584",
+   "sha256": "0zwngldnh6ys9m7v0fc4nwk1bcrwqvip08114vn4dcv8kl3lnxvv"
   },
   "stable": {
    "version": [
     2,
     4,
-    3
+    4
    ],
    "deps": [
     "helm"
    ],
-   "commit": "10b8bfbd7fc4c3f503b2bc01f0c062dac128059e",
-   "sha256": "17f7y7bw15y3x30j7b3ymp3gpnszfvnf8hmlgc1mkwafxvzv06i1"
+   "commit": "a6a2b37370ac84ca2cae5ef65b2b144a010b1584",
+   "sha256": "0zwngldnh6ys9m7v0fc4nwk1bcrwqvip08114vn4dcv8kl3lnxvv"
   }
  },
  {
@@ -49145,8 +49178,8 @@
   "repo": "julienXX/helm-lobste.rs",
   "unstable": {
    "version": [
-    20150211,
-    2214
+    20150213,
+    1546
    ],
    "deps": [
     "cl-lib",
@@ -49164,14 +49197,14 @@
   "repo": "emacs-helm/helm-ls-git",
   "unstable": {
    "version": [
-    20210324,
-    1515
+    20210729,
+    911
    ],
    "deps": [
     "helm"
    ],
-   "commit": "48696448e52d266f5b2cb5ee1390071dab4d16e8",
-   "sha256": "1nhza9af2xfwq1idk4g69kr4wyyf9samk3vi40jvkfnwap4w3ip4"
+   "commit": "d861fb407d72470db41ac458447b92c6d9b00206",
+   "sha256": "13hxglh5w70w5y7x4r7rqpa7npj4lfrajjjic8vizn71752cndkg"
   },
   "stable": {
    "version": [
@@ -54285,15 +54318,15 @@
   "repo": "idris-hackers/idris-mode",
   "unstable": {
    "version": [
-    20210614,
-    1212
+    20210728,
+    846
    ],
    "deps": [
     "cl-lib",
     "prop-menu"
    ],
-   "commit": "f52ad0b4770403561b40f1d0499ecaca70da886c",
-   "sha256": "1ai5ha67650ryj7mdxx6b86hlm2v13h7kipisgvxj5dss3j9j7lv"
+   "commit": "be578820a7e14cb4264a63eac272800a3540a7f3",
+   "sha256": "174xlr36n8iv8gmapmfy55jgppmbck0m51yhni35674f50q8200y"
   },
   "stable": {
    "version": [
@@ -55152,26 +55185,26 @@
   "repo": "clojure-emacs/inf-clojure",
   "unstable": {
    "version": [
-    20210322,
-    1421
+    20210723,
+    718
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "a2cebf5362fe583538dda8dcf6348a8d73b462a2",
-   "sha256": "0sfn6x08i7sd2k6z4swpd8hxaab3ly0gfyapcaq768chi0grr0gw"
+   "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8",
+   "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy"
   },
   "stable": {
    "version": [
     3,
-    0,
+    1,
     0
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "2c8e46b584be71fe1a585c9072da86382710dc59",
-   "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b"
+   "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8",
+   "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy"
   }
  },
  {
@@ -55911,8 +55944,8 @@
   "repo": "dcjohnson/inverse-acme-theme",
   "unstable": {
    "version": [
-    20170615,
-    1337
+    20210204,
+    1640
    ],
    "deps": [
     "autothemer",
@@ -56432,11 +56465,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20210602,
-    1349
+    20210727,
+    1907
    ],
-   "commit": "56139df678d9886d0612c0a192cce2cf6f156628",
-   "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g"
+   "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c",
+   "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94"
   },
   "stable": {
    "version": [
@@ -56463,8 +56496,8 @@
     "avy",
     "ivy"
    ],
-   "commit": "56139df678d9886d0612c0a192cce2cf6f156628",
-   "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g"
+   "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c",
+   "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94"
   },
   "stable": {
    "version": [
@@ -56496,8 +56529,8 @@
     "cl-lib",
     "swiper"
    ],
-   "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
-   "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
+   "commit": "12079bb09f203dda5cc2dd003bd60a6ad490f762",
+   "sha256": "11y1yif6z26cc502s72p310z9m6130p5kyqb2py74r3x0k0nc61s"
   },
   "stable": {
    "version": [
@@ -56831,8 +56864,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "56139df678d9886d0612c0a192cce2cf6f156628",
-   "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g"
+   "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c",
+   "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94"
   },
   "stable": {
    "version": [
@@ -57039,8 +57072,8 @@
     "ivy",
     "prescient"
    ],
-   "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
-   "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
+   "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e",
+   "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr"
   },
   "stable": {
    "version": [
@@ -58915,14 +58948,14 @@
   "repo": "tminor/jsonnet-mode",
   "unstable": {
    "version": [
-    20210627,
-    1451
+    20210726,
+    1251
    ],
    "deps": [
     "dash"
    ],
-   "commit": "404ebe3ca964fde99b7a6d89d2840ce53376d80a",
-   "sha256": "1ddkljjmvbm35gdw6wnys2na19826wxxgydlikn52nvchvr5z5z9"
+   "commit": "63c0f44fe7b5a333173235db7102ef8c2ae0b006",
+   "sha256": "1l7v5ibbl52ylbnz92ipw10ds8ahj3s2q4yxansnj8xy19kpjchz"
   },
   "stable": {
    "version": [
@@ -59071,8 +59104,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20210722,
-    426
+    20210728,
+    523
    ],
    "deps": [
     "dash",
@@ -59081,8 +59114,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "e4035da5322b9528b9751a0305a0feaa28e181fb",
-   "sha256": "1rpcsw7ddg7cs5mha7sn4j719rkvk04vwsri1y6d1c80y2fdlr10"
+   "commit": "7652679de3118c10659fdc492d67ec097e9ef46e",
+   "sha256": "1n41bvrrnqgj3qijdn4s7zac4xrfvyh759q99agycbsm1xdpkrvj"
   },
   "stable": {
    "version": [
@@ -59645,28 +59678,28 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20210605,
-    1117
+    20210727,
+    1225
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "7eb08e47bc5f227c72c318ff327c689ab54a7620",
-   "sha256": "181vnz6ancqhb13w9890pbplnw6lzbzcx3xkg4li9fk10lab72zk"
+   "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60",
+   "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g"
   },
   "stable": {
    "version": [
     1,
     6,
-    4
+    5
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "c50bc11fdd42dc98ff806d1fc7cd94619c0ab7bb",
-   "sha256": "08ypmv43vjk1l409n894jxplnja6nicn2k3qwhwaf9qxhz0yxpjr"
+   "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60",
+   "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g"
   }
  },
  {
@@ -59771,11 +59804,11 @@
   "repo": "ifosch/keepass-mode",
   "unstable": {
    "version": [
-    20210628,
-    729
+    20210110,
+    630
    ],
-   "commit": "fd7d380b762c888f25435d0c241012cdabf6e288",
-   "sha256": "1623hqlyk7qlvb5kigkyiji98a2vp39y0v6smag2mnqa3r89jq7l"
+   "commit": "515343a7667b2bf4253309449f65a6eb94933df7",
+   "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c"
   },
   "stable": {
    "version": [
@@ -60454,8 +60487,8 @@
     20210318,
     2106
    ],
-   "commit": "143ba31a0a5c23d8c1a8d6fb1972d94cc1d7f31c",
-   "sha256": "1daisqp687p0bpjk8mj7c3sxq9clwi25byzbk7yx8l15rcr1bhr5"
+   "commit": "a55ad400a52e038f110df10d8f3c1e822b90f76c",
+   "sha256": "06kwhj190k7g5hqy9ibgphf1xrhkhzp36d0d3kqbqkdfc4jx7xaj"
   },
   "stable": {
    "version": [
@@ -60475,15 +60508,15 @@
   "repo": "stardiviner/kiwix.el",
   "unstable": {
    "version": [
-    20210723,
-    443
+    20210724,
+    1237
    ],
    "deps": [
     "elquery",
     "request"
    ],
-   "commit": "c0c597d1e1653112f3e10c67dcc22d85beb2aed8",
-   "sha256": "1k056qzw3a4i4icyrl1a0dv971jnl5d096hawj5qhgwslplrhdpj"
+   "commit": "71e770ce1e9994cf3e035cbcc7a2f26b1922323c",
+   "sha256": "0m6insjzl4hc00ank3i5f7y3mq734cbz085yfkm79vziy5j1i2bc"
   },
   "stable": {
    "version": [
@@ -61007,8 +61040,8 @@
     "auctex",
     "yasnippet"
    ],
-   "commit": "9d6f4448347fcf48d0fed51eba16423c9254c212",
-   "sha256": "0kfivjdjhlrbrn1z6i51y36s6f4qj386iy1jpcbvv33xa0lh5ksi"
+   "commit": "d6cd35d57ed9cd1728913ee75e42f575f090c3b9",
+   "sha256": "0i571idikvgryyar4sskl9k31jrn88cax7gm18mm6yfjq33ivk18"
   },
   "stable": {
    "version": [
@@ -61109,8 +61142,8 @@
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "138e6794122f8601e58731a365930bd7cf5791ea",
-   "sha256": "0zj3i612h0sih7lyy4zvzldcrgqmsqcvr4y42zv75r81s0l6gddz"
+   "commit": "4cf69db45aeeb01feb6b38c88b6aa2d01ae4da13",
+   "sha256": "1ihs24dqnbzj37y9zrwdwzwnr1xrxcs4qxm0z3d1bjalffai2x13"
   }
  },
  {
@@ -61983,8 +62016,8 @@
   "repo": "phillord/lentic",
   "unstable": {
    "version": [
-    20190102,
-    2124
+    20210727,
+    1247
    ],
    "deps": [
     "dash",
@@ -61992,8 +62025,8 @@
     "m-buffer",
     "s"
    ],
-   "commit": "e6d013bf570bb235817f6c8f0abdd31d3b456d53",
-   "sha256": "0ksmb5mvcpa699bw62fkhrx1i8adgrzsbc2fivfsimq54y25rdd7"
+   "commit": "36861bdf9c1d88492648da553f66529e3a879880",
+   "sha256": "0cj19czxmrxw1id1ym1ai3k7sv9shl3lz4fqj8qyg73j4kj1gbn0"
   },
   "stable": {
    "version": [
@@ -62167,15 +62200,30 @@
   "repo": "tecosaur/lexic",
   "unstable": {
    "version": [
-    20210318,
-    1315
+    20210729,
+    1808
+   ],
+   "commit": "25c8d839cf78332c15b5762024ccb5f7c90b7a11",
+   "sha256": "14x4a6dw9ywzl16f4blg7bmb0rvvik5jjldilshjdxf4zpvy80fd"
+  }
+ },
+ {
+  "ename": "lf",
+  "commit": "8073246c85cf632c01c14c48c453e1fd80d49569",
+  "sha256": "1rs5lik11xqpm624p6l02vdmf0zsmlz422s0d1wlz3f5hnchv7p2",
+  "fetcher": "github",
+  "repo": "alhassy/lf",
+  "unstable": {
+   "version": [
+    20210729,
+    229
    ],
    "deps": [
     "dash",
-    "visual-fill-column"
+    "s"
    ],
-   "commit": "4ded6be2ce3e8dadc5635a534827181a8c8ab602",
-   "sha256": "116qjizqa83zy6xas5cah58sf22ha05pps2004wfgng487ln9n59"
+   "commit": "54994d4db09d879c247db9aecdc0b6f27dcb7e6a",
+   "sha256": "0slv6ix6z0pnwr4rphpyy0fk0ff0bx0h6vqb8qjf85gnwz8l6dwr"
   }
  },
  {
@@ -62270,8 +62318,8 @@
   "repo": "merrickluo/liberime",
   "unstable": {
    "version": [
-    20200915,
-    542
+    20210526,
+    623
    ],
    "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa",
    "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0"
@@ -62437,8 +62485,8 @@
     20210303,
     1751
    ],
-   "commit": "3603e4473ce9f81c5d73ba623c1938e152d03723",
-   "sha256": "1s1wsz8w7i1p509dqvv0ykljlqlr56203k4lrc542vjdnj4ih4z4"
+   "commit": "ec85691c073f0c3cb5a96d3716c70a93ff207faf",
+   "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa"
   },
   "stable": {
    "version": [
@@ -62447,7 +62495,7 @@
     0
    ],
    "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f",
-   "sha256": "02n5yc0nqckfpfxkw8gxigg59769alxvk043c2d9bxgm79zxvhhy"
+   "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa"
   }
  },
  {
@@ -62598,14 +62646,14 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20150922,
-    451
+    20210727,
+    1302
    ],
    "deps": [
     "avy"
    ],
-   "commit": "9fbf196d155016d9b8471a99318ed67a086cf257",
-   "sha256": "0v2g9gzf2v88ag59q1pf5vhd4qjnz3g4i6gzl27k6fi7pvlxdn39"
+   "commit": "d3c5bacc9c697c4cf8b14616c4199210f9267068",
+   "sha256": "1d25lf556c9idr0slzakcks93rcw032bp1hbbcqffrljqzapxz4x"
   }
  },
  {
@@ -63226,8 +63274,8 @@
     20210701,
     1955
    ],
-   "commit": "db1f98cc470972f92d72f40b78db4baff5768edd",
-   "sha256": "1wgqcb4m5nzkbxkvdx801h9d1wqswlqmqbar4282wabgnw78zwwy"
+   "commit": "23e674f8572f3189fbe3917af6f22e6ec8708818",
+   "sha256": "1j25p0hmdfyfhlfrdn02q2ng6sgnaqvcjz1ll7rl0liq5acjvd2w"
   },
   "stable": {
    "version": [
@@ -63367,11 +63415,11 @@
   "url": "https://hg.serna.eu/emacs/lms",
   "unstable": {
    "version": [
-    20201214,
-    1852
+    20210724,
+    1250
    ],
-   "commit": "e6dae7465423a5304d0e38e92625383d07fe6f52",
-   "sha256": "1axxfh96pl2s0c301ak1gjh10k744wafnza3qx4sqaxcka5f6hc9"
+   "commit": "b4f56e17933d1d4098eeb04ef665a3f18479def9",
+   "sha256": "0fcz8hz26pwpwbl5dq4w3z6vmnjjjzwckv19zhwxj7bgv9dnm6wa"
   }
  },
  {
@@ -63833,14 +63881,14 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20210710,
-    228
+    20210729,
+    144
    ],
    "deps": [
     "map"
    ],
-   "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311",
-   "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n"
+   "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd",
+   "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3"
   }
  },
  {
@@ -63858,8 +63906,8 @@
     "dash",
     "loopy"
    ],
-   "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311",
-   "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n"
+   "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd",
+   "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3"
   }
  },
  {
@@ -63926,8 +63974,8 @@
   "repo": "emacs-lsp/lsp-dart",
   "unstable": {
    "version": [
-    20210715,
-    1659
+    20210728,
+    201
    ],
    "deps": [
     "dap-mode",
@@ -63938,8 +63986,8 @@
     "lsp-treemacs",
     "pkg-info"
    ],
-   "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea",
-   "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n"
+   "commit": "1237f6762a6c8c8f0618c850a3c9be13655118a3",
+   "sha256": "0bw940zv6alh4gsryyll4k607c5lpl8fzr8v6qd2v91kydsks848"
   },
   "stable": {
    "version": [
@@ -64127,8 +64175,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20210710,
-    1757
+    20210728,
+    1739
    ],
    "deps": [
     "dap-mode",
@@ -64140,8 +64188,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "b66a075bcb1edf57b09a0e1c73c3a399596d4760",
-   "sha256": "1s47y8hd9mnvz858h3sbdbdgrv3d1kdxag8flm44jla4yhgish7g"
+   "commit": "7ba9c459a484a9ef8d6a59e509c03d761fccde45",
+   "sha256": "1pi17qxqpaig8x2hpcdhwnvn3a8smgkkspc2a2gb9xwq9bcjglp5"
   },
   "stable": {
    "version": [
@@ -64357,8 +64405,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20210721,
-    511
+    20210729,
+    732
    ],
    "deps": [
     "dash",
@@ -64368,8 +64416,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "ac3b7e6efd1f8d4bb92aa4d89fc361fce3208c46",
-   "sha256": "1gx5y9j259q4iqnp7b58958wnpw8l3fdcs88zx38252givf814nx"
+   "commit": "f996db04e1159299c4fce2cbf3dc0cfa0e3966c4",
+   "sha256": "1w903yw2w4gwcz8ma1rpr2il8w76yh6gnifp3p2885r305xhsf5a"
   },
   "stable": {
    "version": [
@@ -65157,11 +65205,11 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20200304,
-    1323
+    20210728,
+    1354
    ],
-   "commit": "e54f934952cde3f96d6a131968295d993b3cf624",
-   "sha256": "1yivbgbcy5qvs55dn5lx08mbkmsd4mriymas9jgh7rn6hl14x8hj"
+   "commit": "d221002128b7954fb5705c37b974223514a9c4f0",
+   "sha256": "0h04i2xif8iqlrp85kp3p34snzhfcgqcf65asd1qblh0qlhp37gn"
   },
   "stable": {
    "version": [
@@ -65181,8 +65229,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20210721,
-    1556
+    20210728,
+    2026
    ],
    "deps": [
     "dash",
@@ -65191,8 +65239,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
-   "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
+   "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6",
+   "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8"
   },
   "stable": {
    "version": [
@@ -65538,8 +65586,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
-   "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
+   "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6",
+   "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8"
   },
   "stable": {
    "version": [
@@ -65706,8 +65754,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
-   "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
+   "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6",
+   "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8"
   },
   "stable": {
    "version": [
@@ -66501,11 +66549,11 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20210721,
-    2100
+    20210729,
+    1226
    ],
-   "commit": "a3a8edbf25db4b1e167f1fdff6f60a065d0bf9cb",
-   "sha256": "0a4ra9fwyj5av4cjyj1y1y1z1kr6dnq39hhf51c072zqw3k3jar9"
+   "commit": "a36af71f8ac530fbb24700494f5b2a75f2cc0111",
+   "sha256": "18xxglr557svzmh2j2n6lybxd9rkwmafxfw6zxd6qxn2b11ps0fh"
   },
   "stable": {
    "version": [
@@ -66621,11 +66669,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20210722,
-    839
+    20210728,
+    756
    ],
-   "commit": "f3c4fd9230252503e3a9f2de6f5d469c4ac270ae",
-   "sha256": "08snhqw9kyg8vdaz7ibga0pf2j5cg1akjiphs88dgvxkph8m65nr"
+   "commit": "8158bc8239c531756fbf6602f4b4dea8d52eb4cc",
+   "sha256": "1g58va0a4m8q82nr16l693wngbbdj3xw07a937a2x21y1pzrgiih"
   },
   "stable": {
    "version": [
@@ -66964,15 +67012,15 @@
   "repo": "matsievskiysv/math-preview",
   "unstable": {
    "version": [
-    20210219,
-    1431
+    20210729,
+    1842
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "08aa7c47ffc85c9cba1c9812e1c14250cc4192e4",
-   "sha256": "1z371v68aw92iaj5mbsk47mfr44scgkwazbf9i6gzygq84fdm6dh"
+   "commit": "b6f54d7a53d2ed5c71fc9ab6d65da63103c799bc",
+   "sha256": "0hzchn5m5r0iv0im43paxbpd00fyv4m1rv53asp1fg2h27zg7xfz"
   }
  },
  {
@@ -67565,18 +67613,19 @@
     20210720,
     950
    ],
-   "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
-   "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   },
   "stable": {
    "version": [
     4,
-    2,
+    3,
+    1,
     -4,
     412
    ],
-   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
-   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   }
  },
  {
@@ -67594,13 +67643,14 @@
     "auto-complete",
     "merlin"
    ],
-   "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
-   "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   },
   "stable": {
    "version": [
     4,
-    2,
+    3,
+    1,
     -4,
     412
    ],
@@ -67608,8 +67658,8 @@
     "auto-complete",
     "merlin"
    ],
-   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
-   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   }
  },
  {
@@ -67627,13 +67677,14 @@
     "company",
     "merlin"
    ],
-   "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
-   "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   },
   "stable": {
    "version": [
     4,
-    2,
+    3,
+    1,
     -4,
     412
    ],
@@ -67641,8 +67692,8 @@
     "company",
     "merlin"
    ],
-   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
-   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   }
  },
  {
@@ -67689,13 +67740,14 @@
     "iedit",
     "merlin"
    ],
-   "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
-   "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   },
   "stable": {
    "version": [
     4,
-    2,
+    3,
+    1,
     -4,
     412
    ],
@@ -67703,8 +67755,8 @@
     "iedit",
     "merlin"
    ],
-   "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c",
-   "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1"
+   "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf",
+   "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3"
   }
  },
  {
@@ -68262,14 +68314,14 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20210312,
-    452
+    20210725,
+    900
    ],
    "deps": [
     "dash"
    ],
-   "commit": "3e67b8e59d46659df4b37dedf75485a366c93600",
-   "sha256": "1iqdbm90qj90a522qmssbqn5im0kxdw1kxq7z821ss3fag960xw8"
+   "commit": "fb2fc8661b4a32a40b3f5777ae1d69654c263ff0",
+   "sha256": "1bv06p6m5xygqcpwxngds2hral58h23jvp3di5dq3ac2hkf2m92l"
   },
   "stable": {
    "version": [
@@ -69056,20 +69108,20 @@
   "repo": "SidharthArya/modular-config.el",
   "unstable": {
    "version": [
-    20210629,
-    2319
+    20210726,
+    1614
    ],
-   "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c",
-   "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49"
+   "commit": "2bd77193fa3a7ec0541db284b4034821a8f59fea",
+   "sha256": "1bbycd4cr280vl643kvnzyml44mg63yh4i28bbszmj2yrkxy0frj"
   },
   "stable": {
    "version": [
     0,
     0,
-    3
+    5
    ],
-   "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c",
-   "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49"
+   "commit": "3c78fde6b7c53857c712408691427536d3c891bc",
+   "sha256": "057lhrlnyhl0hdp419lvl0fqpkkp3msmzn7gynvqmjig756dra7p"
   }
  },
  {
@@ -69080,11 +69132,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20210722,
-    1916
+    20210729,
+    950
    ],
-   "commit": "fd61a0c67ceafa3aeb0aeebddb93955148376b7e",
-   "sha256": "0l9gfq4qapa5snskb747jydprb0xvn80rjc83da1vwh4j8s3gavz"
+   "commit": "7447abafd82a1a7f9696ed5c193ae683609b5b82",
+   "sha256": "14wwfvc0gn3ciigslvbl8didxiif84ragwzwaya4wcchwjg5vzsj"
   },
   "stable": {
    "version": [
@@ -69427,11 +69479,11 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20210615,
-    1511
+    20210729,
+    1215
    ],
-   "commit": "9d8b2f758098d19781c7c5cdaeda5785e41be039",
-   "sha256": "1z9pspjrpclxznc9d16lix1zc0yx520jx1nqjbxj3kcwfxzkbbl4"
+   "commit": "9b679400ca885b8ff51bcfd75b87f79d66c0ee26",
+   "sha256": "14x3hd0z0nh0dyfi434vqywi7aawfxhlqj6sp7m17np56zq32yhi"
   },
   "stable": {
    "version": [
@@ -69786,8 +69838,8 @@
     20210306,
     1053
    ],
-   "commit": "d08f2a8d96af3ff80aac0e5641d9d20281084038",
-   "sha256": "1dbpy2bw131g5d166dmw5m4zq7y6h3krm7k1lv33cnbss10kj2fl"
+   "commit": "87f9ce226a32225cd3dfedde47a21fa16541ae88",
+   "sha256": "07364nxahcwn77l1xxr5gl9hqf0jc4q6gkzg0gs3wlwbbm9qdaic"
   },
   "stable": {
    "version": [
@@ -69913,8 +69965,8 @@
   "repo": "mpdel/mpdel",
   "unstable": {
    "version": [
-    20201026,
-    1123
+    20210107,
+    1303
    ],
    "deps": [
     "libmpdel",
@@ -70338,16 +70390,16 @@
   "repo": "lordpretzel/mu4e-views",
   "unstable": {
    "version": [
-    20210709,
-    150
+    20210729,
+    1158
    ],
    "deps": [
     "esxml",
     "ht",
     "xwidgets-reuse"
    ],
-   "commit": "9fbe402dc5931ba9cafec581ac3e6d86e9a9f2da",
-   "sha256": "0a73izknp2nkzklkhf9wyxy38fnw4f1jyimdcnh14m1v5bcw2wal"
+   "commit": "f3f454c7f92e8a9eecb5501af9ca81a547fd1841",
+   "sha256": "137r0kbd386954ydiwz6g9ff3j5289nqfzkvhp13rjjkrs668332"
   },
   "stable": {
    "version": [
@@ -70513,8 +70565,8 @@
   "repo": "sagarjha/multi-run",
   "unstable": {
    "version": [
-    20190507,
-    2349
+    20210108,
+    336
    ],
    "deps": [
     "window-layout"
@@ -70564,15 +70616,15 @@
   "repo": "suonlight/multi-vterm",
   "unstable": {
    "version": [
-    20201203,
-    1500
+    20210727,
+    1050
    ],
    "deps": [
     "project",
     "vterm"
    ],
-   "commit": "934397efd2e78a6b83d2b06ef4e4c281c0ae3c65",
-   "sha256": "0cz3zs9xd2zbyb9g9r4r893kl9nqk8i9l0zy66s500iy5522vcnh"
+   "commit": "a3df7218c1ecadef779e2c47815201052283f9ea",
+   "sha256": "0z6321994c4c8f5iya240pzvhirci9idlc110wjjwsm4pzdrrppj"
   }
  },
  {
@@ -72109,8 +72161,8 @@
     20181024,
     1439
    ],
-   "commit": "c8f8f2a9e3016ab7a9ecb2e8b084cf441f3ae88e",
-   "sha256": "1nj7w0dgvhmqy5hkdn0idf468x7s2h2y5372j13w3x1fkdcnyln8"
+   "commit": "d52a43d105040b92442e7c6657b50a2188b80ebd",
+   "sha256": "1pikcr0m533l03ffkwv9ak5w1zqcln3ar28km2052330mq93gpj4"
   },
   "stable": {
    "version": [
@@ -72411,16 +72463,16 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20210716,
-    1030
+    20210729,
+    953
    ],
    "deps": [
     "anaphora",
     "dash",
     "request"
    ],
-   "commit": "50a6a7a58bc0316a9acc2b972380692f7438d9ed",
-   "sha256": "0q86wzl4va5xjj7czh6ldypwgb09gv8gp7kqi449bhx984a1yq7n"
+   "commit": "3a2fc7da6c6cfaba15fabcf1f3c9cf57b016c362",
+   "sha256": "1z91i6kl0bpsk87rl0ysfm8wifb3a196r82bxb6wlk6lkxlqr8jq"
   }
  },
  {
@@ -72702,8 +72754,8 @@
   "repo": "esessoms/nofrils-theme",
   "unstable": {
    "version": [
-    20180227,
-    2153
+    20180620,
+    1248
    ],
    "commit": "98ad7bfaff1d85b33dc162645670285b067c6f92",
    "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs"
@@ -72809,11 +72861,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20210719,
-    1132
+    20210725,
+    1815
    ],
-   "commit": "bed62eb8bee4aeca1fabfa5e302b515849f50b31",
-   "sha256": "00mixvwwhrmmr7wcscyzdhwhbnfiha0b0lcx1f3zk5xyshll2y9n"
+   "commit": "b649b0c871e7fbfcd15a24d51b071bad2680e5d2",
+   "sha256": "1jvibldc37whindnq64ghnj6iha1k3nvvj8bkv9s2fm90g7y4zy1"
   },
   "stable": {
    "version": [
@@ -72993,8 +73045,8 @@
   "repo": "shaneikennedy/npm.el",
   "unstable": {
    "version": [
-    20200812,
-    1850
+    20210601,
+    1122
    ],
    "deps": [
     "jest",
@@ -74629,8 +74681,8 @@
     20210617,
     1726
    ],
-   "commit": "121f3913f5dad7468b33d4a5ca19e7a687d2ecfc",
-   "sha256": "104jaqllwzcikk17iajgnjnnqchgivj210mhrx07qrk5vy5qwv5d"
+   "commit": "269984a50006efe282c693a6315962c92749296a",
+   "sha256": "19w93zpffybb4zb0h12rvyfh0857f1vf3hyr1r7rmgwyslfgp6gh"
   },
   "stable": {
    "version": [
@@ -75189,8 +75241,8 @@
   "repo": "OmniSharp/omnisharp-emacs",
   "unstable": {
    "version": [
-    20201220,
-    906
+    20210725,
+    1955
    ],
    "deps": [
     "auto-complete",
@@ -75202,8 +75254,8 @@
     "popup",
     "s"
    ],
-   "commit": "5fad6835bee15792774183164dd423ba18cf1e01",
-   "sha256": "1ww202j6bh8ycw2wfngy9rw1hv5qrjg66bgp2yj28j12ag1qxn2r"
+   "commit": "e276ff140666057c6d6848f9cfc84a82e3a7650c",
+   "sha256": "0aicn5s368s6ks4dq5b8xga0ifijd4lkqawzs0a4y58z8s922h69"
   },
   "stable": {
    "version": [
@@ -77016,16 +77068,16 @@
   "repo": "ahungry/org-jira",
   "unstable": {
    "version": [
-    20210719,
-    2242
+    20210727,
+    519
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "2ea00944a7426012cda95cede99e49470f1383aa",
-   "sha256": "179h5j0k79hbbxz2n3x6hm1v2ws9qii6n8zx4800avbq1fgsh792"
+   "commit": "c8b05805f897b5325e12d94e4f10a287219db44d",
+   "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4"
   },
   "stable": {
    "version": [
@@ -77169,14 +77221,14 @@
   "repo": "stardiviner/org-link-beautify",
   "unstable": {
    "version": [
-    20210704,
-    2214
+    20210724,
+    1406
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "40d40c1e6187ec9c13292beb3f7f319f189264d8",
-   "sha256": "0253i9hvq9yki97jmdrvbv82xbgdrq76l73frq6xbbzzhw6615m6"
+   "commit": "e34c314b84a0c2aef50772baa7c849f54323f598",
+   "sha256": "0bq1fl8qn3sf9wmqjj27ii42b95g501c16dbwziapvm3jhw3cz6h"
   }
  },
  {
@@ -77423,14 +77475,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20210716,
-    2237
+    20210728,
+    2037
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "7cedeeece58879e05d3a3bab8af1385006f234df",
-   "sha256": "0gw34smbw9v0f3xwjci7zsj8hbnqd54yzbph6az65r5634nqhiv2"
+   "commit": "bb51a47513d1c4232aca8ca2c705ec57bd174b4b",
+   "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp"
   }
  },
  {
@@ -78251,8 +78303,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20210510,
-    1614
+    20210726,
+    1533
    ],
    "deps": [
     "bibtex-completion",
@@ -78267,8 +78319,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "8aa2bb45268f660956151547533689d4ec30378d",
-   "sha256": "0ihjjmysldxx8n3q7mi06p5ydxknxy347c9lf3gnlgzcc776a49v"
+   "commit": "839ca73f3ae451efbf82859dcd17b63375cb8d76",
+   "sha256": "0zhzxmwlgwa0c27rfqpbpz7k477mm5ahhxyvmkvk6nafv5gdryc6"
   },
   "stable": {
    "version": [
@@ -78394,8 +78446,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20210721,
-    1746
+    20210729,
+    1527
    ],
    "deps": [
     "dash",
@@ -78405,8 +78457,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "9c10a3c04c06d1658a63d44927e385e2d97854d6",
-   "sha256": "0kd7wkd6k37ahsgmcjcs0msp02x6vfkq8gdih210yp2w6vz10hhy"
+   "commit": "127d6efa485c2d7846e1ec88954f4bf93623281f",
+   "sha256": "1663brqgysfkn5ja26jm6f4rf8zjdvrbbfkwi0xcfkac2sg2f4bq"
   },
   "stable": {
    "version": [
@@ -78434,16 +78486,16 @@
   "repo": "org-roam/org-roam-bibtex",
   "unstable": {
    "version": [
-    20210720,
-    1306
+    20210729,
+    1238
    ],
    "deps": [
     "bibtex-completion",
     "org-ref",
     "org-roam"
    ],
-   "commit": "13de4262d87debdbc43f8e2bd72b991b7284e705",
-   "sha256": "0iizd5vzxxl7fsm7k4y7dwisipsqwc3xqn33nk8r4c182mga3d9c"
+   "commit": "919ec8d837a7a3bd25232bdba17a0208efaefb2a",
+   "sha256": "0ir7516ngagf8mvy3qdir50bfigrqd2pl45c4g2y5cih5lvmfsn6"
   },
   "stable": {
    "version": [
@@ -78468,8 +78520,8 @@
   "repo": "org-roam/org-roam-server",
   "unstable": {
    "version": [
-    20210521,
-    1055
+    20210723,
+    1424
    ],
    "deps": [
     "dash",
@@ -78479,8 +78531,8 @@
     "s",
     "simple-httpd"
    ],
-   "commit": "a0f82bf41e318d4ef606a26f54054262ed6c3441",
-   "sha256": "06j8wabbxay9h8ca4pbv5xgjygfzbb3kbk4icni3lrfj6izsp3i4"
+   "commit": "35cd20280428470d37c1bff18d26cd49436ec3a2",
+   "sha256": "0xf229xkvzwaxwg2aqxgxpsi89aw3dp76ixhpkwyx6l52798nznf"
   },
   "stable": {
    "version": [
@@ -78879,8 +78931,8 @@
     "s",
     "ts"
    ],
-   "commit": "f5e80e4d0da6b2eeda9ba21e021838fa6a495376",
-   "sha256": "18q1af3hjjbsny9lxqjsq68qjzzpdjqgx7npg7pl7k3hzdjaj42f"
+   "commit": "a5557ea4f51571ee9def3cd9a1ab1c38f1a27af7",
+   "sha256": "1xbdkscg32pqpwzs50igdwkyi2k2mgi01wkqm7rc6bhrpgsk9gkw"
   },
   "stable": {
    "version": [
@@ -78936,8 +78988,8 @@
   "repo": "arbox/org-sync",
   "unstable": {
    "version": [
-    20181203,
-    2242
+    20181204,
+    23
    ],
    "deps": [
     "cl-lib",
@@ -79041,15 +79093,15 @@
   "repo": "stardiviner/org-tag-beautify",
   "unstable": {
    "version": [
-    20210527,
-    1130
+    20210729,
+    929
    ],
    "deps": [
     "all-the-icons",
     "org-pretty-tags"
    ],
-   "commit": "20193bf9b07efba03fdd5ffb2852cd43fcd88051",
-   "sha256": "0diccvg4gx9djayihd1hp39q5n2s8cahck93s5r58vk0d4jlcyyk"
+   "commit": "69e7dcb50278ff0d7b220cda9562d4fe7e4db0ec",
+   "sha256": "0wyqjzb2ph7092ghrnq0gxaf4r57mvcm0007kqpzqvknc3byd38d"
   }
  },
  {
@@ -80960,14 +81012,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20210518,
-    108
+    20210727,
+    117
    ],
    "deps": [
     "org"
    ],
-   "commit": "290b5d6b659addf99cb96a316fb24caa90ad0e77",
-   "sha256": "04isqw4wfn5hq772sf0szq2rc3b8finhgjc5cna2sw7bhfgycywb"
+   "commit": "8345ceb90ff1314d598c6b67ba6ee7616e2b0bc4",
+   "sha256": "09x5dr4kc9pxz8iw1ibl262164akr1m5gms5cws2q3zy04qjqfzl"
   },
   "stable": {
    "version": [
@@ -81760,14 +81812,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20210707,
-    1424
+    20210724,
+    1143
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "eea82edcbcc95e9cd35e33243d77adeb88ec7edc",
-   "sha256": "018pihaz1msmizhfjqwsp4d1aa9idiri4nrf6ifkpp6v6j8k7mva"
+   "commit": "01246e739da2eded6e007631861cada633302faa",
+   "sha256": "03w5yaivh2zc8c42zrfqmrlcc8lkmg3jjxa7sf223bwq1v9xypdj"
   },
   "stable": {
    "version": [
@@ -81864,11 +81916,11 @@
   "repo": "tttuuu888/package-loading-notifier",
   "unstable": {
    "version": [
-    20210608,
-    1406
+    20210724,
+    1700
    ],
-   "commit": "1e30d097de8939c4aa380915d3ba3060a87ce3c6",
-   "sha256": "0wmf3pfjvxrv86mpvbkn5n4drc20yc12fwm4k6a613br0bs75gan"
+   "commit": "895ab23f970f954349ccb6c89d397ad7d86087f8",
+   "sha256": "0maa3w06wx54f482z2k6d0vq8mr01j75nnbb7d0mjw15d6qi7pbk"
   }
  },
  {
@@ -82692,15 +82744,15 @@
   "repo": "clojure-emacs/parseedn",
   "unstable": {
    "version": [
-    20200419,
-    1124
+    20210729,
+    1657
    ],
    "deps": [
     "a",
     "parseclj"
    ],
-   "commit": "90cfe3df51b96f85e346f336c0a0ee6bf7fee508",
-   "sha256": "0fhmxj8qjhpqzmj07phf1njkjryc6d2qqqcl4f515b6hly1l41kz"
+   "commit": "7b9ca20b398ca0ca0e3005e84c16f23aab49b667",
+   "sha256": "0knv5m6w7v9zi94b6qi861r271l49pxzmwzp4nm595c33lxagqj2"
   },
   "stable": {
    "version": [
@@ -83188,11 +83240,11 @@
   "repo": "JonWaltman/pcmpl-args.el",
   "unstable": {
    "version": [
-    20210722,
-    329
+    20210729,
+    331
    ],
-   "commit": "36139ba64f43a3d3f4090ef0118bcebfef7e20c9",
-   "sha256": "1isab23shk1gfk54z4ppbnnkrm527rzb9cvbqqa47s8gv9k7zbnm"
+   "commit": "7d444d5793c779a863d5834572c1dae4d87a250b",
+   "sha256": "0mvpbv0y25qvk42yrhkawbimff92mbd8kgpcb8rb3lvdjv4mh0n0"
   }
  },
  {
@@ -84197,14 +84249,14 @@
   "repo": "OVYA/php-cs-fixer",
   "unstable": {
    "version": [
-    20201126,
-    1538
+    20210729,
+    1022
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c5b5d8a4986b31bade5e2a57131469bf90630db8",
-   "sha256": "0v6nhyrkcb4nw1b0d30wlns0f82h5a8i7wf5jsb0wjlbqgxabx4b"
+   "commit": "cc9a3624dcdc72d748d91e3d7cdb8544a1d85a51",
+   "sha256": "1iiazmyzr6gxwsdpx687j0zp3s1zs0rk4kgv4hicl9mjda2f7dmz"
   },
   "stable": {
    "version": [
@@ -84265,20 +84317,20 @@
   "repo": "vpxyz/php-quickhelp",
   "unstable": {
    "version": [
-    20210721,
-    1945
+    20210725,
+    1413
    ],
-   "commit": "f22e6d31aad504094b441e2f635869fc97939ddf",
-   "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84"
+   "commit": "18678b9648a4227e612df773bac9ec46fc51b75d",
+   "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv"
   },
   "stable": {
    "version": [
     0,
     5,
-    3
+    4
    ],
-   "commit": "f22e6d31aad504094b441e2f635869fc97939ddf",
-   "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84"
+   "commit": "18678b9648a4227e612df773bac9ec46fc51b75d",
+   "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv"
   }
  },
  {
@@ -86784,11 +86836,11 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20210723,
-    143
+    20210724,
+    1756
    ],
-   "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
-   "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
+   "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e",
+   "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr"
   },
   "stable": {
    "version": [
@@ -86853,14 +86905,14 @@
   "unstable": {
    "version": [
     20210606,
-    1150
+    1152
    ],
    "deps": [
     "iter2",
     "nvm"
    ],
-   "commit": "85c9349de2730b71c5796e342d67efee34faa9ed",
-   "sha256": "06gcqnd6wwcxqij4gx06y16kcqsh5znhs7hi5kwhzrbvqvqvrki8"
+   "commit": "e38d21a885e234af9ea6b03f499c487175570571",
+   "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8"
   },
   "stable": {
    "version": [
@@ -87952,8 +88004,8 @@
     20200619,
     1742
    ],
-   "commit": "d662ec9c2e4f8ca21cb500b25cfe7430511014b2",
-   "sha256": "1n8ls2pm36imqg98yz20q9nyyxf4z0250mp4aigjcv3c66j8fp2a"
+   "commit": "53365065d9b8549a5c7b7ef1e7e0fd22926dbd07",
+   "sha256": "07r0mvflnhhnqc5igmv6r894nrv70a4j6sf9fzz23ka945ss5dgq"
   },
   "stable": {
    "version": [
@@ -88806,16 +88858,16 @@
   "repo": "dwcoates/pygn-mode",
   "unstable": {
    "version": [
-    20210721,
-    1917
+    20210724,
+    2207
    ],
    "deps": [
     "ivy",
     "nav-flash",
     "uci-mode"
    ],
-   "commit": "30cce9c134f685d7f2db81aa879e683864a23b66",
-   "sha256": "0q4q5wziwy2nhv0yyx7k5jx6bccx9lxr4f97njb06j2nvz2x7k1v"
+   "commit": "7298c3cd798853309bece115848e9d0400a7a627",
+   "sha256": "049aw0cs8kh4p2113v7f2cxcv9277zby02hxalg86bx0rdy8yaz5"
   },
   "stable": {
    "version": [
@@ -89010,17 +89062,17 @@
     20210411,
     1931
    ],
-   "commit": "a054796d7008f4531b482490f917bdef1454b8fd",
-   "sha256": "07zs0dzh500xs26ybyfz2z4wigc74l6wq3z1225gnblphhzl4jv9"
+   "commit": "ca3bc53fd8d628473fba25c7736d0abfac8e4a4a",
+   "sha256": "0yhkj2468si884x748v0a3jhzyg890fvxv02y5g5v8alpj19j1jj"
   },
   "stable": {
    "version": [
     2,
     9,
-    5
+    6
    ],
-   "commit": "ec8219e48f031f93377cc7d862a6f3bf80d76dbf",
-   "sha256": "1fixqimr8mq0mg5qs8wj4hbrzlw9925x72311is4s5r8phyjaabb"
+   "commit": "444f654e23de0772036c0e29c8e5745e48a8970c",
+   "sha256": "15yw69v1cj6zkndk60c2g0dgl0khh8bfm1lrwhjffpdjfc7nkc9a"
   }
  },
  {
@@ -89912,15 +89964,15 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20210720,
-    2002
+    20210727,
+    1545
    ],
    "deps": [
     "faceup",
     "pos-tip"
    ],
-   "commit": "76ca5838cbc266c306aa54964410730f6fd93d88",
-   "sha256": "1q4cgsi659bk4p1avl6bpzfhlf314432mqjhj3hlyxhf4d3nza8m"
+   "commit": "ef9a3fed943495ec2b0c8258f8e00307d6434b17",
+   "sha256": "0rkhkhpjpnp4h3c60ms9637737sfz6nfjlvlgvw0wfa51bvmzimd"
   }
  },
  {
@@ -90869,7 +90921,7 @@
   "unstable": {
    "version": [
     20210513,
-    1453
+    2237
    ],
    "deps": [
     "load-relative",
@@ -92514,8 +92566,8 @@
   "repo": "DogLooksGood/emacs-rime",
   "unstable": {
    "version": [
-    20210628,
-    1648
+    20210723,
+    1236
    ],
    "deps": [
     "cl-lib",
@@ -92523,8 +92575,8 @@
     "popup",
     "posframe"
    ],
-   "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9",
-   "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237"
+   "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc",
+   "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr"
   },
   "stable": {
    "version": [
@@ -92999,14 +93051,14 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20200310,
-    1909
+    20210721,
+    2314
    ],
    "deps": [
     "rtags"
    ],
-   "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
-   "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+   "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+   "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
   },
   "stable": {
    "version": [
@@ -93861,8 +93913,8 @@
   "repo": "djcb/sauron",
   "unstable": {
    "version": [
-    20201011,
-    905
+    20201015,
+    836
    ],
    "commit": "5daade4836da5b1b2ab26d84128d6c38328a5d52",
    "sha256": "0fkq8knq023zm538ls4zxghlkn9zf4rfccpmmgfcpad6bdm00cpc"
@@ -94024,8 +94076,8 @@
     20200830,
     301
    ],
-   "commit": "cff035686cc9505d114115646e4d98edac307512",
-   "sha256": "0w5bzlsbs5zdk3h8ij019yj7861ggg0a4wcqwq7dm7rwf1bshsl2"
+   "commit": "bb54b9743aca98017746959e2cf0d9c9e0844110",
+   "sha256": "0yj3ivxbzgv2x96jsagnvn059hh7r65qpmz7gv76l8b6qnfr1i80"
   }
  },
  {
@@ -94524,8 +94576,8 @@
   "repo": "t-e-r-m/sculpture-themes",
   "unstable": {
    "version": [
-    20210524,
-    354
+    20210530,
+    624
    ],
    "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f",
    "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz"
@@ -94866,15 +94918,15 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20210425,
-    1720
+    20210724,
+    1756
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
-   "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
+   "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e",
+   "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr"
   },
   "stable": {
    "version": [
@@ -95885,11 +95937,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20210721,
-    148
+    20210725,
+    2353
    ],
-   "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d",
-   "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx"
+   "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518",
+   "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a"
   }
  },
  {
@@ -96536,14 +96588,14 @@
   "repo": "andreas-roehler/simple-paren",
   "unstable": {
    "version": [
-    20210206,
-    2015
+    20210729,
+    611
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7b17fcc467e485dce5550be901d26223b8ad3f23",
-   "sha256": "1ksckai0hr2345vpjsahv0kzk8h52vrg2wki290v5aj64iy2nw76"
+   "commit": "9601e6b15f36d2e3a721043820a650413cbee42b",
+   "sha256": "1mclkg8frsljzcklfbbbnr72i9i990ag41n2iivbf1p27xbcp5cc"
   }
  },
  {
@@ -97202,11 +97254,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20210721,
-    1756
+    20210729,
+    1613
    ],
-   "commit": "e8f57c09cb4cc857887310e61eed7325500e9998",
-   "sha256": "1ipbi9h1p943mxzyc81wyrpyah41dhg33kmb3y9cy6avr2pkm1ry"
+   "commit": "540a8c5b9a04af0a6907e07cb070f1fed8a76f48",
+   "sha256": "13m15gcsqmagxmjvn28kd5rhh0ly7d4p4malhg5m7cbbms4svv68"
   },
   "stable": {
    "version": [
@@ -98436,14 +98488,14 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20210112,
-    1050
+    20210724,
+    703
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8271679a627148c96ad894f960cec9b1abfb1e6c",
-   "sha256": "1xrya65z54si9cf64whllq7vhw5dnafal9q2m4jf62jvxmbjdfsi"
+   "commit": "e281635dbaecb1715805a604f3404e7143a19356",
+   "sha256": "0a1sv5x49adj5s26khandc86y844vqk7241jc5qsli2dvdbxsqdg"
   },
   "stable": {
    "version": [
@@ -99839,11 +99891,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20210721,
-    125
+    20210727,
+    1800
    ],
-   "commit": "de1fdca07229e5d43c18cb3dc300397849eeab78",
-   "sha256": "0vdlcy211zx3fr8vcl6hm8xj8v3wkjj4y7pjcni9g87iijzf6gx2"
+   "commit": "70935753de73724f338700725462dec2cfda90f7",
+   "sha256": "1z1cvkbxpw28pgi6fzmkk1w6ha339pw09qy1hzppis8haijj0zxs"
   },
   "stable": {
    "version": [
@@ -99956,11 +100008,11 @@
   "repo": "jhgorrell/ssh-config-mode-el",
   "unstable": {
    "version": [
-    20210714,
+    20210724,
     951
    ],
-   "commit": "1c8f8779f20479e55f9d3d1151f1f68c1dff56f2",
-   "sha256": "0vcs6bz3qzw06c7bs253m9q2l43k8nppzdv7hqbybcdh4fakp8xw"
+   "commit": "2642659aa4cb882d95d84f780e8f8bf5e3a9114b",
+   "sha256": "1fivfpadw14cw9f78jpjhn7zl1b9sh3jhh7g8lh7f62kjv2p0a9m"
   }
  },
  {
@@ -100432,20 +100484,20 @@
   "repo": "akicho8/string-inflection",
   "unstable": {
    "version": [
-    20210712,
-    755
+    20210729,
+    658
    ],
-   "commit": "bf60b0c943cc0934aa188ada7c1c16053517df07",
-   "sha256": "077qxldhya397ka96786w0876bwa77x0il3zwixa9pcbqmqsg8qd"
+   "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a",
+   "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd"
   },
   "stable": {
    "version": [
     1,
     0,
-    13
+    14
    ],
-   "commit": "96a9baf4936df43b9f46804629384b79238691c3",
-   "sha256": "1v8h05m7iwxqp7lypdngib2620z0x23zc715vxqpqys79djwh9yh"
+   "commit": "73b9a35e80e09ba744f2c364db4291f2d6f0a17a",
+   "sha256": "0g4lm384380q03pdspqzv8rb2gppb77m354r0xzw71340w8xh3hd"
   }
  },
  {
@@ -101380,8 +101432,8 @@
    "deps": [
     "ivy"
    ],
-   "commit": "56139df678d9886d0612c0a192cce2cf6f156628",
-   "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g"
+   "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c",
+   "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94"
   },
   "stable": {
    "version": [
@@ -101591,14 +101643,14 @@
   "url": "https://tildegit.org/contrapunctus/sxiv",
   "unstable": {
    "version": [
-    20210713,
-    1845
+    20210514,
+    918
    ],
    "deps": [
     "dash"
    ],
-   "commit": "14057b156dd57610edf101403e653be874a342bb",
-   "sha256": "14wh7fw45w5cfdqibrcfzahsf4cwbi97xp16jd773ynkcf049cjs"
+   "commit": "028409c3a9ff7ba33a1cc2158abfc1793ed50717",
+   "sha256": "0zscfz1f6sgf4b9arfj9bmyvxqlpphm7q36k73zn5hn28kzd9di4"
   },
   "stable": {
    "version": [
@@ -101711,8 +101763,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20210720,
-    1708
+    20210727,
+    1646
    ],
    "deps": [
     "evil",
@@ -101724,8 +101776,8 @@
     "seq",
     "undo-tree"
    ],
-   "commit": "acd0874024018a3352761ffef3ca88916370b195",
-   "sha256": "17fi4jzsfp2k1fp772b75ihjsg602qyc1vzc0k6vv0p05kiv8s2x"
+   "commit": "e775e97d5bca462571078f727796727088833949",
+   "sha256": "0gmwkn5az4xrz9d85xd16bg1h8p5mph344800pqcpapqs389cpba"
   },
   "stable": {
    "version": [
@@ -101958,15 +102010,15 @@
   "repo": "vapniks/syslog-mode",
   "unstable": {
    "version": [
-    20210722,
-    1112
+    20210727,
+    1827
    ],
    "deps": [
     "hide-lines",
     "ov"
    ],
-   "commit": "e18d74d8a12b943a3a64eb8c693981e55aea8e9a",
-   "sha256": "0snf3pjnhff0r7v4iwqqq3568h0a4ff7b2s3axssxk4rfg8bm3ks"
+   "commit": "299042e1ce65bea0728bc56b0540a7ab8ab02010",
+   "sha256": "1y2p74am7v0n9bdzsix0fi6fzhi3pafxr8c2n36cm9hf5xdmb4q1"
   },
   "stable": {
    "version": [
@@ -102372,11 +102424,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20210417,
-    626
+    20210726,
+    1827
    ],
-   "commit": "d5ccf6f53d65e80083acdfb0bced6bcd678c6ea9",
-   "sha256": "1wgk0xngamwgh242wfmxizi5r1ji5dxmr8s542g3p7rgfv5w0qs8"
+   "commit": "f35b97823f27e8d0f378bbd18b79a61f9e34cc55",
+   "sha256": "097zvklc90dy90p62fbk5khnysijzmb6knvzyi8m6wba2g32v4mh"
   },
   "stable": {
    "version": [
@@ -102587,15 +102639,15 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20210711,
-    1323
+    20210728,
+    1000
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "377531fc19063b490b842e779df9b07195e8c496",
-   "sha256": "0gmjfw6kz5cflvj3zmyhw9qad850ckvq14k5vys62603yvm53qgw"
+   "commit": "e3ae2dfe048f25f3929b414279f6ceffbed748cf",
+   "sha256": "1lawl9gn59qkn7bfp6phzsiaw1nkmz3g38skbzrn86nsk9dczkzl"
   },
   "stable": {
    "version": [
@@ -102642,16 +102694,16 @@
   "repo": "dbordak/telephone-line",
   "unstable": {
    "version": [
-    20210322,
-    2248
+    20210724,
+    1411
    ],
    "deps": [
     "cl-generic",
     "cl-lib",
     "seq"
    ],
-   "commit": "aebac4658e553902369a3bf465bacc1f07a01106",
-   "sha256": "1kbxhrlg3pddg10zb9h3ky72f6l67nb5cziv17i3d0shx2z0sw17"
+   "commit": "ff5fcb2181cf1d52bfc5fb8d76ac37f9cad22ce2",
+   "sha256": "15l5w4avs3y6mj22k6c1vfvk7az69wiws0yym4vyqmfpdpsmwab2"
   },
   "stable": {
    "version": [
@@ -103535,14 +103587,14 @@
   "repo": "myTerminal/theme-looper",
   "unstable": {
    "version": [
-    20210714,
-    1807
+    20210727,
+    249
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "bb711c4bb992d7a129dd434a41a356cdaf8c387d",
-   "sha256": "09i7w2s594ksyi7a9bwpcycn4j7is19jh9kznrk39ar2kc3m118h"
+   "commit": "32ca76dfa8100a2069ca735e28e19ae87c74f956",
+   "sha256": "184n2r33d99wmzrnscpl0rqqivmvm17k60gfbrw5yjppq5fl55m3"
   },
   "stable": {
    "version": [
@@ -103678,8 +103730,8 @@
     20200212,
     1903
    ],
-   "commit": "1486e47402a5fa7df9791bd01c7e703671de9de6",
-   "sha256": "098hf7w27223v0h7090w4s2gcw5ylnj6fdfw3c1ifhblglyrbq1n"
+   "commit": "00e9095d6b2eeba01ba1b76b4816891d21ccf7e4",
+   "sha256": "0k9d7zb6l8v7pihgk5spy73jkdab9c7cwc4zwhbd9v65rd6756zj"
   },
   "stable": {
    "version": [
@@ -104630,10 +104682,10 @@
  },
  {
   "ename": "tracking",
-  "commit": "a2b295656d53fddc76cacc86b239e5648e49e3a4",
-  "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z",
+  "commit": "f0f88655608fec94c0a218e261cef10436aa8265",
+  "sha256": "1708zilyjwx0x27v2izd6yiqs2lfaxw620ikqiyx2fjfvxrf6794",
   "fetcher": "github",
-  "repo": "jorgenschaefer/circe",
+  "repo": "emacs-circe/circe",
   "unstable": {
    "version": [
     20210713,
@@ -104743,11 +104795,11 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20210721,
-    2104
+    20210723,
+    1601
    ],
-   "commit": "769219b5f5757f1373a28e993f36b6a41c778651",
-   "sha256": "1s108ps8l563ywn4k5z64y67fgi3j0c7ln2zz9qi9xfih0lnz81b"
+   "commit": "efdf91980a6f8bcb151debb877302ead8751ab65",
+   "sha256": "17gyd76ih8b9f8jw0c47x337lfdynz98xq1kykxs8riwrih1dhip"
   },
   "stable": {
    "version": [
@@ -105051,14 +105103,14 @@
   "repo": "ubolonton/tree-sitter-langs",
   "unstable": {
    "version": [
-    20210314,
-    1704
+    20210724,
+    1056
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861",
-   "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a"
+   "commit": "a516144aa9b109582e89702e5d76217e8fae907b",
+   "sha256": "1p2izm6n3r31jjxq8sazkqxnlhvg3kalf10323q246pdq6frk0qz"
   },
   "stable": {
    "version": [
@@ -105117,8 +105169,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20210713,
-    2032
+    20210726,
+    1955
    ],
    "deps": [
     "ace-window",
@@ -105130,8 +105182,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105167,8 +105219,8 @@
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0",
-   "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   }
  },
  {
@@ -105186,8 +105238,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105216,8 +105268,8 @@
    "deps": [
     "treemacs"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105248,8 +105300,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105281,8 +105333,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105314,8 +105366,8 @@
     "perspective",
     "treemacs"
    ],
-   "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0",
-   "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   }
  },
  {
@@ -105333,8 +105385,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294",
-   "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl"
+   "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc",
+   "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10"
   },
   "stable": {
    "version": [
@@ -105381,11 +105433,11 @@
   "repo": "tilmanrassy/emacs-treeview",
   "unstable": {
    "version": [
-    20200921,
-    6
+    20210723,
+    2256
    ],
-   "commit": "e6012303670d112596e00eb3cb505eb0e0d61d84",
-   "sha256": "0drjzjwrk7fkcc6q8qbvzf60dgcbnysm482cdvzikc0phzgjpl9n"
+   "commit": "09c8c1d045c7c8eace61b10b6df9d2f9079de78e",
+   "sha256": "008m6ckrcc0ddnrc5p9b5agbvsma31bq0094yygv5dwg49lh7ly4"
   }
  },
  {
@@ -107976,8 +108028,8 @@
   "repo": "koral/veri-kompass",
   "unstable": {
    "version": [
-    20181103,
-    1246
+    20200213,
+    934
    ],
    "deps": [
     "cl-lib",
@@ -108563,6 +108615,29 @@
    "sha256": "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"
   }
  },
+ {
+  "ename": "vline",
+  "commit": "515c6cd2efaa2c330122aabd7b23f29d5e4ec27d",
+  "sha256": "12kwxblqd8zdqhlcacvpd6z732l3ig92vklzbsv90n31k27yzzyn",
+  "fetcher": "github",
+  "repo": "emacsorphanage/vline",
+  "unstable": {
+   "version": [
+    20120108,
+    1245
+   ],
+   "commit": "8cc7947387f8da2888da25538668afa33a1d8662",
+   "sha256": "0iqnin1z8fxhh59199zakfd6jw7nj7425y642vrxxn043a3s08vw"
+  },
+  "stable": {
+   "version": [
+    1,
+    11
+   ],
+   "commit": "bc29e08c8e04845fb0e09155fe8f5212862f0a92",
+   "sha256": "1gcskm7p6f3b29ax41hafxjla38qw8cyvazmnn9xmx3pw0hf0jx0"
+  }
+ },
  {
   "ename": "vmd-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -108990,11 +109065,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20210615,
-    103
+    20210728,
+    2251
    ],
-   "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d",
-   "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx"
+   "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518",
+   "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a"
   }
  },
  {
@@ -109998,11 +110073,11 @@
   "repo": "justbur/emacs-which-key",
   "unstable": {
    "version": [
-    20210712,
-    1852
+    20210728,
+    150
    ],
-   "commit": "55fcce0c6143044535bc6825a68f42ca83f58f00",
-   "sha256": "0bap1k6rzaqvqp7njzikw8clhky1fj78mdcx4zah1y57vhszavcw"
+   "commit": "cc84b2d0da629ecb62a92e3fd23cbee4ea20ce56",
+   "sha256": "0h4f1pdkvp92mqp6vy8vk1xbyjfhgccm4fw00kim08mzf0z8zjyy"
   },
   "stable": {
    "version": [
@@ -110709,8 +110784,8 @@
     20210405,
     1410
    ],
-   "commit": "c67784cc0c44dc7c590f1f1f5a979a36b1e8c11d",
-   "sha256": "0pisq1b2yjfplv64xn33lw38ymmpr8wah84pfnwvzqnlfsn5s1hs"
+   "commit": "a144cfd1604c308f65f990a1e994ab0d5d7fe244",
+   "sha256": "0q5ivjaxsw9ci40ap7qavziqjfbarlk7fwqivmndcgwnh0is3ddx"
   }
  },
  {
@@ -111560,11 +111635,11 @@
   "repo": "xahlee/xah-get-thing-or-selection",
   "unstable": {
    "version": [
-    20170821,
-    1053
+    20210724,
+    159
    ],
-   "commit": "e3ef069ea9fea3a092689d45c94c6211b51d0ea4",
-   "sha256": "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0"
+   "commit": "4f9041e7231108bc86ce722c623884146973343b",
+   "sha256": "1my96vqbwnnqfmh3r93ch6yqka6kqfq3qis9s3dqrmb91zvcjdl0"
   }
  },
  {
@@ -113815,8 +113890,8 @@
   "repo": "egh/zotxt-emacs",
   "unstable": {
    "version": [
-    20210129,
-    413
+    20210222,
+    347
    ],
    "deps": [
     "deferred",

From 7558fccda464bb9a21050fa6cc7fbe05d8951ebd Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 29 Jul 2021 19:20:01 -0300
Subject: [PATCH 13/57] elpa-packages 2021-07-29

---
 .../emacs/elisp-packages/elpa-generated.nix       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index b164bc676a00..424ef6110694 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -3392,6 +3392,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "shell-command-plus";
+        ename = "shell-command+";
+        version = "2.2.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
+          sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "shen-mode";

From c98b490e65d8050d859a41e4f08ef2c57fb0dac8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Thu, 29 Jul 2021 19:23:54 -0300
Subject: [PATCH 14/57] fixup shell-command-plus duplicated insertion

---
 .../emacs/elisp-packages/elpa-generated.nix   | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 424ef6110694..132696403558 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -3362,6 +3362,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "shell-command-plus";
+        ename = "shell-command+";
+        version = "2.2.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
+          sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "shelisp";
@@ -3377,36 +3392,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "shell-command-plus";
-        ename = "shell-command+";
-        version = "2.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
-          sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "shell-command-plus";
-        ename = "shell-command+";
-        version = "2.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
-          sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
-          license = lib.licenses.free;
-        };
-      }) {};
     shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "shen-mode";

From 7a979a3325733db07f4d91d9dd77b2035d06bfb0 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethan@ethancedwards.com>
Date: Fri, 9 Jul 2021 23:08:12 -0400
Subject: [PATCH 15/57] difftastic: init at 0.6

---
 pkgs/tools/text/difftastic/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/text/difftastic/default.nix

diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
new file mode 100644
index 000000000000..3a32f855c0c5
--- /dev/null
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "difftastic";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "wilfred";
+    repo = pname;
+    rev = version;
+    sha256 = "WFvxdRCbTBW1RGn2SvAo2iXn82OO/Z06cZQkIu4eiew=";
+  };
+
+  cargoSha256 = "2hRUfIxNVs4uSrEESas3wvvVsZHVocP8aiO7K0NZ+mY=";
+
+  meta = with lib; {
+    description = "A syntax-aware diff";
+    homepage = "https://github.com/Wilfred/difftastic";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ethancedwards8 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d6b95e8f4a3..ec9d9bedd223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4165,6 +4165,8 @@ in
 
   diffstat = callPackage ../tools/text/diffstat { };
 
+  difftastic = callPackage ../tools/text/difftastic { };
+
   diffutils = callPackage ../tools/text/diffutils { };
 
   dir2opus = callPackage ../tools/audio/dir2opus {

From af3b508ffc243c1d3175e6b5d25b391c6de6f8ba Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Fri, 30 Jul 2021 01:11:06 +0000
Subject: [PATCH 16/57] exploitdb: 2021-07-28 -> 2021-07-29

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 178d2d80a27e..8fdf5ec0d780 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2021-07-28";
+  version = "2021-07-29";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = version;
-    sha256 = "sha256-cM7VxZRIs5QktjI1YkJGtdxkA1/CXCCuVynyTVCILsI=";
+    sha256 = "sha256-/ZNQcfDHFFiI3BFyUTcwDUnhbCdxA4GrS8EIjgYgKw8=";
   };
 
   installPhase = ''

From d902365913fd65abc2d5d5298c2b9b0beda2f2ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 30 Jul 2021 03:13:50 +0200
Subject: [PATCH 17/57] nixos/bird: fix bird/bird6 description

---
 nixos/modules/services/networking/bird.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index 1923afdf83f2..c14adbda3c5a 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -10,8 +10,8 @@ let
       birdBin = if variant == "bird6" then "bird6" else "bird";
       birdc = if variant == "bird6" then "birdc6" else "birdc";
       descr =
-        { bird = "1.9.x with IPv4 suport";
-          bird6 = "1.9.x with IPv6 suport";
+        { bird = "1.6.x with IPv4 support";
+          bird6 = "1.6.x with IPv6 support";
           bird2 = "2.x";
         }.${variant};
     in {

From 53e85e512bb026c6f5211e16a72b2ab11b848688 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 30 Jul 2021 04:19:49 +0300
Subject: [PATCH 18/57] xonsh: add PYTHONPATH

---
 pkgs/shells/xonsh/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 41f2c8b4f0ad..28f87685166d 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -29,6 +29,19 @@ python3Packages.buildPythonApplication rec {
     find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \;
     find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|'
     patchShebangs .
+
+    substituteInPlace scripts/xon.sh \
+      --replace 'python' "${python3Packages.python}/bin/python"
+
+  '';
+
+  makeWrapperArgs = [
+    "--prefix PYTHONPATH : ${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/xon.sh \
+      $makeWrapperArgs
   '';
 
   disabledTests = [

From 1060845f565425109efa12629c367e76595375bd Mon Sep 17 00:00:00 2001
From: Harrison Houghton <hora.rhino@gmail.com>
Date: Thu, 29 Jul 2021 22:16:40 -0400
Subject: [PATCH 19/57] mkcl: fix

A recent glibc update removed the deprecated/non-standard
  const char *const sys_siglist[];
array which contained textual descriptions of the various signal codes.

The attached patch is merged to master but has not yet been released.
---
 pkgs/development/compilers/mkcl/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 3656f1e0dd82..181c75c81b01 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }:
 
 with lib; stdenv.mkDerivation rec {
   pname = "mkcl";
@@ -11,6 +11,15 @@ with lib; stdenv.mkDerivation rec {
     sha256 = "0i2bfkda20lfypis6i4m7srfz6miyf66d8knp693d6sms73m2l26";
   };
 
+  patches = [
+    # "Array sys_siglist[] never was part of the public interface. Replace it with calls to psiginfo()."
+    (fetchpatch {
+      name = "sys_siglist.patch";
+      url = "https://github.com/jcbeaudoin/MKCL/commit/0777dd08254c88676f4f101117b10786b22111d6.patch";
+      sha256 = "1dnr1jzha77nrxs22mclrcqyqvxxn6q1sfn35qjs77fi3jcinjsc";
+    })
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
 
   propagatedBuildInputs = [ gmp ];

From 0b0ebd4c3326b84dbe47730d0bafb5b826cf5a7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jul 2021 06:23:43 +0000
Subject: [PATCH 20/57] cargo-msrv: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix
index 216e83622158..6cc10418fc0c 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-msrv";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34=";
+    sha256 = "sha256-TqrbkTij+XCousADorrzsVVNVYOUEyl5+nhMn4IgaIY=";
   };
 
-  cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4=";
+  cargoSha256 = "sha256-cA4a7lqzOXkNZ7ehM/gCqtTyAaY2TH+23bITHBId8wQ=";
 
   passthru = {
     updateScript = nix-update-script {

From 1a980484d6d3c1e738417d38e80bc5809de56b55 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Thu, 29 Jul 2021 20:14:53 -0400
Subject: [PATCH 21/57] multimc: change license to asl20

---
 pkgs/games/multimc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index aa32efaa9402..7ccafd2b8600 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -43,7 +43,7 @@ in mkDerivation rec {
       Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
     '';
     platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
+    license = licenses.asl20;
     maintainers = with maintainers; [ cleverca22 starcraft66 ];
   };
 }

From e8d67ac8fc5294a32fd257c757548d9cb0f81190 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Thu, 29 Jul 2021 20:18:05 -0400
Subject: [PATCH 22/57] multimc: don't re-distribute package

Fixes NixOS#131983
---
 pkgs/games/multimc/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 7ccafd2b8600..8e72b9588561 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -44,6 +44,9 @@ in mkDerivation rec {
     '';
     platforms = platforms.linux;
     license = licenses.asl20;
+    # upstream don't want us to re-distribute this application:
+    # https://github.com/NixOS/nixpkgs/issues/131983
+    hydraPlatforms = [];
     maintainers = with maintainers; [ cleverca22 starcraft66 ];
   };
 }

From 2833fb0ec751bcc187728aebcfa16e31302236cf Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 30 Jul 2021 03:20:36 -0300
Subject: [PATCH 23/57] algol68g: init at 2.8.4

---
 .../algol68g/0001-plotutils-png-support.diff  | 27 +++++++++
 .../compilers/algol68g/default.nix            | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
 create mode 100644 pkgs/development/compilers/algol68g/default.nix

diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
new file mode 100644
index 000000000000..beb3cb1c8bbe
--- /dev/null
+++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
@@ -0,0 +1,27 @@
+diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotutils.c
+--- algol68g-2.8.4-old/source/plotutils.c	2016-10-11 18:14:48.000000000 -0300
++++ algol68g-2.8.4-new/source/plotutils.c	2021-07-30 02:42:29.762627511 -0300
+@@ -1026,10 +1026,10 @@
+     X_COORD (&DEVICE (f)) = 0;
+     Y_COORD (&DEVICE (f)) = 0;
+     return (PLOTTER (&DEVICE (f)));
+-  } else if (!strcmp (device_type, "gif")) {
+-/*------------------------------------+
+-| Supported plotter type - pseudo GIF |
+-+------------------------------------*/
++  } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "gif")) {
++/*-------------------------------------------+
++| Supported plotter type - pseudo GIF or PNG |
+++-------------------------------------------*/
+     char *z = DEREF (char, &A68_PAGE_SIZE (&DEVICE (f))), size[BUFFER_SIZE];
+ /* Establish page size */
+     if (!scan_int (&z, &(WINDOW_X_SIZE (&DEVICE (f))))) {
+@@ -1067,7 +1067,7 @@
+     (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size);
+     (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black");
+     (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no");
+-    PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f)));
++    PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f)));
+     if (PLOTTER (&DEVICE (f)) == NULL) {
+       diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN);
+       exit_genie (p, A68_RUNTIME_ERROR);
diff --git a/pkgs/development/compilers/algol68g/default.nix b/pkgs/development/compilers/algol68g/default.nix
new file mode 100644
index 000000000000..88210ca5b72e
--- /dev/null
+++ b/pkgs/development/compilers/algol68g/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, fetchurl
+, gsl
+, plotutils
+, postgresql
+}:
+
+stdenv.mkDerivation rec {
+  pname = "algol68g";
+  version = "2.8.4";
+
+  src = fetchurl {
+    url = "https://jmvdveer.home.xs4all.nl/${pname}-${version}.tar.gz";
+    hash = "sha256-WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA=";
+  };
+
+  patches = [
+    # add PNG support
+    ./0001-plotutils-png-support.diff
+  ];
+
+  buildInputs = [
+    gsl
+    plotutils
+    postgresql
+  ];
+
+  postInstall = let
+    pdfdoc = fetchurl {
+      url = "https://jmvdveer.home.xs4all.nl/learning-algol-68-genie.pdf";
+      hash = "sha256-QCwn1e/lVfTYTeolCFErvfMhvwCgsBnASqq2K+NYmlU=";
+    };
+  in
+    ''
+      install -m644 ${pdfdoc} $out/share/doc/${pname}/learning-algol-68-genie.pdf
+    '';
+
+  meta = with lib; {
+    homepage = "https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html";
+    description = "Algol 68 Genie compiler-interpreter";
+    longDescription = ''
+      Algol 68 Genie (a68g) is a recent checkout hybrid compiler-interpreter,
+      written from scratch by Marcel van der Veer. It ranks among the most
+      complete Algol 68 implementations. It implements for example arbitrary
+      precision arithmetic, complex numbers, parallel processing, partial
+      parametrisation and formatted transput, as well as support for curses,
+      regular expressions and sounds. It can be linked to GNU plotutils, the GNU
+      scientific library and PostgreSQL.
+    '';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1107717fef8f..212e50831607 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10672,6 +10672,8 @@ in
 
   aldor = callPackage ../development/compilers/aldor { };
 
+  algol68g = callPackage ../development/compilers/algol68g { };
+
   aliceml = callPackage ../development/compilers/aliceml { };
 
   armips = callPackage ../development/compilers/armips { };

From d7ab681b7aa525b4c3081473ab68dd13ae85c7b2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 30 Jul 2021 09:17:18 +0200
Subject: [PATCH 24/57] chromiumBeta: 92.0.4515.107 -> 93.0.4577.18

---
 .../networking/browsers/chromium/upstream-info.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 91b5a3283716..f7be43f9bd57 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,15 +18,15 @@
     }
   },
   "beta": {
-    "version": "92.0.4515.107",
-    "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
-    "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd",
+    "version": "93.0.4577.18",
+    "sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x",
+    "sha256bin64": "1s5qj0pd79qbchq3awhxc86l9vmi6304z7sd9ls9f8q138789cha",
     "deps": {
       "gn": {
-        "version": "2021-05-07",
+        "version": "2021-07-08",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
-        "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
+        "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
+        "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
       }
     }
   },

From 4e992dcdfc0cb123d52a3a274f84c7163df0de59 Mon Sep 17 00:00:00 2001
From: Elias N Vasylenko <elias@vasylenko.uk>
Date: Wed, 28 Jul 2021 11:28:08 +0100
Subject: [PATCH 25/57] win-spice: 0.11 -> 0.21

This includes updates for three components; usbdk, qxlwddm, and vdagent.

The result is updated support from Windows 8.1 to Windows 10.
---
 .../driver/win-spice/default.nix              | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix
index 67ba9b74fbb7..2c2cd90f1c26 100644
--- a/pkgs/applications/virtualization/driver/win-spice/default.nix
+++ b/pkgs/applications/virtualization/driver/win-spice/default.nix
@@ -1,51 +1,56 @@
 { lib, stdenv, fetchurl, p7zip, win-virtio }:
 
 let
+  version_usbdk = "1.0.22";
   src_usbdk_x86 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x86.msi";
-    sha256 = "17hv8034wk1xqnanm5jxs4741nl7asps1fdz6lhnrpp6gvj6yg9y";
+    url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x86.msi";
+    sha256 = "1vr8kv37wz6p3xhawyhwxv0g7y89igkvx30zwmyvlgnkv3h5i317";
   };
-
   src_usbdk_amd64 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x64.msi";
-    sha256 = "0alcqsivp33pm8sy0lmkvq7m5yh6mmcmxdl39zjxjra67kw8r2sd";
+    url = "https://www.spice-space.org/download/windows/UsbDk/UsbDk_${version_usbdk}_x64.msi";
+    sha256 = "19b64jv6pfimd54y0pphbs1xh25z41bbblz64ih6ag71w6azdxli";
   };
 
+  version_qxlwddm = "0.21";
   src_qxlwddm = fetchurl {
-    url = "https://people.redhat.com/~vrozenfe/qxlwddm/qxlwddm-0.11.zip";
-    sha256 = "082zdpbh9i3bq2ds8g33rcbcw390jsm7cqf46rrlx02x8r03dm98";
+    url = "https://www.spice-space.org/download/windows/qxl-wddm-dod/qxl-wddm-dod-${version_qxlwddm}/spice-qxl-wddm-dod-${version_qxlwddm}.zip";
+    sha256 = "0yjq54gxw3lcfghsfs4fzwipa9sgx5b1sn3fss6r5dm7pdvjp20q";
   };
 
+  version_vdagent = "0.10.0";
   src_vdagent_x86 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x86.zip";
-    sha256 = "0d928g49rf4dl79jmvnqh6g864hp1flw1f0384sfp82himm3bxjs";
+    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x86.zip";
+    sha256 = "142c0lqsqry9dclji2225ppclkn13gbjl1j0pzx8fp6hgy4i02c1";
   };
-
   src_vdagent_amd64 = fetchurl {
-    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x64.zip";
-    sha256 = "0djmvm66jcmcyhhbjppccbai45nqpva7vyvry6w8nyc0fwi1vm9l";
+    url = "https://www.spice-space.org/download/windows/vdagent/vdagent-win-${version_vdagent}/vdagent-win-${version_vdagent}-x64.zip";
+    sha256 = "1x2wcvld531kv17a4ks7sh67nhzxzv7nkhpx391n5vj6d12i8g3i";
   };
 in
 
 stdenv.mkDerivation  {
   # use version number of qxlwddm as qxlwddm is the most important component
-  name = "win-spice-0.11";
-  version = "0.11";
+  pname = "win-spice";
+  version = version_qxlwddm;
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   buildPhase = ''
+    runHook preBuild
+
     mkdir -p usbdk/x86 usbdk/amd64
     (cd usbdk/x86; ${p7zip}/bin/7z x -y ${src_usbdk_x86})
     (cd usbdk/amd64; ${p7zip}/bin/7z x -y ${src_usbdk_amd64})
 
     mkdir -p vdagent/x86 vdagent/amd64
-    (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86)
-    (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
+    (cd vdagent/x86; ${p7zip}/bin/7z x -y ${src_vdagent_x86}; mv vdagent-win-${version_vdagent}-x86/* .; rm -r vdagent-win-${version_vdagent}-x86)
+    (cd vdagent/amd64; ${p7zip}/bin/7z x -y ${src_vdagent_amd64}; mv vdagent-win-${version_vdagent}-x64/* .; rm -r vdagent-win-${version_vdagent}-x64)
 
     mkdir -p qxlwddm
-    (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64)
-    '';
+    (cd qxlwddm; ${p7zip}/bin/7z x -y ${src_qxlwddm}; cd w10)
+
+    runHook postBuild
+  '';
 
   installPhase =
     let
@@ -57,8 +62,11 @@ stdenv.mkDerivation  {
       #       That way it would never matter whether vioserial is installed from win-virtio or win-spice.
       copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n";
       copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch);
-    in
-      (copy "amd64" "w8.1") + (copy "x86" "w8.1");
+    in ''
+      runHook preInstall
+      ${(copy "amd64" "w10") + (copy "x86" "w10")}
+      runHook postInstall
+    '';
 
   meta = with lib; {
     description = "Windows SPICE Drivers";

From a68cec5ef28efe2ae7aec658b3fd37675d672ffb Mon Sep 17 00:00:00 2001
From: Elias N Vasylenko <elias@vasylenko.uk>
Date: Wed, 28 Jul 2021 11:34:19 +0100
Subject: [PATCH 26/57] win-virtio: 0.1.141-1 -> 0.1.196-1

this results in Windows version support bumped from 8.1 to 10
---
 .../virtualization/driver/win-virtio/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 1f9e21845ce6..7de6498ab5bb 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,18 +1,20 @@
 { lib, stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
   pname = "win-virtio";
-  version = "0.1.141-1";
+  version = "0.1.196-1";
 
   phases = [ "buildPhase" "installPhase" ];
 
   src = fetchurl {
     url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
-    sha256 = "0mn5gcgb9dk59nrw9scdza628yiji4vdkxmixikn9v02kgwnkja3";
+    sha256 = "1zj53xybygps66m3v5kzi61vqy987zp6bfgk0qin9pja68qq75vx";
   };
 
   buildPhase = ''
+    runHook preBuild
     ${p7zip}/bin/7z x $src
-    '';
+    runHook postBuild
+  '';
 
   installPhase =
     let
@@ -24,12 +26,16 @@ stdenv.mkDerivation rec {
                 {input="viostor"; output="viostor";}
                 {input="viorng"; output="viorng";}
                ];
-    in
-      lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
+    in ''
+      runHook preInstall
+      ${lib.concatStringsSep "\n" ((map (copy "amd64" "w10") virtio) ++ (map (copy "x86" "w10") virtio))}
+      runHook postInstall
+    '';
 
   meta = with lib; {
     description = "Windows VirtIO Drivers";
     homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    license = [ licenses.bsd3 ];
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
   };

From 31a0f36b06c82023b31770dec295957686e0788e Mon Sep 17 00:00:00 2001
From: Vanilla <neko@hydev.org>
Date: Fri, 30 Jul 2021 15:44:00 +0800
Subject: [PATCH 27/57] flat-remix-gnome: 20210715 -> 20210716

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

diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix
index f9eed54534cd..28bfb12f4c59 100644
--- a/pkgs/data/themes/flat-remix-gnome/default.nix
+++ b/pkgs/data/themes/flat-remix-gnome/default.nix
@@ -6,20 +6,20 @@
 
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20210715";
+  version = "20210716";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = pname;
     rev = version;
-    hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA=";
+    hash = "sha256-UAWi4MyqtuSzp5TEkVLYJF7+2tzH/aT60ObNOimCJ4o=";
   };
 
   nativeBuildInputs = [ glib ];
   makeFlags = [ "PREFIX=$(out)" ];
   preInstall = ''
     # make install will back up this file, it will fail if the file doesn't exist.
-    # https://github.com/daniruiz/flat-remix-gnome/blob/20210623/Makefile#L50
+    # https://github.com/daniruiz/flat-remix-gnome/blob/20210716/Makefile#L53
     mkdir -p $out/share/gnome-shell/
     touch $out/share/gnome-shell/gnome-shell-theme.gresource
   '';

From 6660b6b8cc1a8393073b2a3f43eac77e5495e687 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jul 2021 08:13:17 +0000
Subject: [PATCH 28/57] esphome: 1.20.2 -> 1.20.3

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

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 48c656acf4bf..e38f0d48b9b7 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,13 +16,13 @@ let
 in
 with python.pkgs; buildPythonApplication rec {
   pname = "esphome";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-th0UJsLTJ8fAgiIv3HvNrbigFwoJO7gEXObYFV3c3WA=";
+    sha256 = "1sx2ky7860d8rjfxpbwb176n33icz6q82w4wgd5qr3ldrfjn58vn";
   };
 
   patches = [

From 143a5cf7ad5b44e0c33dd2ddc6f25497d5351352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Jul 2021 10:27:09 +0200
Subject: [PATCH 29/57] mkcl: cleanup

---
 pkgs/development/compilers/mkcl/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 181c75c81b01..e8452f46a8a5 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, gmp, gcc }:
 
-with lib; stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mkcl";
   version = "1.1.11";
 
@@ -27,7 +27,7 @@ with lib; stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   configureFlags = [
-    "GMP_CFLAGS=-I${gmp.dev}/include"
+    "GMP_CFLAGS=-I${lib.getDev gmp}/include"
     "GMP_LDFLAGS=-L${gmp.out}/lib"
   ];
 
@@ -36,9 +36,9 @@ with lib; stdenv.mkDerivation rec {
     cd contrib/tinycc
     ./configure --cc=cc \
       --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \
-      --crtprefix=${getLib stdenv.cc.libc}/lib \
-      --sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include \
-      --libpaths=${getLib stdenv.cc.libc}/lib
+      --crtprefix=${lib.getLib stdenv.cc.libc}/lib \
+      --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \
+      --libpaths=${lib.getLib stdenv.cc.libc}/lib
   )'';
 
   postInstall = ''
@@ -47,7 +47,7 @@ with lib; stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with lib; {
     description = "ANSI Common Lisp Implementation";
     homepage = "https://common-lisp.net/project/mkcl/";
     license = licenses.lgpl2Plus;

From b5e7e053969e4aa983934a23ba4ae4537383a133 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:31:36 +0200
Subject: [PATCH 30/57] python3Packages.pyupgrade: 2.23.0 -> 2.23.1

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

diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 202c8254f6b9..3d37dcae8720 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyupgrade";
-  version = "2.23.0";
+  version = "2.23.1";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "asottile";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i";
+    sha256 = "1jc0gh0y5fz02wab50v6m4x0pfycdkjvf1vw05d8d0yqsv7ld7fw";
   };
 
   checkInputs = [ pytestCheckHook ];

From fc11b5eaa4bbd8075e4b64d237d68cda030d661e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 30 Jul 2021 08:37:25 +0000
Subject: [PATCH 31/57] doc: rust: add missing semicolon

---
 doc/languages-frameworks/rust.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index f5c664bec20e..f17e1ba8d8f0 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -144,7 +144,7 @@ rustPlatform.buildRustPackage rec {
     outputHashes = {
       "finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904";
     };
-  }
+  };
 
   # ...
 }

From 27d8dba3f155d79b618ee5b9b3f7a08f5eec8849 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:38:03 +0200
Subject: [PATCH 32/57] python3Packages.archinfo: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 40583a12ada8..4f33bbb6101e 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.0.9166";
+  version = "9.0.9297";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5";
+    sha256 = "0hlwf98ijb8c9gc51pjy4kq4zal2cmqrr34dgk31f03dnp65yiz7";
   };
 
   checkInputs = [

From 69aecb9a5e0ae58f1dce085f3fe4de43e4b9a446 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:38:21 +0200
Subject: [PATCH 33/57] python3Packages.ailment: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 3ddd3d366e8e..12cca132ab18 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.0.9166";
+  version = "9.0.9297";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz";
+    sha256 = "01lj0abg93icvf4nz1ngshl04avm48lh0naqjcaaxa6ak1gxf97d";
   };
 
   propagatedBuildInputs = [ pyvex ];

From 46eed450bb5264e66841e24794dfaf1ce2444572 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:38:39 +0200
Subject: [PATCH 34/57] python3Packages.pyvex: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index a6c2b1d381b7..ee61f4fcca0d 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.0.9166";
+  version = "9.0.9297";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja";
+    sha256 = "1dfg7kacmwln0sazs5hakmsmfbm8m55qq1ydxi4g2ix3bfxkc1c4";
   };
 
   postPatch = lib.optionalString stdenv.isDarwin ''

From 9e17af6970c9519844ff386d8636f4ad1d7f80ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:39:00 +0200
Subject: [PATCH 35/57] python3Packages.claripy: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 3dc930473f5e..b39034f30934 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.0.9166";
+  version = "9.0.9297";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0";
+    sha256 = "1lacpdzaifn050msh4rf75qphbh56dc2kdk7m426q4ki3g7026n7";
   };
 
   # Use upstream z3 implementation

From 0a52bf4743235121df68d5b6a14a47eef5dfbab7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:39:11 +0200
Subject: [PATCH 36/57] python3Packages.cle: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 0110625eba87..f3c2f9977b08 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.0.9166";
+  version = "9.0.9297";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c";
+    sha256 = "1n5ybbxmsm7mc7z40b9imbgzjzmbjq58sh6zvzjyqqnl9k657khc";
   };
 
   propagatedBuildInputs = [

From dc3da4ec5ad75cbdc298b8739536732761a65401 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:39:25 +0200
Subject: [PATCH 37/57] python3Packages.angrop: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 1ab86c1820ac..ed84b56f0f8e 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "angrop";
-  version = "9.0.9166";
+  version = "9.0.9297";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m";
+    sha256 = "10ky13j66ysag9wmx8hsmr4pn16h24rp34zqi3qn7hk1v2jrkkx6";
   };
 
   propagatedBuildInputs = [

From 33356775bc2edc0aa7063976031268e413636d2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 10:39:35 +0200
Subject: [PATCH 38/57] python3Packages.angr: 9.0.9166 -> 9.0.9297

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index acad9cb0f598..53098646db2e 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -43,14 +43,14 @@ in
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.0.9166";
+  version = "9.0.9297";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x";
+    sha256 = "1n0qklh0cwp75mr7zgv7a9qm58gxpfbwialhnyg8w9y00mqh6flj";
   };
 
   propagatedBuildInputs = [

From 9bd0be76b2219e8984566340e26a0f85caeb89cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 29 Jul 2021 16:31:07 +0200
Subject: [PATCH 39/57] nix(Stable): 2.3.14 -> 2.3.15

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e60cf5804261..b1ba766b78b0 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -218,10 +218,10 @@ in rec {
 
   nixStable = callPackage common (rec {
     pname = "nix";
-    version = "2.3.14";
+    version = "2.3.15";
     src = fetchurl {
       url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
-      sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk=";
+      sha256 = "sha256-N+MxClX94eUOfUMh0puRgNHp16+cjSEdtqZn5u5OtBA=";
     };
 
     boehmgc = boehmgc_nix;

From c145ac7eabd6bae0f4d85002ab5e2079b2d9621a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 30 Jul 2021 11:17:19 +0200
Subject: [PATCH 40/57] build-fhs-userenv: fix defaults on aarch64

---
 pkgs/build-support/build-fhs-userenv/env.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 226904f311b6..da4521b4de3b 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -1,8 +1,11 @@
 { stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
 
-{ name, profile ? ""
-, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
-, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
+{ name
+, profile ? ""
+, targetPkgs ? pkgs: []
+, multiPkgs ? pkgs: []
+, extraBuildCommands ? ""
+, extraBuildCommandsMulti ? ""
 , extraOutputsToInstall ? []
 }:
 
@@ -23,7 +26,8 @@
 
 let
   is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64;
-  isMultiBuild  = multiPkgs != null && is64Bit;
+  # multi-lib glibc is only supported on x86_64
+  isMultiBuild  = multiPkgs != null && stdenv.hostPlatform.system == "x86_64-linux";
   isTargetBuild = !isMultiBuild;
 
   # list of packages (usually programs) which are only be installed for the

From 63c36ec2658f461ecd07704b5bc85d09ff4888dd Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Fri, 30 Jul 2021 09:40:38 +0000
Subject: [PATCH 41/57] exploitdb: 2021-07-29 -> 2021-07-30

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 8fdf5ec0d780..9abc01aa4b9c 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,19 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2021-07-29";
+  version = "2021-07-30";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = version;
-    sha256 = "sha256-/ZNQcfDHFFiI3BFyUTcwDUnhbCdxA4GrS8EIjgYgKw8=";
+    sha256 = "sha256-7gMhp5MR4RFPv8Ob9SR3XvapPIt5llf3CspW4Yu7Puo=";
   };
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
     cp --recursive ./* $out/bin
     cp ./.searchsploit_rc $out/bin
+    runHook postInstall
   '';
 
   meta = with lib; {

From 00d5259f5e4aeed77c53e45cb1e5ea8725fef0a7 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 30 Jul 2021 02:46:45 -0700
Subject: [PATCH 42/57] vk-cli: Remove zulip dependency

zulip is an application; it does not have any libraries.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../networking/instant-messengers/vk-cli/default.nix           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix
index e1b3cc4f7753..bb34fd7534c9 100644
--- a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix
@@ -2,7 +2,6 @@
 , lib
 , fetchurl
 , curl
-, zulip
 , p7zip
 , glibc
 , ncurses
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     patchelf $out/bin/vk-cli \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${lib.makeLibraryPath [ curl zulip glibc ]}"
+      --set-rpath "${lib.makeLibraryPath [ curl glibc ]}"
   '';
 
   meta = with lib; {

From 70af7d12dca1b78c1d6a4a8d166f0153ddbeeb9f Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 30 Jul 2021 12:04:43 +0200
Subject: [PATCH 43/57] cypress: 8.0.0 -> 8.1.0

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

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index ff673658272e..0e1715a4c12d 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cypress";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z";
+    sha256 = "17cq88qrq3dshgfaycb77xbkzr9drw7fvw0xqijlxivvmnbvwi6i";
   };
 
   # don't remove runtime deps

From 1c9dda8a9b0d1b52966521602315ef14dbdc6d93 Mon Sep 17 00:00:00 2001
From: Lucas Ransan <lucas@ransan.tk>
Date: Fri, 30 Jul 2021 13:35:43 +0200
Subject: [PATCH 44/57] cone: init at unstable-2021-07-25

---
 pkgs/development/compilers/cone/default.nix | 42 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/compilers/cone/default.nix

diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix
new file mode 100644
index 000000000000..9344160ad762
--- /dev/null
+++ b/pkgs/development/compilers/cone/default.nix
@@ -0,0 +1,42 @@
+{ llvmPackages
+, lib
+, fetchFromGitHub
+, cmake
+}:
+
+llvmPackages.stdenv.mkDerivation rec {
+  pname = "cone";
+  version = "unstable-2021-07-25";
+
+  src = fetchFromGitHub {
+    owner = "jondgoodwin";
+    repo = pname;
+    rev = "5feaabc342bcff3755f638a7e25155cd12127592";
+    sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    llvmPackages.llvm
+  ];
+
+  postPatch = ''
+    sed -i CMakeLists.txt \
+        -e 's/LLVM 7/LLVM/' \
+        -e '/AVR/d'
+  '';
+
+  installPhase = ''
+    install -Dm755 conec $out/bin/conec
+    install -Dm644 libconestd.a $out/lib/libconestd.a
+  '';
+
+  meta = with lib; {
+    description = "Cone Programming Language";
+    homepage = "https://cone.jondgoodwin.com";
+    license = licenses.mit;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 107722e6e102..ff3584a38da4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3958,6 +3958,10 @@ in
 
   compass = callPackage ../development/tools/compass { };
 
+  cone = callPackage ../development/compilers/cone {
+    llvmPackages = llvmPackages_7;
+  };
+
   conda = callPackage ../tools/package-management/conda { };
 
   console-bridge = callPackage ../development/libraries/console-bridge { };

From bc6789fd7ff1ca21ef3579c3baee9bf90614df1e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 30 Jul 2021 14:38:50 +0300
Subject: [PATCH 45/57] =?UTF-8?q?cudatext:=201.137.2=20=E2=86=92=201.139.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/editors/cudatext/default.nix |  4 ++--
 pkgs/applications/editors/cudatext/deps.json  | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index bab29597c76c..ad25fb898ba3 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cudatext";
-  version = "1.137.2";
+  version = "1.139.5";
 
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
     rev = version;
-    sha256 = "sha256-OiLYXx1sBkEJpMPTa/45QPHLtmeI6ZLles7GfjEBGtQ=";
+    sha256 = "sha256-oBdEPLnM08gC3FZNDi1uyGar2MP8EmFkWJhH+fr6gBA=";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 8ca09925058a..c27c482b2871 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -16,23 +16,23 @@
   },
   "ATSynEdit": {
     "owner": "Alexey-T",
-    "rev": "0cf6e09f673beb3a25d6957c97eeeee37024617b",
-    "sha256": "sha256-oqxzORNva7tZXNlI/mSe722p6Tbkf7Ie6GPL3TxjV98="
+    "rev": "2021.07.29",
+    "sha256": "sha256-XgkpadcTPeMu2B3XVX+9gHLZiAaLwNuHTCnZPtjakIk="
   },
   "ATSynEdit_Cmp": {
     "owner": "Alexey-T",
-    "rev": "2021.07.09",
-    "sha256": "sha256-w5f1s8yjkYfDqAcKISRgJd3fe+f2NyO3ZtFLLfiBm2Q="
+    "rev": "2021.07.20",
+    "sha256": "sha256-yh9/2kHfg7swNzPe+7i+ON7MKhFrhxtGAT+pxL4GdVQ="
   },
   "EControl": {
     "owner": "Alexey-T",
-    "rev": "2021.07.02",
-    "sha256": "sha256-PndvBiqdqw681AC6q33UWdzUvcYHxj1WuYsVFi2HK7c="
+    "rev": "2021.07.29",
+    "sha256": "sha256-2Wc4udsSEM0Ngzt/bokuDHcR0imKyHgkeG3RCWu3nXw="
   },
   "ATSynEdit_Ex": {
     "owner": "Alexey-T",
-    "rev": "2021.07.09",
-    "sha256": "sha256-QCG9i26m3v9J4uO1I1BiDwBerH4iX1rAJuNqx+gHLnA="
+    "rev": "2021.07.29",
+    "sha256": "sha256-mCT3F0GPC+Hl7WOtYznxErMTyr9cH4ghaanYMum+3Fg="
   },
   "Python-for-Lazarus": {
     "owner": "Alexey-T",
@@ -46,8 +46,8 @@
   },
   "CudaText-lexers": {
     "owner": "Alexey-T",
-    "rev": "2021.02.01",
-    "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd"
+    "rev": "2021.07.09",
+    "sha256": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4="
   },
   "bgrabitmap": {
     "owner": "bgrabitmap",

From 2ef8e12ff9bb1a1792cd7701d827212c1a99c453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 30 Jul 2021 13:12:00 +0100
Subject: [PATCH 46/57] ledger-live-desktop: 2.30.0 -> 2.31.1

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

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 1c6c41a0e721..f54b693f309e 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.30.0";
+  version = "2.31.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595";
+    sha256 = "0cxf4i58l0kg9c13j7mf0w5ijrkkf9z1375vn6xghd0r8g5hvws5";
   };
 
   appimageContents = appimageTools.extractType2 {

From 733594090b4ac64ef402118edf69355005b1acb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 30 Jul 2021 13:13:28 +0100
Subject: [PATCH 47/57] ledger-live-desktop: add andresilva as maintainer

---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index f54b693f309e..6e97c51afce4 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec {
     description = "Wallet app for Ledger Nano S and Ledger Blue";
     homepage = "https://www.ledger.com/live";
     license = licenses.mit;
-    maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood th0rgal ];
+    maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ];
     platforms = [ "x86_64-linux" ];
   };
 }

From c16026700252faa5f2168b10216af8b45858c251 Mon Sep 17 00:00:00 2001
From: David <dlesl@users.noreply.github.com>
Date: Mon, 26 Jul 2021 09:19:51 +0200
Subject: [PATCH 48/57] rebar3: apply tmpdir patch from upstream

---
 .../tools/build-managers/rebar3/default.nix      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 3b775eeaef1c..f1aa4204a045 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub, fetchpatch,
   fetchHex, erlang, makeWrapper,
   writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
 
@@ -40,12 +40,14 @@ let
     '';
 
 
-    patches = []
-      # Skips test that can write outside the designated tmp directory, potentially resulting in build failures
-      # due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when
-      # rebar3 releases with the following commit:
-      # https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21
-      ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ];
+    patches = [
+      # TODO: remove this on next rebar3 release
+      (fetchpatch {
+        name = "escriptize-erl-libs";
+        url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch";
+        sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c";
+      })
+    ];
 
     checkPhase = ''
       HOME=. escript ./rebar3 ct

From c8ca3c5de7fdf4616695aaf7a6571a455f5d98ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Jul 2021 14:23:52 +0200
Subject: [PATCH 49/57] ijq: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix
index 4165f9bd41c1..caac892bf122 100644
--- a/pkgs/development/tools/ijq/default.nix
+++ b/pkgs/development/tools/ijq/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ijq";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromSourcehut {
     owner = "~gpanders";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0xLmjidPxjSkYmLI4lWieT2rswZsWBY/IUXFOrUFAMo=";
+    sha256 = "sha256-mPO3P+NGFIoHuvMFwj87S8H8LQx7QpfPy2zi91la2C0=";
   };
 
-  vendorSha256 = "sha256-7UuQXnQdlUMC0ZIgHydQ5bZMB5XrE7dhx5+1NI+zFkM=";
+  vendorSha256 = "sha256-HbrmfZ/P5bUF7Qio5L1sb/HAYk/tL2SOmxHCXvSw72I=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper scdoc ];
 
@@ -31,6 +31,6 @@ buildGoModule rec {
     description = "Interactive wrapper for jq";
     homepage = "https://git.sr.ht/~gpanders/ijq";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ justinas ];
+    maintainers = with maintainers; [ justinas SuperSandro2000 ];
   };
 }

From 5e80b47d56bf2622a39e18c1ea05b1226627f834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Jul 2021 14:29:27 +0200
Subject: [PATCH 50/57] jq: format, update meta

---
 pkgs/development/tools/jq/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index feeb22e1d441..7206a6d7d24a 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -1,5 +1,11 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
-, onigurumaSupport ? true, oniguruma }:
+{ lib
+, stdenv
+, fetchpatch
+, fetchFromGitHub
+, autoreconfHook
+, onigurumaSupport ? true
+, oniguruma
+}:
 
 stdenv.mkDerivation rec {
   pname = "jq";
@@ -46,8 +52,8 @@ stdenv.mkDerivation rec {
     "--datadir=\${doc}/share"
     "--mandir=\${man}/share/man"
   ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no"
-    # jq is linked to libjq:
-    ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
+  # jq is linked to libjq:
+  ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
   doInstallCheck = true;
   installCheckTarget = "check";
@@ -63,8 +69,8 @@ stdenv.mkDerivation rec {
     description = "A lightweight and flexible command-line JSON processor";
     license = licenses.mit;
     maintainers = with maintainers; [ raskin globin ];
-    platforms = with platforms; linux ++ darwin;
-    downloadPage = "http://stedolan.github.io/jq/download/";
+    platforms = platforms.unix;
+    downloadPage = "https://stedolan.github.io/jq/download/";
     updateWalker = true;
   };
 }

From 6adebe1f67d3f4092d9e64248c39b2103801dc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 30 Jul 2021 14:30:25 +0200
Subject: [PATCH 51/57] elfcat: remove Cargo.lock file

---
 pkgs/tools/misc/elfcat/Cargo.lock  | 7 -------
 pkgs/tools/misc/elfcat/default.nix | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 pkgs/tools/misc/elfcat/Cargo.lock

diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock
deleted file mode 100644
index c5b48135993f..000000000000
--- a/pkgs/tools/misc/elfcat/Cargo.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "elfcat"
-version = "0.1.4"
diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix
index a9691e43c6a9..54b9ce0cc490 100644
--- a/pkgs/tools/misc/elfcat/default.nix
+++ b/pkgs/tools/misc/elfcat/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY=";
   };
 
-  cargoLock.lockFile = ./Cargo.lock;
+  cargoSha256 = null;
 
   meta = with lib; {
     description = "ELF visualizer, generates HTML files from ELF binaries.";

From 8575d242979c1a0e71bd19481e770517e8fd9d9e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jul 2021 06:37:13 -0700
Subject: [PATCH 52/57] buildkite-agent: 3.31.0 -> 3.32.0 (#132022)

---
 .../tools/continuous-integration/buildkite-agent/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index b32eed9a1662..3b98a7a7775e 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -3,13 +3,13 @@
   nixosTests }:
 buildGoModule rec {
   name = "buildkite-agent-${version}";
-  version = "3.31.0";
+  version = "3.32.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng=";
+    sha256 = "sha256-wgIqsOqdwnKL1mWD1CR1ru2erc9iSZoDXxeOtobeAQQ=";
   };
 
   vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";

From 44b0d80303d55c38210785a474e92a7e01e133c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jul 2021 08:07:13 +0000
Subject: [PATCH 53/57] esbuild: 0.12.16 -> 0.12.17

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

diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 2802a05f8ada..59e79a6ee197 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.12.16";
+  version = "0.12.17";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk=";
+    sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs=";
   };
 
   vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

From 0ddbf92e95b705633d8edc577e019febb130a4d8 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 30 Jul 2021 14:32:56 -0300
Subject: [PATCH 54/57] algol68g: Trivial fix in patch

---
 .../compilers/algol68g/0001-plotutils-png-support.diff          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
index beb3cb1c8bbe..14e7ccd56244 100644
--- a/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
+++ b/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff
@@ -9,7 +9,7 @@ diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotu
 -/*------------------------------------+
 -| Supported plotter type - pseudo GIF |
 -+------------------------------------*/
-+  } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "gif")) {
++  } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) {
 +/*-------------------------------------------+
 +| Supported plotter type - pseudo GIF or PNG |
 ++-------------------------------------------*/

From 2293303660461756a2003fe25c4dc8b9de3bac31 Mon Sep 17 00:00:00 2001
From: pmenke <nixos@pmenke.de>
Date: Fri, 30 Jul 2021 18:20:24 +0200
Subject: [PATCH 55/57] soapysdr: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index ccd4b8799cef..c6335b51c416 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  version = "0.8.0";
+  version = "0.8.1";
   modulesVersion = with lib; versions.major version + "." + versions.minor version;
   modulesPath = "lib/SoapySDR/modules" + modulesVersion;
   extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapySDR";
     rev = "soapy-sdr-${version}";
-    sha256 = "1dy25zxk7wmg7ik82dx7h3bbbynvalbz1dxsl7kgm3374yxhnixv";
+    sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2";
   };
 
   nativeBuildInputs = [ cmake makeWrapper pkg-config ];

From 988c12faed96159fd5902f3bc372739c111206ef Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 30 Jul 2021 15:12:46 -0400
Subject: [PATCH 56/57] linux/common-config.nix: disable LPAE on armv7l-linux

LPAE was enabled to support native armv7l builders running in QEMU on aarch64,
but this option disables support for processors which don't support LPAE, which
are still relatively common. In particular, Beaglebones use the Cortex-A8, which
doesn't support LPAE.

Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it,
it fails before even earlycon is initialized. This makes the problem difficult
to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index fce451ee889f..3fec8d38ac99 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -880,8 +880,6 @@ let
       # Keeping it a built-in ensures it will be used if possible.
       FB_SIMPLE = yes;
 
-    } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") {
-      ARM_LPAE = yes;
     };
   };
 in

From ecead7ce510fa177275f9d8521a7431efc6fa688 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jul 2021 23:04:02 +0200
Subject: [PATCH 57/57] metasploit: 6.0.54 -> 6.0.55

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 30 +++++++++---------
 pkgs/tools/security/metasploit/default.nix  |  4 +--
 pkgs/tools/security/metasploit/gemset.nix   | 34 ++++++++++-----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 5fa9ad3b4d6d..d9ca1bb29a87 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.54"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.55"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index e23841b82a55..eb3c1b2ee0d2 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398
-  ref: refs/tags/6.0.54
+  revision: bdf054bcc84e23bba81c387cc9247bf3c4052afb
+  ref: refs/tags/6.0.55
   specs:
-    metasploit-framework (6.0.54)
+    metasploit-framework (6.0.55)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -127,23 +127,23 @@ GEM
     arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.1)
-    aws-partitions (1.479.0)
-    aws-sdk-core (3.117.0)
+    aws-partitions (1.482.0)
+    aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.251.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ec2 (1.254.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.57.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-iam (1.59.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.2)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.98.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.4)
@@ -279,7 +279,7 @@ GEM
       ttfunk
     pg (1.2.3)
     public_suffix (4.0.6)
-    puma (5.3.2)
+    puma (5.4.0)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -416,4 +416,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   2.1.4
+   2.2.20
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 6bee3ddf81c4..c0a4d5857475 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.54";
+  version = "6.0.55";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o=";
+    sha256 = "sha256-Wf6Aj/mYHs7KdAYWjNzoD+Q5xK9DOsPiRTIEY7lac8M=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index e1ebae7da237..0295e7a5c6fe 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,60 +114,60 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh";
+      sha256 = "14l1w0ka4r54rx18c856dpn5dg1fnqlriiscjj89ap6vzg8r5pl4";
       type = "gem";
     };
-    version = "1.479.0";
+    version = "1.482.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax";
+      sha256 = "1azyn5hj41q1r9wcr0k12xb9j3v1v9ikyxnzjpizhsla44lg3270";
       type = "gem";
     };
-    version = "3.117.0";
+    version = "3.119.0";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7";
+      sha256 = "1i06ml61fr7qlxfbi98dg4lg40skjj5abfpz60jx7ml5dma13qma";
       type = "gem";
     };
-    version = "1.251.0";
+    version = "1.254.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y";
+      sha256 = "16am0mpagfzi5n6gsnd4yyiwy8ni312b3kxswq0jvr3wh8ab0r5h";
       type = "gem";
     };
-    version = "1.57.0";
+    version = "1.59.0";
   };
   aws-sdk-kms = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm";
+      sha256 = "0h70lz5pblw0sy82j6kv4q4d8h2rb1p6v650kaq8lh6iyjc6il9a";
       type = "gem";
     };
-    version = "1.44.0";
+    version = "1.46.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw";
+      sha256 = "0799n1j8cxcn79k5zhy8vcpbh4q8vyi1fxqqs20sxh7yhyhrybw9";
       type = "gem";
     };
-    version = "1.96.2";
+    version = "1.98.0";
   };
   aws-sigv4 = {
     groups = ["default"];
@@ -594,12 +594,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398";
-      sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202";
+      rev = "bdf054bcc84e23bba81c387cc9247bf3c4052afb";
+      sha256 = "1hvkbawn611j8pic6fj3mz23kr0gx3f8q5h6fk5cw7lqz67q1zjr";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.54";
+    version = "6.0.55";
   };
   metasploit-model = {
     groups = ["default"];
@@ -886,10 +886,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj";
+      sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x";
       type = "gem";
     };
-    version = "5.3.2";
+    version = "5.4.0";
   };
   racc = {
     groups = ["default"];