From 54119287379b17ad7d77cd322890635e13996fa7 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 13 Jun 2024 14:58:07 +0200
Subject: [PATCH 001/235] ruby: make 3.3 the default

According to https://www.ruby-lang.org/en/downloads/ this is the
'stable' release
---
 doc/languages-frameworks/ruby.section.md | 2 +-
 pkgs/top-level/all-packages.nix          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index 7dede6944a3d..c5cc122394f5 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -2,7 +2,7 @@
 
 ## Using Ruby {#using-ruby}
 
-Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 3.1. It's also possible to refer to specific versions, e.g. `ruby_3_y`, `jruby`, or `mruby`.
+Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 3.3. It's also possible to refer to specific versions, e.g. `ruby_3_y`, `jruby`, or `mruby`.
 
 In the Nixpkgs tree, Ruby packages can be found throughout, depending on what they do, and are called from the main package set. Ruby gems, however are separate sets, and there's one default set for each interpreter (currently MRI only).
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67c3c0e2bf76..be67c7641297 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17600,8 +17600,8 @@ with pkgs;
     ruby_3_2
     ruby_3_3;
 
-  ruby = ruby_3_1;
-  rubyPackages = rubyPackages_3_1;
+  ruby = ruby_3_3;
+  rubyPackages = rubyPackages_3_3;
 
   rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems;
   rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;

From 9466b5ff59f3f08eb8858d74e060cae0f6a34779 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 12 Jul 2024 22:02:44 +0100
Subject: [PATCH 002/235] xterm: 392 -> 393

Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_393
---
 pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
index 5650910cd8a6..e5aafd0b7919 100644
--- a/pkgs/applications/terminal-emulators/xterm/default.nix
+++ b/pkgs/applications/terminal-emulators/xterm/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "xterm";
-  version = "392";
+  version = "393";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
     ];
-    hash = "sha256-TVc3LvCOr6n7doLbjQe+D+BRPljoR4wuyOm2JIbn/l4=";
+    hash = "sha256-3Dq/Uz1mrj20nmeDsOHinw5NBFtLPax5el6Tvic17Hs=";
   };
 
   patches = [ ./sixel-256.support.patch ];

From 8306b7b7d53c2e6611f413555323ef5e9e6fa88a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 14 Jul 2024 17:07:25 +0100
Subject: [PATCH 003/235] imlib2: 1.12.2 -> 1.12.3

Changes: https://www.mail-archive.com/enlightenment-devel@lists.sourceforge.net/msg110880.html
---
 pkgs/development/libraries/imlib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 0c48ad94ec7e..3a59dbb9564a 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -31,11 +31,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "imlib2";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/imlib2-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zEmTGiBWCWioZIycoHkIWXYIXqltWaAbHhfLVa8P/kI=";
+    hash = "sha256-liRGVldqPgpvWLeOUU3ckZYirGgGcRvCMYN+7mLB3jQ=";
   };
 
   buildInputs = [

From 69ba3f70eb4ed48e21fa5ef0ea90133e7b7c0d0f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 21 Jul 2024 07:24:01 +0100
Subject: [PATCH 004/235] lua5_4: 5.4.6 -> 5.4.7

Changes: https://www.lua.org/work/diffs-lua-5.4.6-lua-5.4.7.html
---
 pkgs/development/interpreters/lua-5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index a7587dafe392..7f1e5ccb7313 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -81,8 +81,8 @@ in
 rec {
   lua5_4 = callPackage ./interpreter.nix {
     self = lua5_4;
-    version = "5.4.6";
-    hash = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
+    version = "5.4.7";
+    hash = "sha256-n79eKO+GxphY9tPTTszDLpEcGii0Eg/z6EqqcM+/HjA=";
     makeWrapper = makeBinaryWrapper;
     inherit passthruFun;
 

From 4a1a64b2d43a96c4ffdc0d7fe5f0c476bddb8614 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 22 Jul 2024 22:02:41 +0100
Subject: [PATCH 005/235] gbenchmark: 1.8.4 -> 1.8.5

Changes: https://github.com/google/benchmark/releases/tag/v1.8.5
---
 pkgs/development/libraries/gbenchmark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index d8666d92cf3e..c89d3413aa2c 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gbenchmark";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "sha256-O+1ZHaNHSkKz3PlKDyI94LqiLtjyrKxjOIi8Q236/MI=";
+    hash = "sha256-c46Xna/t21WKaFa7n4ieIacsrxJ+15uGNYWCUVuUhsI=";
   };
 
   nativeBuildInputs = [ cmake ];

From f293272682bbfef8d5ef6e6a1544845eae907970 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 7 Jun 2024 09:13:55 -0700
Subject: [PATCH 006/235] perl: add cc in addition to makeBinaryWrapper. see
 NixOS#311794

The "correct" solution to this problem (makeBinaryWrapper fails to be
able to compile the binary wrapper when building a freebsd cross env) is
that makeBinaryWrapper should propagate or embed a reference to the
compiler. However, this causes build failures on musl, so this will have
to do for now.
---
 pkgs/development/interpreters/perl/wrapper.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix
index 8e4630b48e76..f86808306c55 100644
--- a/pkgs/development/interpreters/perl/wrapper.nix
+++ b/pkgs/development/interpreters/perl/wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, perl, buildEnv, makeBinaryWrapper
+{ lib, perl, buildEnv, makeBinaryWrapper, stdenv
 , extraLibs ? []
 , extraOutputsToInstall ? []
 , postBuild ? ""
@@ -17,7 +17,8 @@ let
     inherit ignoreCollisions;
     extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
 
-    nativeBuildInputs = [ makeBinaryWrapper ];
+    # TODO: remove stdenv.cc as soon as it is added to propagatedNativeBuildInputs of makeBinaryWrapper
+    nativeBuildInputs = [ makeBinaryWrapper stdenv.cc ];
 
     # we create wrapper for the binaries in the different packages
     postBuild = ''

From 34b3dd9cb7ede6b2db747d0049a54aea19b33d71 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 24 Jul 2024 22:26:52 +0100
Subject: [PATCH 007/235] libtirpc: 1.3.4 -> 1.3.5

Changes: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=shortlog;h=refs/tags/libtirpc-1-3-5
---
 pkgs/development/libraries/ti-rpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 9f22ae65d28c..1a1cf14c9ea8 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libtirpc";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchurl {
     url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz";
-    sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw=";
+    hash = "sha256-bq2zfqfMJsJ6gezLCUTlNiRXJhFxFslY4iW+4kpOPVE=";
     name = "${pname}-${version}.tar.gz";
   };
 

From f47e3afc1e73dfa589bd2bc9c085b377fd304b40 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 25 Jul 2024 10:54:40 -0700
Subject: [PATCH 008/235] boost-build: fix overriding target when llvm

---
 pkgs/development/tools/boost-build/default.nix     |  3 ++-
 .../tools/boost-build/fix-clang-target.patch       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/boost-build/fix-clang-target.patch

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index a74b029d327a..fe8f1a4682fe 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
     sourceRoot="$sourceRoot/tools/build"
   '';
 
-  patches = useBoost.boostBuildPatches or [];
+  patches = useBoost.boostBuildPatches or []
+    ++ lib.optional (useBoost ? version && lib.versionAtLeast useBoost.version "1.81") ./fix-clang-target.patch;
 
   # Upstream defaults to gcc on darwin, but we use clang.
   postPatch = ''
diff --git a/pkgs/development/tools/boost-build/fix-clang-target.patch b/pkgs/development/tools/boost-build/fix-clang-target.patch
new file mode 100644
index 000000000000..0e64e02e2743
--- /dev/null
+++ b/pkgs/development/tools/boost-build/fix-clang-target.patch
@@ -0,0 +1,14 @@
+--- a/src/tools/clang.jam	2024-07-25 10:38:16.278401900 -0700
++++ b/src/tools/clang.jam	2024-07-25 10:38:52.659750666 -0700
+@@ -90,11 +90,6 @@
+                 case x86-64 : arch = x86_64 ;
+                 case x86-32 : arch = i386 ;
+             }
+-
+-            toolset.flags $(toolset)
+-                OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_)
+-                : "--target=$(arch)-$(vendor-sys)"
+-                : unchecked ;
+         }
+     }
+ }

From 3e6180e98430359ded36ebc4a0341e1bd6608ef8 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 25 Jul 2024 10:55:01 -0700
Subject: [PATCH 009/235] boost: fix building with llvm

---
 .../libraries/boost/fix-clang-target.patch         | 14 ++++++++++++++
 pkgs/development/libraries/boost/generic.nix       |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/fix-clang-target.patch

diff --git a/pkgs/development/libraries/boost/fix-clang-target.patch b/pkgs/development/libraries/boost/fix-clang-target.patch
new file mode 100644
index 000000000000..93bc4d099644
--- /dev/null
+++ b/pkgs/development/libraries/boost/fix-clang-target.patch
@@ -0,0 +1,14 @@
+--- a/tools/build/src/tools/clang.jam	2024-07-25 10:38:16.278401900 -0700
++++ b/tools/build/src/tools/clang.jam	2024-07-25 10:38:52.659750666 -0700
+@@ -90,11 +90,6 @@
+                 case x86-64 : arch = x86_64 ;
+                 case x86-32 : arch = i386 ;
+             }
+-
+-            toolset.flags $(toolset)
+-                OPTIONS $(condition)/<target-os>$(target-os)/<architecture>$(_architecture_)/<address-model>$(_address-model_)
+-                : "--target=$(arch)-$(vendor-sys)"
+-                : unchecked ;
+         }
+     }
+ }
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 6a8b204e430d..47b0a7a7bc55 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -150,7 +150,8 @@ stdenv.mkDerivation {
       stripLen = 1;
       extraPrefix = "libs/python/";
     })
-  ];
+  ]
+  ++ lib.optional (lib.versionAtLeast version "1.81" && stdenv.cc.isClang) ./fix-clang-target.patch;
 
   meta = with lib; {
     homepage = "http://boost.org/";

From e5906ddfd42a74354981e535fb9e4dfc1e05905b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 28 Mar 2023 17:00:23 +0200
Subject: [PATCH 010/235] nodejs: fix cross compilation for armv7l

The v8 library supports only limited number of build platforms based on
the host architecture. The rule there is the bitness (the mixing of
32bit and 64bit architectures seems to be in most cases disallowed).
Thus this adds usage of the emulator of the host platform and builds
tools for that.

Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
---
 .../nodejs/configure-emulator-node18.patch    | 138 +++++++++++++
 .../web/nodejs/configure-emulator.patch       | 146 +++++++++++++
 pkgs/development/web/nodejs/nodejs.nix        | 191 +++++++++++-------
 pkgs/development/web/nodejs/v18.nix           |   1 +
 pkgs/development/web/nodejs/v20.nix           |   1 +
 pkgs/development/web/nodejs/v22.nix           |   1 +
 6 files changed, 405 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/configure-emulator-node18.patch
 create mode 100644 pkgs/development/web/nodejs/configure-emulator.patch

diff --git a/pkgs/development/web/nodejs/configure-emulator-node18.patch b/pkgs/development/web/nodejs/configure-emulator-node18.patch
new file mode 100644
index 000000000000..f7faddb7e005
--- /dev/null
+++ b/pkgs/development/web/nodejs/configure-emulator-node18.patch
@@ -0,0 +1,138 @@
+From 4b83f714c821d6d4d2306673ee3a87907cfec80e Mon Sep 17 00:00:00 2001
+From: Ivan Trubach <mr.trubach@icloud.com>
+Date: Fri, 19 Jul 2024 10:45:13 +0300
+Subject: [PATCH] build: support setting an emulator from configure script
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+V8’s JIT infrastructure requires binaries such as mksnapshot to be run
+during the build. However, these binaries must have the same bit-width
+as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs
+to produce a 32-bit binary).
+
+To work around this issue, allow building the binaries for the host
+platform and running them on the build platform with an emulator.
+
+Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch.
+https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch
+
+Upstream: https://github.com/nodejs/node/pull/53899
+---
+ common.gypi              |  1 +
+ configure.py             | 14 ++++++++++++++
+ node.gyp                 |  3 +++
+ tools/v8_gypfiles/v8.gyp |  4 ++++
+ 4 files changed, 22 insertions(+)
+
+diff --git a/common.gypi b/common.gypi
+index ec92c9df4c..6474495ab6 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -13,6 +13,7 @@
+     'enable_pgo_generate%': '0',
+     'enable_pgo_use%': '0',
+     'python%': 'python',
++    'emulator%': [],
+ 
+     'node_shared%': 'false',
+     'force_dynamic_crt%': 0,
+diff --git a/configure.py b/configure.py
+index 82916748fd..10dc0becbb 100755
+--- a/configure.py
++++ b/configure.py
+@@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu',
+     choices=valid_arch,
+     help=f"CPU architecture to build for ({', '.join(valid_arch)})")
+ 
++parser.add_argument('--emulator',
++    action='store',
++    dest='emulator',
++    default=None,
++    help='emulator command that can run executables built for the target system')
++
+ parser.add_argument('--cross-compiling',
+     action='store_true',
+     dest='cross_compiling',
+@@ -2160,6 +2166,14 @@ write('config.mk', do_not_edit + config_str)
+ gyp_args = ['--no-parallel', '-Dconfiguring_node=1']
+ gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']]
+ 
++if options.emulator is not None:
++  if not options.cross_compiling:
++    # Note that emulator is a list so we have to quote the variable.
++    gyp_args += ['-Demulator=' + shlex.quote(options.emulator)]
++  else:
++    # TODO: perhaps use emulator for tests?
++    warn('The `--emulator` option has no effect when cross-compiling.')
++
+ if options.use_ninja:
+   gyp_args += ['-f', 'ninja-' + flavor]
+ elif flavor == 'win' and sys.platform != 'msys':
+diff --git a/node.gyp b/node.gyp
+index 08cb3f38e8..515b305933 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -332,6 +332,7 @@
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+                   ],
+                   'action': [
++                    '<@(emulator)',
+                     '<(node_mksnapshot_exec)',
+                     '--build-snapshot',
+                     '<(node_snapshot_main)',
+@@ -351,6 +352,7 @@
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+                   ],
+                   'action': [
++                    '<@(emulator)',
+                     '<@(_inputs)',
+                     '<@(_outputs)',
+                   ],
+@@ -1520,6 +1522,7 @@
+                '<(PRODUCT_DIR)/<(node_core_target_name).def',
+              ],
+              'action': [
++               '<@(emulator)',
+                '<(PRODUCT_DIR)/gen_node_def.exe',
+                '<@(_inputs)',
+                '<@(_outputs)',
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index ba8b161f0f..d5c90dad50 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -99,6 +99,7 @@
+             '<@(torque_outputs_inc)',
+           ],
+           'action': [
++            '<@(emulator)',
+             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+             '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
+             '-v8-root', '<(V8_ROOT)',
+@@ -219,6 +220,7 @@
+           'action': [
+             '<(python)',
+             '<(V8_ROOT)/tools/run.py',
++            '<@(emulator)',
+             '<@(_inputs)',
+             '<@(_outputs)',
+           ],
+@@ -442,6 +444,7 @@
+              }],
+           ],
+           'action': [
++            '<@(emulator)',
+             '>@(_inputs)',
+             '>@(mksnapshot_flags)',
+           ],
+@@ -1577,6 +1580,7 @@
+           'action': [
+             '<(python)',
+             '<(V8_ROOT)/tools/run.py',
++            '<@(emulator)',
+             '<@(_inputs)',
+             '<@(_outputs)',
+           ],
+-- 
+2.44.1
+
diff --git a/pkgs/development/web/nodejs/configure-emulator.patch b/pkgs/development/web/nodejs/configure-emulator.patch
new file mode 100644
index 000000000000..d1462f374d7e
--- /dev/null
+++ b/pkgs/development/web/nodejs/configure-emulator.patch
@@ -0,0 +1,146 @@
+From 999d918bc8fefec1752243743a47c0ce5380bcec Mon Sep 17 00:00:00 2001
+From: Ivan Trubach <mr.trubach@icloud.com>
+Date: Wed, 17 Jul 2024 10:16:02 +0300
+Subject: [PATCH] build: support setting an emulator from configure script
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+V8’s JIT infrastructure requires binaries such as mksnapshot to be run
+during the build. However, these binaries must have the same bit-width
+as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs
+to produce a 32-bit binary).
+
+To work around this issue, allow building the binaries for the host
+platform and running them on the build platform with an emulator.
+
+Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch.
+https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch
+
+Upstream: https://github.com/nodejs/node/pull/53899
+---
+ common.gypi              |  1 +
+ configure.py             | 14 ++++++++++++++
+ node.gyp                 |  4 ++++
+ tools/v8_gypfiles/v8.gyp |  4 ++++
+ 4 files changed, 23 insertions(+)
+
+diff --git a/common.gypi b/common.gypi
+index 154bbf2a0d..54d2afe3b3 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -13,6 +13,7 @@
+     'enable_pgo_generate%': '0',
+     'enable_pgo_use%': '0',
+     'python%': 'python',
++    'emulator%': [],
+ 
+     'node_shared%': 'false',
+     'force_dynamic_crt%': 0,
+diff --git a/configure.py b/configure.py
+index f7e3310723..f7c7acdf4f 100755
+--- a/configure.py
++++ b/configure.py
+@@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu',
+     choices=valid_arch,
+     help=f"CPU architecture to build for ({', '.join(valid_arch)})")
+ 
++parser.add_argument('--emulator',
++    action='store',
++    dest='emulator',
++    default=None,
++    help='emulator command that can run executables built for the target system')
++
+ parser.add_argument('--cross-compiling',
+     action='store_true',
+     dest='cross_compiling',
+@@ -2276,6 +2282,14 @@ if flavor == 'win' and python.lower().endswith('.exe'):
+ # will fail to run python scripts.
+ gyp_args += ['-Dpython=' + python]
+ 
++if options.emulator is not None:
++  if not options.cross_compiling:
++    # Note that emulator is a list so we have to quote the variable.
++    gyp_args += ['-Demulator=' + shlex.quote(options.emulator)]
++  else:
++    # TODO: perhaps use emulator for tests?
++    warn('The `--emulator` option has no effect when cross-compiling.')
++
+ if options.use_ninja:
+   gyp_args += ['-f', 'ninja-' + flavor]
+ elif flavor == 'win' and sys.platform != 'msys':
+diff --git a/node.gyp b/node.gyp
+index 9617596760..439c76aca6 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -703,6 +703,7 @@
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+                   ],
+                   'action': [
++                    '<@(emulator)',
+                     '<(node_mksnapshot_exec)',
+                     '--build-snapshot',
+                     '<(node_snapshot_main)',
+@@ -722,6 +723,7 @@
+                     '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
+                   ],
+                   'action': [
++                    '<@(emulator)',
+                     '<@(_inputs)',
+                     '<@(_outputs)',
+                   ],
+@@ -1010,6 +1012,7 @@
+             '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
+           ],
+           'action': [
++            '<@(emulator)',
+             '<(node_js2c_exec)',
+             '<@(_outputs)',
+             'lib',
+@@ -1477,6 +1480,7 @@
+                '<(PRODUCT_DIR)/<(node_core_target_name).def',
+              ],
+              'action': [
++               '<@(emulator)',
+                '<(PRODUCT_DIR)/gen_node_def.exe',
+                '<@(_inputs)',
+                '<@(_outputs)',
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index d65a5c268e..5cd6c36b86 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -112,6 +112,7 @@
+             '<@(torque_outputs_inc)',
+           ],
+           'action': [
++            '<@(emulator)',
+             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+             '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
+             '-v8-root', '<(V8_ROOT)',
+@@ -232,6 +233,7 @@
+           'action': [
+             '<(python)',
+             '<(V8_ROOT)/tools/run.py',
++            '<@(emulator)',
+             '<@(_inputs)',
+             '<@(_outputs)',
+           ],
+@@ -453,6 +455,7 @@
+              }],
+           ],
+           'action': [
++            '<@(emulator)',
+             '>@(_inputs)',
+             '>@(mksnapshot_flags)',
+           ],
+@@ -1842,6 +1845,7 @@
+           'action': [
+             '<(python)',
+             '<(V8_ROOT)/tools/run.py',
++            '<@(emulator)',
+             '<@(_inputs)',
+             '<@(_outputs)',
+           ],
+-- 
+2.44.1
+
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index c6ed6a116a37..b89fe4853091 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash
 , pkg-config, which, buildPackages
 , testers
 # for `.pkgs` attribute
@@ -7,7 +7,6 @@
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
 , gnupg
 , darwin, xcbuild
-, procps, icu
 , installShellFiles
 }:
 
@@ -16,36 +15,95 @@
 let
   inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
 
-  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-
   majorVersion = lib.versions.major version;
   minorVersion = lib.versions.minor version;
 
   pname = if enableNpm then "nodejs" else "nodejs-slim";
 
+  canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  emulator = stdenv.hostPlatform.emulator buildPackages;
+
+  # See valid_os and valid_arch in configure.py.
+  destOS =
+    let
+      platform = stdenv.hostPlatform;
+    in
+    if platform.isiOS then
+      "ios"
+    else if platform.isAndroid then
+      "android"
+    else if platform.isWindows then
+      "win"
+    else if platform.isDarwin then
+      "mac"
+    else if platform.isLinux then
+      "linux"
+    else if platform.isOpenBSD then
+      "openbsd"
+    else if platform.isFreeBSD then
+      "freebsd"
+    else
+      throw "unsupported os ${platform.uname.system}";
+  destCPU =
+    let
+      platform = stdenv.hostPlatform;
+    in
+    if platform.isAarch then
+      "arm" + lib.optionalString platform.is64bit "64"
+    else if platform.isMips32 then
+      "mips" + lib.optionalString platform.isLittleEndian "le"
+    else if platform.isMips64 && platform.isLittleEndian then
+      "mips64el"
+    else if platform.isPower then
+      "ppc" + lib.optionalString platform.is64bit "64"
+    else if platform.isx86_64 then
+      "x64"
+    else if platform.isx86_32 then
+      "ia32"
+    else if platform.isS390x then
+      "s390x"
+    else if platform.isRiscV64 then
+      "riscv64"
+    else if platform.isLoongArch64 then
+      "loong64"
+    else
+      throw "unsupported cpu ${platform.uname.processor}";
+  destARMFPU =
+    let
+      platform = stdenv.hostPlatform;
+    in
+    if platform.isAarch32 && platform ? gcc.fpu then
+      lib.throwIfNot (builtins.elem platform.gcc.fpu [
+        "vfp"
+        "vfpv3"
+        "vfpv3-d16"
+        "neon"
+      ]) "unsupported ARM FPU ${platform.gcc.fpu}" platform.gcc.fpu
+    else
+      null;
+  destARMFloatABI =
+    let
+      platform = stdenv.hostPlatform;
+    in
+    if platform.isAarch32 && platform ? gcc.float-abi then
+      lib.throwIfNot (builtins.elem platform.gcc.float-abi [
+        "soft"
+        "softfp"
+        "hard"
+      ]) "unsupported ARM float ABI ${platform.gcc.float-abi}" platform.gcc.float-abi
+    else
+      null;
+  # TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi).
+
   useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
 
   sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });
 
-  sharedConfigureFlags = lib.concatMap (name: [
-    "--shared-${name}"
-    "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib"
-    /** Closure notes: we explicitly avoid specifying --shared-*-includes,
-     *  as that would put the paths into bin/nodejs.
-     *  Including pkg-config in build inputs would also have the same effect!
-     */
-  ]) (builtins.attrNames sharedLibDeps) ++ [
-    "--with-intl=system-icu"
-    "--openssl-use-def-ca-store"
-  ];
-
   copyLibHeaders =
     map
       (name: "${lib.getDev sharedLibDeps.${name}}/include/*")
       (builtins.attrNames sharedLibDeps);
 
-  extraConfigFlags = lib.optionals (!enableNpm) [ "--without-npm" ];
-
   package = stdenv.mkDerivation (finalAttrs:
   let
     /** the final package fixed point, after potential overrides */
@@ -67,8 +125,6 @@ let
       NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
     };
 
-    depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ];
-
     # NB: technically, we do not need bash in build inputs since all scripts are
     # wrappers over the corresponding JS scripts. There are some packages though
     # that use bash wrappers, e.g. polaris-web.
@@ -82,37 +138,46 @@ let
     setOutputFlags = false;
     moveToDev = false;
 
-    configureFlags = let
-      inherit (stdenv.hostPlatform) gcc isAarch32;
-    in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [
-      "--without-dtrace"
-    ] ++ (lib.optionals isCross [
-      "--cross-compiling"
-      "--dest-cpu=${let platform = stdenv.hostPlatform; in
-                    if      platform.isAarch32 then "arm"
-                    else if platform.isAarch64 then "arm64"
-                    else if platform.isMips32 && platform.isLittleEndian then "mipsel"
-                    else if platform.isMips32 && !platform.isLittleEndian then "mips"
-                    else if platform.isMips64 && platform.isLittleEndian then "mips64el"
-                    else if platform.isPower && platform.is32bit then "ppc"
-                    else if platform.isPower && platform.is64bit then "ppc64"
-                    else if platform.isx86_64 then "x86_64"
-                    else if platform.isx86_32 then "x86"
-                    else if platform.isS390 && platform.is64bit then "s390x"
-                    else if platform.isRiscV && platform.is64bit then "riscv64"
-                    else throw "unsupported cpu ${stdenv.hostPlatform.uname.processor}"}"
-    ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "fpu" gcc) [
-      "--with-arm-fpu=${gcc.fpu}"
-    ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "float-abi" gcc) [
-      "--with-arm-float-abi=${gcc.float-abi}"
-    ]) ++ extraConfigFlags;
+    configureFlags =
+      [
+        "--no-cross-compiling"
+        "--dest-os=${destOS}"
+        "--dest-cpu=${destCPU}"
+      ]
+      ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ]
+      ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ]
+      ++ lib.optionals (!canExecute) [
+        # Node.js requires matching bitness between build and host platforms, e.g.
+        # for V8 startup snapshot builder (see tools/snapshot) and some other
+        # tools. We apply a patch that runs these tools using a host platform
+        # emulator and avoid cross-compiling altogether (from the build system’s
+        # perspective).
+        "--emulator=${emulator}"
+      ]
+      ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ]
+      ++ lib.optionals (!enableNpm) [ "--without-npm" ]
+      ++ lib.concatMap (name: [
+        "--shared-${name}"
+        "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib"
+        /**
+          Closure notes: we explicitly avoid specifying --shared-*-includes,
+          as that would put the paths into bin/nodejs.
+          Including pkg-config in build inputs would also have the same effect!
 
-    configurePlatforms = [];
+          FIXME: the statement above is outdated, we have to include pkg-config
+          in build inputs for system-icu.
+        */
+      ]) (builtins.attrNames sharedLibDeps)
+      ++ [
+        "--with-intl=system-icu"
+        "--openssl-use-def-ca-store"
+      ];
+
+    configurePlatforms = [ ];
 
     dontDisableStatic = true;
 
     configureScript = writeScript "nodejs-configure" ''
-      export CC_host="$CC_FOR_BUILD" CXX_host="$CXX_FOR_BUILD"
       exec ${python.executable} configure.py "$@"
     '';
 
@@ -140,9 +205,7 @@ let
 
     __darwinAllowLocalNetworking = true; # for tests
 
-    # TODO: what about tests when cross-compiling?
-    # Note that currently stdenv does not run check phase if build ≠ host.
-    doCheck = true;
+    doCheck = canExecute;
 
     # Some dependencies required for tools/doc/node_modules (and therefore
     # test-addons, jstest and others) target are not included in the tarball.
@@ -213,12 +276,12 @@ let
     postInstall = ''
       HOST_PATH=$out/bin patchShebangs --host $out
 
-      ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-        $out/bin/${self.meta.mainProgram} --completion-bash > ${self.meta.mainProgram}.bash
-        installShellCompletion ${self.meta.mainProgram}.bash
+      ${lib.optionalString canExecute ''
+        $out/bin/node --completion-bash > node.bash
+        installShellCompletion node.bash
       ''}
 
-      ${lib.optionalString (enableNpm) ''
+      ${lib.optionalString enableNpm ''
         mkdir -p $out/share/bash-completion/completions
         ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \
           $out/share/bash-completion/completions/npm
@@ -231,24 +294,14 @@ let
       ''}
 
       # install the missing headers for node-gyp
+      # TODO: add dev output and use propagatedBuildInputs instead of copying headers.
       cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node
 
       # assemble a static v8 library and put it in the 'libv8' output
       mkdir -p $libv8/lib
       pushd out/Release/obj.target
       find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files
-      ${if stdenv.buildPlatform.isGnu then ''
-        ar -cqs $libv8/lib/libv8.a @files
-      '' else ''
-        # llvm-ar supports response files, so take advantage of it if it’s available.
-        if [ "$(basename $(readlink -f $(command -v ar)))" = "llvm-ar" ]; then
-          ar -cqs $libv8/lib/libv8.a @files
-        else
-          cat files | while read -r file; do
-            ar -cqS $libv8/lib/libv8.a $file
-          done
-        fi
-      ''}
+      $AR -cqs $libv8/lib/libv8.a @files
       popd
 
       # copy v8 headers
@@ -290,14 +343,6 @@ let
       platforms = platforms.linux ++ platforms.darwin;
       mainProgram = "node";
       knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";
-
-      # Node.js build system does not have separate host and target OS
-      # configurations (architectures are defined as host_arch and target_arch,
-      # but there is no such thing as host_os and target_os).
-      #
-      # We may be missing something here, but it doesn’t look like it is
-      # possible to cross-compile between different operating systems.
-      broken = stdenv.buildPlatform.parsed.kernel.name != stdenv.hostPlatform.parsed.kernel.name;
     };
 
     passthru.python = python; # to ensure nodeEnv uses the same version
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 1101fbdf725d..b69f92d51c3a 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -26,6 +26,7 @@ buildNodejs {
   version = "18.20.4";
   sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio=";
   patches = [
+    ./configure-emulator-node18.patch
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch
     ./revert-arm64-pointer-auth.patch
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index bf0e2f7feffb..ced82cb0d7ee 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -15,6 +15,7 @@ buildNodejs {
   version = "20.15.1";
   sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=";
   patches = [
+    ./configure-emulator.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 44737d2ba8ec..58a34f8aff2a 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -15,6 +15,7 @@ buildNodejs {
   version = "22.4.1";
   sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k=";
   patches = [
+    ./configure-emulator.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch

From d162d8e50de274431d97bcf28c70751481e2ca82 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Tue, 16 Jul 2024 15:14:51 +0300
Subject: [PATCH 011/235] nodejs: use ninja for build

This change cleans up build inputs and adjusts the build to use ninja.
---
 .../nodejs/bypass-darwin-xcrun-node16.patch   | 39 +++++++++++-
 pkgs/development/web/nodejs/nodejs.nix        | 60 +++++++++++++++----
 2 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch b/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
index e86fcc4d2973..ba998c0510be 100644
--- a/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
+++ b/pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch
@@ -1,7 +1,42 @@
 Avoids needing xcrun or xcodebuild in PATH for native package builds
 
-diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-index a75d8ee..476440d 100644
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -522,7 +522,13 @@ class XcodeSettings:
+         # Since the CLT has no SDK paths anyway, returning None is the
+         # most sensible route and should still do the right thing.
+         try:
+-            return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
++            #return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])
++            return {
++                "--show-sdk-platform-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform",
++                "--show-sdk-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
++                "--show-sdk-build-version": "19A547",
++                "--show-sdk-version": "10.15"
++            }[infoitem]
+         except GypError:
+             pass
+ 
+@@ -1499,7 +1505,8 @@ def XcodeVersion():
+     version = ""
+     build = ""
+     try:
+-        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
++        #version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()
++        version_list = []
+         # In some circumstances xcodebuild exits 0 but doesn't return
+         # the right results; for example, a user on 10.7 or 10.8 with
+         # a bogus path set via xcode-select
+@@ -1510,7 +1517,8 @@ def XcodeVersion():
+         version = version_list[0].split()[-1]  # Last word on first line
+         build = version_list[-1].split()[-1]  # Last word on last line
+     except GypError:  # Xcode not installed so look for XCode Command Line Tools
+-        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
++        #version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322
++        version = "11.0.0.0.1.1567737322"
+         if not version:
+             raise GypError("No Xcode or CLT version detected!")
+     # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":
 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
 +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
 @@ -522,7 +522,13 @@ class XcodeSettings:
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b89fe4853091..cda26e84ab30 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash
-, pkg-config, which, buildPackages
+, ninja, pkgconf, unixtools, runCommand, buildPackages
 , testers
 # for `.pkgs` attribute
 , callPackage
 # Updater dependencies
 , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
 , gnupg
-, darwin, xcbuild
+, darwin
 , installShellFiles
 }:
 
@@ -104,6 +104,20 @@ let
       (name: "${lib.getDev sharedLibDeps.${name}}/include/*")
       (builtins.attrNames sharedLibDeps);
 
+  # Currently stdenv sets CC/LD/AR/etc environment variables to program names
+  # instead of absolute paths. If we add cctools to nativeBuildInputs, that
+  # would shadow stdenv’s bintools and potentially break other parts of the
+  # build. The correct behavior is to use absolute paths, and there is a PR for
+  # that, see https://github.com/NixOS/nixpkgs/pull/314920. As a temporary
+  # workaround, we use only a single program we need (and that is not part of
+  # the stdenv).
+  darwin-cctools-only-libtool =
+    # Would be nice to have onlyExe builder similar to onlyBin…
+    runCommand "darwin-cctools-only-libtool" { cctools = lib.getBin buildPackages.cctools; } ''
+      mkdir -p "$out/bin"
+      ln -s "$cctools/bin/libtool" "$out/bin/libtool"
+    '';
+
   package = stdenv.mkDerivation (finalAttrs:
   let
     /** the final package fixed point, after potential overrides */
@@ -128,11 +142,30 @@ let
     # NB: technically, we do not need bash in build inputs since all scripts are
     # wrappers over the corresponding JS scripts. There are some packages though
     # that use bash wrappers, e.g. polaris-web.
-    buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
+    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]
       ++ [ zlib libuv openssl http-parser icu bash ];
 
-    nativeBuildInputs = [ installShellFiles pkg-config python which ]
-      ++ lib.optionals stdenv.isDarwin [ xcbuild ];
+    nativeBuildInputs =
+      [
+        installShellFiles
+        ninja
+        pkgconf
+        python
+      ]
+      ++ lib.optionals stdenv.buildPlatform.isDarwin [
+        # gyp checks `sysctl -n hw.memsize` if `sys.platform == "darwin"`.
+        unixtools.sysctl
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # For gyp-mac-tool if `flavor == "mac"`.
+        darwin-cctools-only-libtool
+      ];
+
+    # We currently rely on Makefile and stdenv for build phases, so do not let
+    # ninja’s setup hook to override default stdenv phases.
+    dontUseNinjaBuild = true;
+    dontUseNinjaCheck = true;
+    dontUseNinjaInstall = true;
 
     outputs = [ "out" "libv8" ];
     setOutputFlags = false;
@@ -140,6 +173,9 @@ let
 
     configureFlags =
       [
+        "--ninja"
+        "--with-intl=system-icu"
+        "--openssl-use-def-ca-store"
         "--no-cross-compiling"
         "--dest-os=${destOS}"
         "--dest-cpu=${destCPU}"
@@ -167,11 +203,7 @@ let
           FIXME: the statement above is outdated, we have to include pkg-config
           in build inputs for system-icu.
         */
-      ]) (builtins.attrNames sharedLibDeps)
-      ++ [
-        "--with-intl=system-icu"
-        "--openssl-use-def-ca-store"
-      ];
+      ]) (builtins.attrNames sharedLibDeps);
 
     configurePlatforms = [ ];
 
@@ -183,6 +215,12 @@ let
 
     enableParallelBuilding = true;
 
+    makeFlags = [
+      # Tell ninja to avoid ANSI sequences, otherwise we don’t see build
+      # progress in Nix logs.
+      "TERM=dumb"
+    ];
+
     # Don't allow enabling content addressed conversion as `nodejs`
     # checksums it's image before conversion happens and image loading
     # breaks:
@@ -299,7 +337,7 @@ let
 
       # assemble a static v8 library and put it in the 'libv8' output
       mkdir -p $libv8/lib
-      pushd out/Release/obj.target
+      pushd out/Release/obj
       find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files
       $AR -cqs $libv8/lib/libv8.a @files
       popd

From 3cf3f6ae23b0173acaa37bc3ba23031f9a60c0c6 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Wed, 17 Jul 2024 04:57:33 +0300
Subject: [PATCH 012/235] nodejs: allow building for vfpv2

---
 .../web/nodejs/configure-armv6-vfpv2.patch        | 15 +++++++++++++++
 pkgs/development/web/nodejs/nodejs.nix            |  1 +
 pkgs/development/web/nodejs/v18.nix               |  1 +
 pkgs/development/web/nodejs/v20.nix               |  1 +
 pkgs/development/web/nodejs/v22.nix               |  1 +
 5 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/configure-armv6-vfpv2.patch

diff --git a/pkgs/development/web/nodejs/configure-armv6-vfpv2.patch b/pkgs/development/web/nodejs/configure-armv6-vfpv2.patch
new file mode 100644
index 000000000000..0bb7c8160249
--- /dev/null
+++ b/pkgs/development/web/nodejs/configure-armv6-vfpv2.patch
@@ -0,0 +1,15 @@
+Allows ARM FPU to be set to vfpv2, e.g. for Raspberry Pi.
+
+See https://github.com/nodejs/node/issues/44357#issuecomment-1235821878
+
+--- a/configure.py
++++ b/configure.py
+@@ -50,7 +50,7 @@
+ valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
+               'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64')
+ valid_arm_float_abi = ('soft', 'softfp', 'hard')
+-valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
++valid_arm_fpu = ('vfp', 'vfpv2', 'vfpv3', 'vfpv3-d16', 'neon')
+ valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
+ valid_mips_fpu = ('fp32', 'fp64', 'fpxx')
+ valid_mips_float_abi = ('soft', 'hard')
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index cda26e84ab30..dbb7bee53179 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -75,6 +75,7 @@ let
     if platform.isAarch32 && platform ? gcc.fpu then
       lib.throwIfNot (builtins.elem platform.gcc.fpu [
         "vfp"
+        "vfpv2"
         "vfpv3"
         "vfpv3-d16"
         "neon"
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index b69f92d51c3a..e5343b17c0e0 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -27,6 +27,7 @@ buildNodejs {
   sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio=";
   patches = [
     ./configure-emulator-node18.patch
+    ./configure-armv6-vfpv2.patch
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch
     ./revert-arm64-pointer-auth.patch
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index ced82cb0d7ee..e9a769d8911c 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -16,6 +16,7 @@ buildNodejs {
   sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=";
   patches = [
     ./configure-emulator.patch
+    ./configure-armv6-vfpv2.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 58a34f8aff2a..b51e0275af7a 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -16,6 +16,7 @@ buildNodejs {
   sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k=";
   patches = [
     ./configure-emulator.patch
+    ./configure-armv6-vfpv2.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch

From 63930d484ca2c1f351704cbf2e780d1c8ad00417 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 26 Jul 2024 22:15:56 +0100
Subject: [PATCH 013/235] libcamera: 0.3.0 -> 0.3.1

Changes: https://git.libcamera.org/libcamera/libcamera.git/tag/?h=v0.3.1
---
 pkgs/by-name/li/libcamera/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index c6f470c78953..3f713a204b75 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -19,18 +19,18 @@
 , withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust
 , lttng-ust # withTracing
 , withQcam ? false
-, qt5 # withQcam
+, qt6 # withQcam
 , libtiff # withQcam
 }:
 
 stdenv.mkDerivation rec {
   pname = "libcamera";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchgit {
     url = "https://git.libcamera.org/libcamera/libcamera.git";
     rev = "v${version}";
-    hash = "sha256-eCtOtdjpwn0S56ZyRVdG1QCBk1KGPh8YTXD50xev7Bc=";
+    hash = "sha256-vB7dxBDG0y8YvG/2vCgrhyBJmumGG66Vl7yZwprxj5c=";
   };
 
   outputs = [ "out" "dev" ];
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
     gtest
   ] ++ lib.optionals withTracing [ lttng-ust ]
-    ++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ];
+    ++ lib.optionals withQcam [ libtiff qt6.qtbase qt6.qttools ];
 
   nativeBuildInputs = [
     meson
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     graphviz
     doxygen
     openssl
-  ] ++ lib.optional withQcam qt5.wrapQtAppsHook;
+  ] ++ lib.optional withQcam qt6.wrapQtAppsHook;
 
   mesonFlags = [
     "-Dv4l2=true"

From 09fefcd76b2c8ad614f2be71ff60d18690e10a87 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 27 Jul 2024 22:05:22 +0100
Subject: [PATCH 014/235] nftables: 1.0.9 -> 1.1.0

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

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 97518275ced6..f0f62d1763fa 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -10,12 +10,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.9";
+  version = "1.1.0";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz";
-    hash = "sha256-o8MEzZugYSOe4EdPmvuTipu5nYm5YCRvZvDDoKheFM0=";
+    hash = "sha256-7zNzKUiGxbYH7nvoLFaiW8BOdfgC+OitzVWqyR6wqiQ=";
   };
 
   nativeBuildInputs = [

From d7f46fbb5c40e7e9a165adf4f82669ae35c5b055 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Wed, 17 Jul 2024 20:14:57 +0300
Subject: [PATCH 015/235] nodejs: fix tests and disable parallel checking

---
 pkgs/development/web/nodejs/nodejs.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index dbb7bee53179..93421c709c43 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -134,7 +134,14 @@ let
 
     strictDeps = true;
 
-    env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
+    env = {
+      # Tell ninja to avoid ANSI sequences, otherwise we don’t see build
+      # progress in Nix logs.
+      #
+      # Note: do not set TERM=dumb environment variable globally, it is used in
+      # test-ci-js test suite to skip tests that otherwise run fine.
+      NINJA = "TERM=dumb ninja";
+    } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
       # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin.
       # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+.
       NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
@@ -216,12 +223,6 @@ let
 
     enableParallelBuilding = true;
 
-    makeFlags = [
-      # Tell ninja to avoid ANSI sequences, otherwise we don’t see build
-      # progress in Nix logs.
-      "TERM=dumb"
-    ];
-
     # Don't allow enabling content addressed conversion as `nodejs`
     # checksums it's image before conversion happens and image loading
     # breaks:
@@ -246,6 +247,9 @@ let
 
     doCheck = canExecute;
 
+    # See https://github.com/nodejs/node/issues/22006
+    enableParallelChecking = false;
+
     # Some dependencies required for tools/doc/node_modules (and therefore
     # test-addons, jstest and others) target are not included in the tarball.
     # Run test targets that do not require network access.
@@ -260,8 +264,6 @@ let
       # than a year (Node.js 18 will be EOL at 2025-04-30). Note that these
       # failures are specific to Nix sandbox on macOS and should not affect
       # actual functionality.
-    ] ++ lib.optionals (!stdenv.isDarwin) [
-      # TODO: JS test suite is too flaky on Darwin; revisit at a later date.
       "test-ci-js"
     ]);
 

From 010277de84ba988922adf23e8cb1ad3890c5ff62 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 29 Jul 2024 06:45:08 +0800
Subject: [PATCH 016/235] buildGoModule: respect user-specified passthru

Prioritize user-specified passthru arguments over those added by
buildGoModule.
---
 pkgs/build-support/go/module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index afe97d12ea6a..a9c09f4ccbb5 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -307,7 +307,7 @@ let
 
     disallowedReferences = lib.optional (!allowGoReference) go;
 
-    passthru = passthru // { inherit go goModules vendorHash; };
+    passthru = { inherit go goModules vendorHash; } // passthru;
 
     meta = {
       # Add default meta information

From dd0e6df0ff5446523b5a6473077550b978d32662 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 30 Jul 2024 12:50:52 +0100
Subject: [PATCH 017/235] git: 2.45.2 -> 2.46.0

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

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 66122420e9c7..0257cdb00122 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.45.2";
+  version = "2.46.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-Ub/ofrHAL+0UhAUYdTZe6rIpgx0w0M7F2JoU+eQOmts=";
+    hash = "sha256-fxI0YqKLfKPr4mB0hfcWhVTCsQ38FVx+xGMAZmrCf5U=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";

From cdb2f2971c9a94a4fc15cf505015053ddff0ba1a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 14:05:47 +0200
Subject: [PATCH 018/235] stdenv: refactor appendToVar and prependToVar

No need to call declare -p twice. The case statement is easier to read
than the multi-if.
---
 pkgs/stdenv/generic/setup.sh | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 40bf6554183c..8d060493b556 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -280,16 +280,16 @@ prependToVar() {
     fi
 
     # check if variable already exist and if it does then do extra checks
-    if declare -p "$1" 2> /dev/null | grep -q '^'; then
-        type="$(declare -p "$1")"
-        if [[ "$type" =~ "declare -A" ]]; then
-            echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2
-            return 1
-        elif [[ "$type" =~ "declare -a" ]]; then
-            useArray=true
-        else
-            useArray=false
-        fi
+    if type=$(declare -p "$1" 2> /dev/null); then
+        case "${type#* }" in
+            -A*)
+                echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2
+                return 1 ;;
+            -a*)
+                useArray=true ;;
+            *)
+                useArray=false ;;
+        esac
     fi
 
     shift
@@ -313,16 +313,16 @@ appendToVar() {
     fi
 
     # check if variable already exist and if it does then do extra checks
-    if declare -p "$1" 2> /dev/null | grep -q '^'; then
-        type="$(declare -p "$1")"
-        if [[ "$type" =~ "declare -A" ]]; then
-            echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2
-            return 1
-        elif [[ "$type" =~ "declare -a" ]]; then
-            useArray=true
-        else
-            useArray=false
-        fi
+    if type=$(declare -p "$1" 2> /dev/null); then
+        case "${type#* }" in
+            -A*)
+                echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2
+                return 1 ;;
+            -a*)
+                useArray=true ;;
+            *)
+                useArray=false ;;
+        esac
     fi
 
     shift

From 79581b82793b3e1baf5aaa78de34fc09f9164a98 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Thu, 6 Jun 2024 09:30:57 +0300
Subject: [PATCH 019/235] tpm2-tss: remove shadow dependency

Fixes `tpm2-tss (cross-)build on macOS since shadow package is
Linux-specific and therefore cannot be used in nativeBuildInputs.
---
 pkgs/development/libraries/tpm2-tss/default.nix  | 14 ++++++++++++--
 .../libraries/tpm2-tss/no-shadow.patch           | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/tpm2-tss/no-shadow.patch

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index b28d031be83a..6d3a29c28ba7 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl
 , openssl, json_c, curl, libgcrypt
 , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which
-, shadow, libuuid
+, libuuid
 }:
 let
   # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss,
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook autoconf-archive pkg-config doxygen perl
-    shadow
   ];
 
   buildInputs = [
@@ -53,6 +52,17 @@ stdenv.mkDerivation rec {
     # Do not rely on dynamic loader path
     # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory
     ./no-dynamic-loader-path.patch
+
+    # Configure script expects tools from shadow (e.g. useradd) but they are
+    # actually optional (and we can’t use them in Nix sandbox anyway). Make the
+    # check in configure.ac a warning instead of an error so that we can run
+    # configure phase on platforms that don’t have shadow package (e.g. macOS).
+    # Note that *on platforms* does not mean *for platform* i.e. this is for
+    # cross-compilation, tpm2-tss does not support macOS, see upstream issue:
+    # https://github.com/tpm2-software/tpm2-tss/issues/2629
+    # See also
+    # https://github.com/tpm2-software/tpm2-tss/blob/6c46325b466f35d40c2ed1043bfdfcfb8a367a34/Makefile.am#L880-L898
+    ./no-shadow.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/tpm2-tss/no-shadow.patch b/pkgs/development/libraries/tpm2-tss/no-shadow.patch
new file mode 100644
index 000000000000..a42bf06771d0
--- /dev/null
+++ b/pkgs/development/libraries/tpm2-tss/no-shadow.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index e2d579b8..0eac4ff3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -672,9 +672,9 @@ AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"],
+       AC_CHECK_PROG(adduser, adduser, yes)
+       AC_CHECK_PROG(addgroup, addgroup, yes)
+       AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ],
+-         [AC_MSG_ERROR([addgroup or groupadd are needed.])])
++         [AC_MSG_WARN([addgroup or groupadd are needed.])])
+       AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ],
+-         [AC_MSG_ERROR([adduser or useradd are needed.])])])
++         [AC_MSG_WARN([adduser or useradd are needed.])])])
+ 
+ AC_SUBST([PATH])
+ 

From 929db7bc228eac527c80658905e4afaf19765c3e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 2 Aug 2024 21:52:55 +0200
Subject: [PATCH 020/235] tests.stdenv: fix spelling

---
 pkgs/test/stdenv/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 00f1ce90ef3a..72310b74061f 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -74,19 +74,19 @@ let
           declare -p string
 
           declare -A associativeArray=(["X"]="Y")
-          [[ $(appendToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false)
-          [[ $(prependToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false)
+          [[ $(appendToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "appendToVar did not throw appending to associativeArray" && false)
+          [[ $(prependToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not throw prepending associativeArray" && false)
 
           [[ $string == "world testing-string hello" ]] || (echo "'\$string' was not 'world testing-string hello'" && false)
 
           # test appending to a unset variable
           appendToVar nonExistant created hello
-          typeset -p nonExistant
+          declare -p nonExistant
           if [[ -n $__structuredAttrs ]]; then
             [[ "''${nonExistant[@]}" == "created hello" ]]
           else
             # there's a extra " " in front here and a extra " " in the end of prependToVar
-            # shouldn't matter because these functions will mostly be used for $*Flags and the Flag variable will in most cases already exit
+            # shouldn't matter because these functions will mostly be used for $*Flags and the Flag variable will in most cases already exist
             [[ "$nonExistant" == " created hello" ]]
           fi
 

From bfd97a691f165c2a160d5c86a7dbfd89fcbdb33c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 14:06:28 +0200
Subject: [PATCH 021/235] stdenv: make _accumFlagsArray independent of
 structuredAttrs

structuredAttrs was used here to make an assumption about the type of
the named variables passed as arguments.  This can be done better by
looking at the actual types of those variables.

This gives a bit more backwards compatibility as well: Once you turn to
structuredAttrs, you should still be able to pass a bare string instead
of a list and have it behave as a whitespace-separated string like
before.
---
 pkgs/stdenv/generic/setup.sh | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8d060493b556..8255f3aaafb7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -336,34 +336,24 @@ appendToVar() {
 
 # Accumulate into `flagsArray` the flags from the named variables.
 #
-# If __structuredAttrs, the variables are all treated as arrays
-# and simply concatenated onto `flagsArray`.
-#
-# If not __structuredAttrs, then:
-#   * Each variable is treated as a string, and split on whitespace;
-#   * except variables whose names end in "Array", which are treated
-#     as arrays.
+# Arrays are simply concatenated, strings are split on whitespace.
 _accumFlagsArray() {
-    local name
-    if [ -n "$__structuredAttrs" ]; then
-        for name in "$@"; do
+    local name type
+    for name in "$@"; do
+        if type=$(declare -p "$name" 2> /dev/null); then
             local -n nameref="$name"
-            flagsArray+=( ${nameref+"${nameref[@]}"} )
-        done
-    else
-        for name in "$@"; do
-            local -n nameref="$name"
-            case "$name" in
-                *Array)
-                    # shellcheck disable=SC2206
-                    flagsArray+=( ${nameref+"${nameref[@]}"} ) ;;
+            case "${type#* }" in
+                -A*)
+                    echo "_accumFlagsArray(): ERROR: trying to use _accumFlagsArray on an associative array." >&2
+                    return 1 ;;
+                -a*)
+                    flagsArray+=( "${nameref[@]}" ) ;;
                 *)
                     # shellcheck disable=SC2206
                     flagsArray+=( ${nameref-} ) ;;
             esac
-        done
-    fi
-
+        fi
+    done
 }
 
 # Add $1/lib* into rpaths.

From 6bdfef9d2de252bec22a5c4b5859ad578b60b004 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 12:24:21 +0200
Subject: [PATCH 022/235] stdenv: generalize _accumFlagsArray to concatTo

Passing "flagsArray" as the first argument allows using this function
in a few more places.
---
 pkgs/by-name/lo/local-ai/package.nix |  2 +-
 pkgs/by-name/me/meson/setup-hook.sh  |  2 +-
 pkgs/stdenv/generic/setup.sh         | 40 +++++++------------
 pkgs/test/stdenv/default.nix         | 58 ++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 498cc96a454b..56b2ba80bf4a 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -488,7 +488,7 @@ let
         ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
         SHELL=$SHELL
       )
-      _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
+      concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
       echoCmd 'build flags' "''${flagsArray[@]}"
       make build "''${flagsArray[@]}"
       unset flagsArray
diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh
index 826664545227..7ded366d4032 100644
--- a/pkgs/by-name/me/meson/setup-hook.sh
+++ b/pkgs/by-name/me/meson/setup-hook.sh
@@ -25,7 +25,7 @@ mesonConfigurePhase() {
         "--buildtype=${mesonBuildType:-plain}"
     )
 
-    _accumFlagsArray mesonFlags mesonFlagsArray
+    concatTo flagsArray mesonFlags mesonFlagsArray
 
     echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}"
 
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8255f3aaafb7..810d64ba7a21 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -334,23 +334,24 @@ appendToVar() {
     fi
 }
 
-# Accumulate into `flagsArray` the flags from the named variables.
+# Accumulate flags from the named variables $2+ into the indexed array $1.
 #
 # Arrays are simply concatenated, strings are split on whitespace.
-_accumFlagsArray() {
+concatTo() {
+    local -n targetref="$1"; shift
     local name type
     for name in "$@"; do
         if type=$(declare -p "$name" 2> /dev/null); then
             local -n nameref="$name"
             case "${type#* }" in
                 -A*)
-                    echo "_accumFlagsArray(): ERROR: trying to use _accumFlagsArray on an associative array." >&2
+                    echo "concatTo(): ERROR: trying to use concatTo on an associative array." >&2
                     return 1 ;;
                 -a*)
-                    flagsArray+=( "${nameref[@]}" ) ;;
+                    targetref+=( "${nameref[@]}" ) ;;
                 *)
                     # shellcheck disable=SC2206
-                    flagsArray+=( ${nameref-} ) ;;
+                    targetref+=( ${nameref-} ) ;;
             esac
         fi
     done
@@ -1167,12 +1168,7 @@ unpackPhase() {
     fi
 
     local -a srcsArray
-    if [ -n "$__structuredAttrs" ]; then
-        srcsArray=( "${srcs[@]}" )
-    else
-        # shellcheck disable=SC2206
-        srcsArray=( $srcs )
-    fi
+    concatTo srcsArray srcs
 
     # To determine the source directory created by unpacking the
     # source archives, we record the contents of the current
@@ -1237,13 +1233,7 @@ patchPhase() {
     runHook prePatch
 
     local -a patchesArray
-    if [ -n "$__structuredAttrs" ]; then
-        # shellcheck disable=SC2206
-        patchesArray=( ${patches:+"${patches[@]}"} )
-    else
-        # shellcheck disable=SC2206
-        patchesArray=( ${patches:-} )
-    fi
+    concatTo patchesArray patches
 
     for i in "${patchesArray[@]}"; do
         echo "applying patch $i"
@@ -1355,7 +1345,7 @@ configurePhase() {
 
     if [ -n "$configureScript" ]; then
         local -a flagsArray
-        _accumFlagsArray configureFlags configureFlagsArray
+        concatTo flagsArray configureFlags configureFlagsArray
 
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
@@ -1382,7 +1372,7 @@ buildPhase() {
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
             SHELL="$SHELL"
         )
-        _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
+        concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
         echoCmd 'build flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1421,14 +1411,14 @@ checkPhase() {
             SHELL="$SHELL"
         )
 
-        _accumFlagsArray makeFlags makeFlagsArray
+        concatTo flagsArray makeFlags makeFlagsArray
         if [ -n "$__structuredAttrs" ]; then
             flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" )
         else
             # shellcheck disable=SC2206
             flagsArray+=( ${checkFlags:-VERBOSE=y} )
         fi
-        _accumFlagsArray checkFlagsArray
+        concatTo flagsArray checkFlagsArray
         # shellcheck disable=SC2206
         flagsArray+=( ${checkTarget} )
 
@@ -1463,7 +1453,7 @@ installPhase() {
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
         SHELL="$SHELL"
     )
-    _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
     if [ -n "$__structuredAttrs" ]; then
         flagsArray+=( "${installTargets[@]:-install}" )
     else
@@ -1552,7 +1542,7 @@ installCheckPhase() {
             SHELL="$SHELL"
         )
 
-        _accumFlagsArray makeFlags makeFlagsArray \
+        concatTo flagsArray makeFlags makeFlagsArray \
           installCheckFlags installCheckFlagsArray
         # shellcheck disable=SC2206
         flagsArray+=( ${installCheckTarget:-installcheck} )
@@ -1570,7 +1560,7 @@ distPhase() {
     runHook preDist
 
     local flagsArray=()
-    _accumFlagsArray distFlags distFlagsArray
+    concatTo flagsArray distFlags distFlagsArray
     # shellcheck disable=SC2206
     flagsArray+=( ${distTarget:-dist} )
 
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 72310b74061f..996087ae32be 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -96,6 +96,41 @@ let
         '';
       } // extraAttrs);
 
+  testConcatTo = { name, stdenv', extraAttrs ? { } }:
+    stdenv'.mkDerivation
+      ({
+        inherit name;
+
+        string = "a b";
+        list = ["c" "d"];
+
+        passAsFile = [ "buildCommand" ] ++ lib.optionals (extraAttrs ? extraTest) [ "extraTest" ];
+        buildCommand = ''
+          declare -A associativeArray=(["X"]="Y")
+          [[ $(concatTo nowhere associativeArray 2>&1) =~ "trying to use" ]] || (echo "concatTo did not throw concatenating associativeArray" && false)
+
+          declare -a flagsArray
+          concatTo flagsArray string list
+          declare -p flagsArray
+          [[ "''${flagsArray[0]}" == "a" ]] || (echo "'\$flagsArray[0]' was not 'a'" && false)
+          [[ "''${flagsArray[1]}" == "b" ]] || (echo "'\$flagsArray[1]' was not 'b'" && false)
+          [[ "''${flagsArray[2]}" == "c" ]] || (echo "'\$flagsArray[2]' was not 'c'" && false)
+          [[ "''${flagsArray[3]}" == "d" ]] || (echo "'\$flagsArray[3]' was not 'd'" && false)
+
+          # test concatenating to unset variable
+          concatTo nonExistant string list
+          declare -p nonExistant
+          [[ "''${nonExistant[0]}" == "a" ]] || (echo "'\$nonExistant[0]' was not 'a'" && false)
+          [[ "''${nonExistant[1]}" == "b" ]] || (echo "'\$nonExistant[1]' was not 'b'" && false)
+          [[ "''${nonExistant[2]}" == "c" ]] || (echo "'\$nonExistant[2]' was not 'c'" && false)
+          [[ "''${nonExistant[3]}" == "d" ]] || (echo "'\$nonExistant[3]' was not 'd'" && false)
+
+          eval "$extraTest"
+
+          touch $out
+        '';
+      } // extraAttrs);
+
 in
 
 {
@@ -196,6 +231,11 @@ in
     stdenv' = bootStdenv;
   };
 
+  test-concat-to = testConcatTo {
+    name = "test-concat-to";
+    stdenv' = bootStdenv;
+  };
+
   test-structured-env-attrset = testEnvAttrset {
     name = "test-structured-env-attrset";
     stdenv' = bootStdenv;
@@ -255,6 +295,24 @@ in
       };
     };
 
+    test-concat-to = testConcatTo {
+      name = "test-concat-to-structuredAttrsByDefault";
+      stdenv' = bootStdenvStructuredAttrsByDefault;
+      extraAttrs = {
+        # test that whitespace is kept in the bash array for structuredAttrs
+        listWithSpaces = [ "c c" "d d" ];
+        extraTest = ''
+          declare -a flagsWithSpaces
+          concatTo flagsWithSpaces string listWithSpaces
+          declare -p flagsWithSpaces
+          [[ "''${flagsWithSpaces[0]}" == "a" ]] || (echo "'\$flagsWithSpaces[0]' was not 'a'" && false)
+          [[ "''${flagsWithSpaces[1]}" == "b" ]] || (echo "'\$flagsWithSpaces[1]' was not 'b'" && false)
+          [[ "''${flagsWithSpaces[2]}" == "c c" ]] || (echo "'\$flagsWithSpaces[2]' was not 'c c'" && false)
+          [[ "''${flagsWithSpaces[3]}" == "d d" ]] || (echo "'\$flagsWithSpaces[3]' was not 'd d'" && false)
+        '';
+      };
+    };
+
     test-golden-example-structuredAttrs =
       let
         goldenSh = earlyPkgs.writeText "goldenSh" ''

From 8cb51ec38e4579b62ee26d31bcdcdbc61f37f42d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 12:45:57 +0200
Subject: [PATCH 023/235] stdenv: refactor default flags without
 __structuredAttrs use

Instead of checking for __structuredAttrs everywhere, it's easier to
just set the default value via parameter expansion and then hand the
array construction off to "concatTo".

Once more setup-hooks will be made structuredAttrs-aware, this pattern
will reduce the use of this implementation detail even more.
---
 pkgs/stdenv/generic/setup.sh | 40 ++++++++++--------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 810d64ba7a21..ee894a260df9 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1254,12 +1254,8 @@ patchPhase() {
         esac
 
         local -a flagsArray
-        if [ -n "$__structuredAttrs" ]; then
-            flagsArray=( "${patchFlags[@]:--p1}" )
-        else
-            # shellcheck disable=SC2086,SC2206
-            flagsArray=( ${patchFlags:--p1} )
-        fi
+        : "${patchFlags:=-p1}"
+        concatTo flagsArray patchFlags
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
         # shellcheck disable=SC2086
         $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}"
@@ -1411,16 +1407,8 @@ checkPhase() {
             SHELL="$SHELL"
         )
 
-        concatTo flagsArray makeFlags makeFlagsArray
-        if [ -n "$__structuredAttrs" ]; then
-            flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" )
-        else
-            # shellcheck disable=SC2206
-            flagsArray+=( ${checkFlags:-VERBOSE=y} )
-        fi
-        concatTo flagsArray checkFlagsArray
-        # shellcheck disable=SC2206
-        flagsArray+=( ${checkTarget} )
+        : "${checkFlags:=VERBOSE=y}"
+        concatTo flagsArray makeFlags makeFlagsArray checkFlags checkFlagsArray checkTarget
 
         echoCmd 'check flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1453,13 +1441,9 @@ installPhase() {
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
         SHELL="$SHELL"
     )
-    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
-    if [ -n "$__structuredAttrs" ]; then
-        flagsArray+=( "${installTargets[@]:-install}" )
-    else
-        # shellcheck disable=SC2206
-        flagsArray+=( ${installTargets:-install} )
-    fi
+
+    : "${installTargets:=install}"
+    concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets
 
     echoCmd 'install flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1542,10 +1526,9 @@ installCheckPhase() {
             SHELL="$SHELL"
         )
 
+        : "${installCheckTarget:=installcheck}"
         concatTo flagsArray makeFlags makeFlagsArray \
-          installCheckFlags installCheckFlagsArray
-        # shellcheck disable=SC2206
-        flagsArray+=( ${installCheckTarget:-installcheck} )
+          installCheckFlags installCheckFlagsArray installCheckTarget
 
         echoCmd 'installcheck flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -1560,9 +1543,8 @@ distPhase() {
     runHook preDist
 
     local flagsArray=()
-    concatTo flagsArray distFlags distFlagsArray
-    # shellcheck disable=SC2206
-    flagsArray+=( ${distTarget:-dist} )
+    : "${distTarget:=dist}"
+    concatTo flagsArray distFlags distFlagsArray distTarget
 
     echo 'dist flags: %q' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"

From 471cbdd062bceda5a9761f65f0dddffbd72683db Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 12 Jun 2024 21:14:27 +0200
Subject: [PATCH 024/235] stdenv: add concatStringsSep helper

This can be used to separate lists for example with commas, when
creating argument strings. This works with both structuredAttrs disabled
and enabled.
---
 pkgs/stdenv/generic/setup.sh | 30 ++++++++++++++++++++++++++++++
 pkgs/test/stdenv/default.nix | 31 +++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ee894a260df9..7666360fb7bb 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -357,6 +357,36 @@ concatTo() {
     done
 }
 
+# Concatenate a list of strings ($2) with a separator ($1) between each element.
+# The list can be an indexed array of strings or a single string. A single string
+# is split on spaces and then concatenated with the separator.
+#
+# $ flags="lorem ipsum dolor sit amet"
+# $ concatStringsSep ";" flags
+# lorem;ipsum;dolor;sit;amet
+#
+# $ flags=("lorem ipsum" "dolor" "sit amet")
+# $ concatStringsSep ";" flags
+# lorem ipsum;dolor;sit amet
+concatStringsSep() {
+    local sep="$1"
+    local name="$2"
+    local type oldifs
+    if type=$(declare -p "$name" 2> /dev/null); then
+        local -n nameref="$name"
+        case "${type#* }" in
+            -A*)
+                echo "concatStringsSep(): ERROR: trying to use concatStringsSep on an associative array." >&2
+                return 1 ;;
+            -a*)
+                local IFS="$sep"
+                echo -n "${nameref[*]}" ;;
+            *)
+                echo -n "${nameref// /${sep}}" ;;
+        esac
+    fi
+}
+
 # Add $1/lib* into rpaths.
 # The function is used in multiple-outputs.sh hook,
 # so it is defined here but tried after the hook.
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 996087ae32be..a6885d65cea8 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -131,6 +131,27 @@ let
         '';
       } // extraAttrs);
 
+  testConcatStringsSep = { name, stdenv' }:
+    stdenv'.mkDerivation
+      {
+        inherit name;
+
+        passAsFile = [ "buildCommand" ];
+        buildCommand = ''
+          declare -A associativeArray=(["X"]="Y")
+          [[ $(concatStringsSep ";" associativeArray 2>&1) =~ "trying to use" ]] || (echo "concatStringsSep did not throw concatenating associativeArray" && false)
+
+          string="lorem ipsum dolor sit amet"
+          stringWithSep="$(concatStringsSep ";" string)"
+          [[ "$stringWithSep" == "lorem;ipsum;dolor;sit;amet" ]] || (echo "'\$stringWithSep' was not 'lorem;ipsum;dolor;sit;amet'" && false)
+
+          array=("lorem ipsum" "dolor" "sit amet")
+          arrayWithSep="$(concatStringsSep ";" array)"
+          [[ "$arrayWithSep" == "lorem ipsum;dolor;sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum;dolor;sit amet'" && false)
+
+          touch $out
+        '';
+      };
 in
 
 {
@@ -236,6 +257,11 @@ in
     stdenv' = bootStdenv;
   };
 
+  test-concat-strings-sep = testConcatStringsSep {
+    name = "test-concat-strings-sep";
+    stdenv' = bootStdenv;
+  };
+
   test-structured-env-attrset = testEnvAttrset {
     name = "test-structured-env-attrset";
     stdenv' = bootStdenv;
@@ -313,6 +339,11 @@ in
       };
     };
 
+    test-concat-strings-sep = testConcatStringsSep {
+      name = "test-concat-strings-sep-structuredAttrsByDefault";
+      stdenv' = bootStdenvStructuredAttrsByDefault;
+    };
+
     test-golden-example-structuredAttrs =
       let
         goldenSh = earlyPkgs.writeText "goldenSh" ''

From afc35531ae9f2f5bbf9ea4064999f99021360b8b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:23 +0200
Subject: [PATCH 025/235] bonnmotion: remove hardcoded /build

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

diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/development/tools/misc/bonnmotion/default.nix
index 0c3406c785eb..dc77da6d7e18 100644
--- a/pkgs/development/tools/misc/bonnmotion/default.nix
+++ b/pkgs/development/tools/misc/bonnmotion/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp ./bin/bm $out/bin/
 
     substituteInPlace $out/bin/bm \
-      --replace /build/source $out/share/bonnmotion
+      --replace-fail "$PWD" $out/share/bonnmotion
 
     runHook postInstall
   '';

From a4eeebb0f6d762396a7a8352532a90512e2a6fa1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:23 +0200
Subject: [PATCH 026/235] dictu: remove hardcoded /build

---
 pkgs/development/compilers/dictu/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix
index 5bce969edb8b..b58d86871374 100644
--- a/pkgs/development/compilers/dictu/default.nix
+++ b/pkgs/development/compilers/dictu/default.nix
@@ -47,16 +47,19 @@ stdenv.mkDerivation rec {
     "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
   ];
 
+  postBuild = ''
+    cd .. # move out of cmakeBuildDir
+  '';
+
   doCheck = cliSupport;
 
   preCheck = ''
-    cd ..
     sed -i tests/runTests.du \
         -e '/http/d'
     sed -i tests/path/realpath.du \
         -e 's/usr/build/g'
     sed -i tests/path/isDir.du \
-        -e 's,/usr/bin,/build/source,' \
+        -e "s,/usr/bin,$PWD," \
         -e '/home/d'
   '';
 
@@ -67,11 +70,11 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -r /build/source/src/include $out/include
+    cp -r src/include $out/include
     mkdir -p $out/lib
-    cp /build/source/build/src/libdictu_api* $out/lib
+    cp build/src/libdictu_api* $out/lib
   '' + lib.optionalString cliSupport ''
-    install -Dm755 /build/source/dictu $out/bin/dictu
+    install -Dm755 dictu $out/bin/dictu
   '';
 
   meta = with lib; {

From eca98a63015f9d7c217cc38e4ab59c9121ec36a0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:23 +0200
Subject: [PATCH 027/235] home-assistant-component-tests.abode: remove
 hardcoded /build

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

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a57f0d32c4a6..dc6c17f4d514 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -535,7 +535,7 @@ in python.pkgs.buildPythonApplication rec {
   ];
 
   postPatch = ''
-    substituteInPlace tests/test_config.py --replace-fail '"/usr"' '"/build/media"'
+    substituteInPlace tests/test_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\""
 
     substituteInPlace pyproject.toml --replace-fail "wheel~=0.43.0" wheel
 
@@ -665,7 +665,7 @@ in python.pkgs.buildPythonApplication rec {
     export HOME="$TEMPDIR"
 
     # the tests require the existance of a media dir
-    mkdir /build/media
+    mkdir "$NIX_BUILD_TOP"/media
 
     # put ping binary into PATH, e.g. for wake_on_lan tests
     export PATH=${inetutils}/bin:$PATH

From 692e4c9207c60e326722016857ed85eccf9a602e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:42 +0200
Subject: [PATCH 028/235] hydrapaper: remove hardcoded /build

---
 pkgs/by-name/hy/hydrapaper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hydrapaper/package.nix b/pkgs/by-name/hy/hydrapaper/package.nix
index 313a9ed4b829..ca638091fb3c 100644
--- a/pkgs/by-name/hy/hydrapaper/package.nix
+++ b/pkgs/by-name/hy/hydrapaper/package.nix
@@ -52,8 +52,8 @@ python3Packages.buildPythonApplication rec {
   ];
 
   # wrapGAppsHook4 propogates gtk4 -- which provides gtk4-update-icon-cache instead
-  preInstall = ''
-    substituteInPlace /build/source/meson_post_install.py \
+  postPatch = ''
+    substituteInPlace meson_post_install.py \
       --replace-fail gtk-update-icon-cache gtk4-update-icon-cache
   '';
 

From 211b0f55b63ed4bf6fea89f4b4a6fff043b0cc4c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:42 +0200
Subject: [PATCH 029/235] kodiPackages.jellycon: remove hardcoded /build

---
 pkgs/applications/video/kodi/addons/jellycon/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix
index d618e58cee37..960a8603e361 100644
--- a/pkgs/applications/video/kodi/addons/jellycon/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix
@@ -29,7 +29,7 @@ buildKodiAddon rec {
   '';
 
   postInstall = ''
-    mv /build/source/addon.xml $out${addonDir}/${namespace}/
+    cp -v addon.xml $out${addonDir}/$namespace/
   '';
 
   propagatedBuildInputs = [

From 61242375c1ff6b5df5faeef26f4e625269d69481 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:42 +0200
Subject: [PATCH 030/235] kodiPackages.jellyfin: remove hardcoded /build

---
 pkgs/applications/video/kodi/addons/jellyfin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index 024f0f7d9fdc..2c302561bb7a 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -36,7 +36,7 @@ buildKodiAddon rec {
   '';
 
   postInstall = ''
-    mv /build/source/addon.xml $out${addonDir}/${namespace}/
+    cp -v addon.xml $out${addonDir}/$namespace/
   '';
 
   propagatedBuildInputs = [

From 8a29b0a2559d55fcf558ab67d1a9bac691882fdc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:42 +0200
Subject: [PATCH 031/235] lc0: remove hardcoded /build

---
 pkgs/by-name/lc/lc0/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix
index df4a59346f66..9143ef1025d7 100644
--- a/pkgs/by-name/lc/lc0/package.nix
+++ b/pkgs/by-name/lc/lc0/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     runHook prePatch
 
-    patchShebangs --build /build/source/scripts/*
+    patchShebangs --build scripts/*
 
     runHook postPatch
   '';

From 2bec472be92021842423c3e55118d6b13b9f411b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:43 +0200
Subject: [PATCH 032/235] python311Packages.naked: remove hardcoded /build

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

diff --git a/pkgs/development/python-modules/naked/default.nix b/pkgs/development/python-modules/naked/default.nix
index 9c0c35b0b0e7..adabd6c6f5aa 100644
--- a/pkgs/development/python-modules/naked/default.nix
+++ b/pkgs/development/python-modules/naked/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  python,
   fetchFromGitHub,
   lib,
   requests,
@@ -25,8 +26,10 @@ buildPythonPackage rec {
 
   postPatch = ''
     # fix hardcoded absolute paths
-    substituteInPlace **/*.* \
-      --replace /Users/ces/Desktop/code/naked /build/source
+    substituteInPlace tests/test_SYSTEM*.py \
+      --replace-fail /Users/ces/Desktop/code/naked/tests/ "$PWD"/tests/
+    substituteInPlace lib/Naked/toolshed/c/*.c \
+      --replace-fail /Users/ces/Desktop/code/naked/lib/ $out/${python.sitePackages}/
   '';
 
   nativeBuildInputs = [

From 51a8c236fee9caac68eb80b4f0d8f244696658bf Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:44 +0200
Subject: [PATCH 033/235] python311Packages.openai-triton-cuda: remove
 hardcoded /build

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

diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 771f57f77535..98585b850e91 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -178,7 +178,7 @@ buildPythonPackage rec {
 
   preCheck = ''
     # build/temp* refers to build_ext.build_temp (looked up in the build logs)
-    (cd /build/source/python/build/temp* ; ctest)
+    (cd ./build/temp* ; ctest)
 
     # For pytestCheckHook
     cd test/unit

From 58df299b0de456c0019c3fd465eca1556f2045fe Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 Aug 2024 22:59:45 +0200
Subject: [PATCH 034/235] swaysettings: remove hardcoded /build

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

diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix
index 5b13954c63f3..419695d2e7d8 100644
--- a/pkgs/applications/misc/swaysettings/default.nix
+++ b/pkgs/applications/misc/swaysettings/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs /build/source/build-aux/meson/postinstall.py
+    patchShebangs build-aux/meson/postinstall.py
   '';
 
   meta = with lib; {

From 9dddba492ed60eeaa3c7dbde8f06e361fbfa2989 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 2 Aug 2024 00:55:17 +0100
Subject: [PATCH 035/235] chromaprint: add patch for FFmpeg 7

This builds successfully with FFmpeg 7 and so do the various full
FFmpeg builds that depend on it. Not tested beyond that as the number
of rebuilds is of course very large.
---
 pkgs/development/libraries/chromaprint/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index bc53e2257f12..934a4b04a96b 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -2,8 +2,10 @@
 , stdenv
 , fetchurl
 , fetchpatch
+, fetchpatch2
 , cmake
-, ffmpeg_6
+, ninja
+, ffmpeg_7
 , darwin
 , zlib
 }:
@@ -31,11 +33,16 @@ stdenv.mkDerivation rec {
       url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch";
       hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY=";
     })
+    # Fix for FFmpeg 7
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/chromaprint/-/raw/74ae4c7faea2114f2d70a57755f714e348476d28/ffmpeg-7.patch";
+      hash = "sha256-io+dzhDNlz+2hWhNfsyePKLQjiUvSzbv10lHVKumTEk=";
+    })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja ];
 
-  buildInputs = [ ffmpeg_6 ] ++ lib.optionals stdenv.isDarwin
+  buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]);
 
   cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];

From 55933d9bf6e62232eb48cbf08620f22cb7658b61 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 18:42:23 +0200
Subject: [PATCH 036/235] meson: support structuredAttrs in setup hook

Tested emilua with and without __structuredAttrs.
---
 pkgs/by-name/me/meson/setup-hook.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh
index 7ded366d4032..0757d06e889d 100644
--- a/pkgs/by-name/me/meson/setup-hook.sh
+++ b/pkgs/by-name/me/meson/setup-hook.sh
@@ -50,7 +50,8 @@ mesonConfigurePhase() {
 mesonCheckPhase() {
     runHook preCheck
 
-    local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}")
+    local flagsArray=()
+    concatTo flagsArray mesonCheckFlags mesonCheckFlagsArray
 
     echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
     meson test --no-rebuild --print-errorlogs "${flagsArray[@]}"
@@ -64,12 +65,9 @@ mesonInstallPhase() {
     local flagsArray=()
 
     if [[ -n "$mesonInstallTags" ]]; then
-        flagsArray+=("--tags" "${mesonInstallTags// /,}")
+        flagsArray+=("--tags" "$(concatStringsSep "," mesonInstallTags)")
     fi
-    flagsArray+=(
-        $mesonInstallFlags
-        "${mesonInstallFlagsArray[@]}"
-    )
+    concatTo flagsArray mesonInstallFlags mesonInstallFlagsArray
 
     echoCmd 'mesonInstallPhase flags' "${flagsArray[@]}"
     meson install --no-rebuild "${flagsArray[@]}"

From 7c732de6e3b35497f14a70888fe48b492f0f3cac Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 20:34:20 +0200
Subject: [PATCH 037/235] meson: remove unused crossMesonFlags from setup hook

This was used in ##35666 to add the --cross-file argument, but #86080
moved that somewhere else - leaving crossMesonFlags unused.
---
 pkgs/by-name/me/meson/setup-hook.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh
index 0757d06e889d..55ea8b5c1d97 100644
--- a/pkgs/by-name/me/meson/setup-hook.sh
+++ b/pkgs/by-name/me/meson/setup-hook.sh
@@ -21,7 +21,6 @@ mesonConfigurePhase() {
         "--localedir=${!outputLib}/share/locale"
         "-Dauto_features=${mesonAutoFeatures:-enabled}"
         "-Dwrap_mode=${mesonWrapMode:-nodownload}"
-        ${crossMesonFlags}
         "--buildtype=${mesonBuildType:-plain}"
     )
 

From 7752cea66c18f1651a14b4a64074188b142d3a6c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 19:03:17 +0200
Subject: [PATCH 038/235] ninja: support structuredAttrs in setup hook

Tested clasp-common-lisp with and without __structuredAttrs.
---
 pkgs/by-name/ni/ninja/setup-hook.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh
index 7fa5e4675f39..6607082b43f3 100644
--- a/pkgs/by-name/ni/ninja/setup-hook.sh
+++ b/pkgs/by-name/ni/ninja/setup-hook.sh
@@ -10,8 +10,8 @@ ninjaBuildPhase() {
 
     local flagsArray=(
         -j$buildCores
-        $ninjaFlags "${ninjaFlagsArray[@]}"
     )
+    concatTo flagsArray ninjaFlags ninjaFlagsArray
 
     echoCmd 'build flags' "${flagsArray[@]}"
     TERM=dumb ninja "${flagsArray[@]}"
@@ -39,9 +39,8 @@ ninjaCheckPhase() {
 
         local flagsArray=(
             -j$buildCores
-            $ninjaFlags "${ninjaFlagsArray[@]}"
-            $checkTarget
         )
+        concatTo flagsArray ninjaFlags ninjaFlagsArray checkTarget
 
         echoCmd 'check flags' "${flagsArray[@]}"
         TERM=dumb ninja "${flagsArray[@]}"
@@ -63,9 +62,9 @@ ninjaInstallPhase() {
     # shellcheck disable=SC2086
     local flagsArray=(
         -j$buildCores
-        $ninjaFlags "${ninjaFlagsArray[@]}"
-        ${installTargets:-install}
     )
+    : ${installTargets:=install}
+    concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets
 
     echoCmd 'install flags' "${flagsArray[@]}"
     TERM=dumb ninja "${flagsArray[@]}"

From 4b45acf52990ba892151928070d385657ebd51b9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 20:59:56 +0200
Subject: [PATCH 039/235] ninja: shellcheck setup hook

---
 pkgs/by-name/ni/ninja/setup-hook.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh
index 6607082b43f3..4f3bc5b5acfa 100644
--- a/pkgs/by-name/ni/ninja/setup-hook.sh
+++ b/pkgs/by-name/ni/ninja/setup-hook.sh
@@ -1,3 +1,5 @@
+# shellcheck shell=bash
+
 ninjaBuildPhase() {
     runHook preBuild
 
@@ -9,7 +11,7 @@ ninjaBuildPhase() {
     fi
 
     local flagsArray=(
-        -j$buildCores
+        "-j$buildCores"
     )
     concatTo flagsArray ninjaFlags ninjaFlagsArray
 
@@ -24,7 +26,7 @@ ninjaCheckPhase() {
 
     if [ -z "${checkTarget:-}" ]; then
         if ninja -t query test >/dev/null 2>&1; then
-            checkTarget=test
+            checkTarget="test"
         fi
     fi
 
@@ -38,7 +40,7 @@ ninjaCheckPhase() {
         fi
 
         local flagsArray=(
-            -j$buildCores
+            "-j$buildCores"
         )
         concatTo flagsArray ninjaFlags ninjaFlagsArray checkTarget
 
@@ -61,9 +63,9 @@ ninjaInstallPhase() {
 
     # shellcheck disable=SC2086
     local flagsArray=(
-        -j$buildCores
+        "-j$buildCores"
     )
-    : ${installTargets:=install}
+    : "${installTargets:=install}"
     concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets
 
     echoCmd 'install flags' "${flagsArray[@]}"
@@ -72,14 +74,14 @@ ninjaInstallPhase() {
     runHook postInstall
 }
 
-if [ -z "${dontUseNinjaBuild-}" -a -z "${buildPhase-}" ]; then
+if [ -z "${dontUseNinjaBuild-}" ] && [ -z "${buildPhase-}" ]; then
     buildPhase=ninjaBuildPhase
 fi
 
-if [ -z "${dontUseNinjaCheck-}" -a -z "${checkPhase-}" ]; then
+if [ -z "${dontUseNinjaCheck-}" ] && [ -z "${checkPhase-}" ]; then
     checkPhase=ninjaCheckPhase
 fi
 
-if [ -z "${dontUseNinjaInstall-}" -a -z "${installPhase-}" ]; then
+if [ -z "${dontUseNinjaInstall-}" ] && [ -z "${installPhase-}" ]; then
     installPhase=ninjaInstallPhase
 fi

From 34a2b7ae9f77ca1c39b871b1165c0aec44928227 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 9 Jun 2024 21:19:26 +0200
Subject: [PATCH 040/235] cmake: support structuredAttrs in setup hook

Tested litehtml with and without __structuredAttrs.

Resolves #289037
Supersedes #299622 (at least parts)
---
 pkgs/by-name/cm/cmake/setup-hook.sh | 59 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 9ca4a6abeebc..7ceb24227857 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -38,7 +38,7 @@ cmakeConfigurePhase() {
     fi
 
     if [ -z "${dontAddPrefix-}" ]; then
-        cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
+        prependToVar cmakeFlags "-DCMAKE_INSTALL_PREFIX=$prefix"
     fi
 
     # We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -47,21 +47,21 @@ cmakeConfigurePhase() {
     # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
     # strip. Otherwise they are taken to be relative to the source root of the
     # package being built.
-    cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags"
-    cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags"
-    cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags"
-    cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags"
-    cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_CXX_COMPILER=$CXX"
+    prependToVar cmakeFlags "-DCMAKE_C_COMPILER=$CC"
+    prependToVar cmakeFlags "-DCMAKE_AR=$(command -v $AR)"
+    prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)"
+    prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)"
 
     # on macOS we want to prefer Unix-style headers to Frameworks
     # because we usually do not package the framework
-    cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST"
 
     # we never want to use the global macOS SDK
-    cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_OSX_SYSROOT="
 
     # correctly detect our clang compiler
-    cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
 
     # This installs shared libraries with a fully-specified install
     # name. By default, cmake installs shared libraries with just the
@@ -70,7 +70,7 @@ cmakeConfigurePhase() {
     # libraries are in a system path or in the same directory as the
     # executable. This flag makes the shared library accessible from its
     # nix/store directory.
-    cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib"
 
     # The docdir flag needs to include PROJECT_NAME as per GNU guidelines,
     # try to extract it from CMakeLists.txt.
@@ -93,39 +93,42 @@ cmakeConfigurePhase() {
     # This ensures correct paths with multiple output derivations
     # It requires the project to use variables from GNUInstallDirs module
     # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
-    cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"
+    prependToVar cmakeFlags "-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
 
     # Don’t build tests when doCheck = false
     if [ -z "${doCheck-}" ]; then
-        cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
+        prependToVar cmakeFlags "-DBUILD_TESTING=OFF"
     fi
 
     # Always build Release, to ensure optimisation flags
-    cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release}"
 
     # Disable user package registry to avoid potential side effects
     # and unecessary attempts to access non-existent home folder
     # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry
-    cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
-    cmakeFlags="-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF $cmakeFlags"
-    cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags"
+    prependToVar cmakeFlags "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
+    prependToVar cmakeFlags "-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF"
+    prependToVar cmakeFlags "-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF"
 
     if [ "${buildPhase-}" = ninjaBuildPhase ]; then
-        cmakeFlags="-GNinja $cmakeFlags"
+        prependToVar cmakeFlags "-GNinja"
     fi
 
-    echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
+    local flagsArray=()
+    concatTo flagsArray cmakeFlags cmakeFlagsArray
 
-    cmake "$cmakeDir" $cmakeFlags "${cmakeFlagsArray[@]}"
+    echoCmd 'cmake flags' "${flagsArray[@]}"
+
+    cmake "$cmakeDir" "${flagsArray[@]}"
 
     if ! [[ -v enableParallelBuilding ]]; then
         enableParallelBuilding=1

From d7c257035d5ffc0bf5d70fa85796aa238e4f4a73 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 11 Jun 2024 21:48:29 +0200
Subject: [PATCH 041/235] setup-hooks/autoreconf: support structuredAttrs

Tested db with and without __structuredAttrs.
---
 pkgs/build-support/setup-hooks/autoreconf.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh
index 6ce879ac092d..763ea649c1c4 100644
--- a/pkgs/build-support/setup-hooks/autoreconf.sh
+++ b/pkgs/build-support/setup-hooks/autoreconf.sh
@@ -2,6 +2,11 @@ preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
 
 autoreconfPhase() {
     runHook preAutoreconf
-    autoreconf ${autoreconfFlags:---install --force --verbose}
+
+    local flagsArray=()
+    : "${autoreconfFlags:=--install --force --verbose}"
+    concatTo flagsArray autoreconfFlags
+
+    autoreconf "${flagsArray[@]}"
     runHook postAutoreconf
 }

From 10c5c6b506321e1bb8931245fd6254255762a9b1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 3 Aug 2024 21:33:18 +0100
Subject: [PATCH 042/235] SDL2: 2.30.5 -> 2.30.6

Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.30.6
---
 pkgs/development/libraries/SDL2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 2a6a5864d25e..bfa9574e1720 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -59,13 +59,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2";
-  version = "2.30.5";
+  version = "2.30.6";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-ZonlvXAAWCTfDYf/w5RxP1Av67v89kex4H43xkbPYEA=";
+    hash = "sha256-ij9/VhSacUaPbMGX1hx2nz0n8b1tDb1PnC7IO9TlNhE=";
   };
   dontDisableStatic = if withStatic then 1 else 0;
   outputs = [

From 3b82c96f7e3a872714ef0702cd186f65c28a7a6c Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 26 Jul 2024 02:36:33 +0800
Subject: [PATCH 043/235] emacs: fix name when pname is overridden

Before

nix-repl> (emacs.pkgs.magit.overrideAttrs (old: { pname = old.pname + "-patched"; })).name
"emacs-magit-20240522.204"

After

nix-repl> (emacs.pkgs.magit.overrideAttrs (old: { pname = old.pname + "-patched"; })).name
"emacs-magit-patched-20240522.204"
---
 pkgs/applications/editors/emacs/build-support/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 3b3298cd1468..afccde30f1bf 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -37,7 +37,7 @@ in
 }@args:
 
 stdenv.mkDerivation (finalAttrs: ({
-  name = "emacs-${pname}-${finalAttrs.version}";
+  name = "emacs-${finalAttrs.pname}-${finalAttrs.version}";
 
   unpackCmd = ''
     case "$curSrc" in

From 675dcef30ad23f3b17066c7b11722f581b90798c Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 27 Jul 2024 06:54:08 +0800
Subject: [PATCH 044/235] emacs: remove redundant doCheck from genericBuild

The default value of doCheck is false.
---
 pkgs/applications/editors/emacs/build-support/generic.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index afccde30f1bf..16632e97eca0 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -62,8 +62,6 @@ stdenv.mkDerivation (finalAttrs: ({
 
   inherit setupHook;
 
-  doCheck = false;
-
   meta = {
     broken = false;
     platforms = emacs.meta.platforms;

From cdf4aef5e2ad2c50872f8948656f21df9e8325f4 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 08:46:02 +0800
Subject: [PATCH 045/235] emacs: handle propagatedBuildInputs correctly for
 genericBuild

Without this patch, if there is propagatedBuildInputs in the arguments
of genericBuild, it will override the value set by genericBuild.  With
this patch applied, the argument and the value set by genericBuild are
merged instead.
---
 pkgs/applications/editors/emacs/build-support/generic.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 16632e97eca0..d529d3cf09f9 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -4,7 +4,7 @@
 
 let
   inherit (lib) optionalAttrs;
-  handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
+  handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedBuildInputs" "propagatedUserEnvPkgs" "meta" ]
     ++ lib.optionals (emacs.withNativeCompilation or false) [ "postInstall" ];
 
   setupHook = writeText "setup-hook.sh" ''
@@ -28,6 +28,7 @@ in
 , buildInputs ? []
 , nativeBuildInputs ? []
 , packageRequires ? []
+, propagatedBuildInputs ? []
 , propagatedUserEnvPkgs ? []
 , postInstall ? ""
 , meta ? {}
@@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: ({
 
   buildInputs = packageRequires ++ buildInputs;
   nativeBuildInputs = [ emacs texinfo ] ++ nativeBuildInputs;
-  propagatedBuildInputs = packageRequires;
+  propagatedBuildInputs = packageRequires ++ propagatedBuildInputs;
   propagatedUserEnvPkgs = packageRequires ++ propagatedUserEnvPkgs;
 
   inherit setupHook;

From 84c2e0096d0c365e3f2a81ad8533c5b8910e7a73 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 10:21:18 +0800
Subject: [PATCH 046/235] emacs: stop generating autoload file for trivialBuild

When Emacs starts, package-activate-all finds autoload files and
loads them.  However, the autoload file generated by trivialBuild is
never picked up by package-activate-all.  In other words, this feature
never works.  So let's remove it.
---
 pkgs/applications/editors/emacs/build-support/trivial.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix
index 11c28c0133e4..522dec811865 100644
--- a/pkgs/applications/editors/emacs/build-support/trivial.nix
+++ b/pkgs/applications/editors/emacs/build-support/trivial.nix
@@ -19,7 +19,6 @@ callPackage ./generic.nix envargs ({
     LISPDIR=$out/share/emacs/site-lisp
     install -d $LISPDIR
     install *.el *.elc $LISPDIR
-    emacs --batch -l package --eval "(package-generate-autoloads \"${args.pname}\" \"$LISPDIR\")"
 
     runHook postInstall
   '';

From 37df73d3d8314e6b96cb1ccb7cd91ed796bdfa3a Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 12:27:52 +0800
Subject: [PATCH 047/235] emacs: teach elisp builders the finalAttrs pattern

This commit causes 0 rebuilds.

The performance overhead of eval time is as follows:

|       package set        | before | after | changed |
|--------------------------|--------|-------|---------|
| emacs.pkgs.elpaPackages  |  1.925 | 1.935 | +0.35%  |
| emacs.pkgs.melpaPackages |  8.312 | 8.558 | +3.0%   |

The commands used here are

nix nixpkgs#hyperfine -- --warmup 2 --runs 10 'NIXPKGS_ALLOW_BROKEN=1 nix eval --include nixpkgs=$PWD --file . emacs.pkgs.melpaPackages --apply \'pkgSet: map (drv: drv.drvPath) (builtins.filter (p: p.type or null == "derivation") (builtins.attrValues pkgSet))\' --no-eval-cache >/dev/null'

nix nixpkgs#hyperfine -- --warmup 10 --runs 30 'NIXPKGS_ALLOW_BROKEN=1 nix eval --include nixpkgs=$PWD --file . emacs.pkgs.elpaPackages --apply \'pkgSet: map (drv: drv.drvPath) (builtins.filter (p: p.type or null == "derivation") (builtins.attrValues pkgSet))\' --no-eval-cache >/dev/null'
---
 .../editors/emacs/build-support/elpa.nix      | 13 +++--
 .../editors/emacs/build-support/generic.nix   |  8 ++-
 .../emacs/build-support/lib-build-helper.nix  | 56 +++++++++++++++++++
 .../editors/emacs/build-support/melpa.nix     | 32 ++++++-----
 .../editors/emacs/build-support/trivial.nix   | 20 +++++--
 5 files changed, 103 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs/build-support/lib-build-helper.nix

diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index 7ac8d673346a..c87457ff16d9 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -3,23 +3,26 @@
 { lib, stdenv, emacs, texinfo, writeText }:
 
 let
-  handledArgs = [ "meta" ];
   genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
+  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
 
 in
 
+libBuildHelper.extendMkDerivation { } genericBuild (finalAttrs:
+
 { pname
 , version
 , src
+, dontUnpack ? true
 , meta ? {}
 , ...
 }@args:
 
-genericBuild ({
+{
 
-  dontUnpack = true;
+  inherit dontUnpack;
 
-  installPhase = ''
+  installPhase = args.installPhase or ''
     runHook preInstall
 
     emacs --batch -Q -l ${./elpa2nix.el} \
@@ -34,4 +37,4 @@ genericBuild ({
   } // meta;
 }
 
-// removeAttrs args handledArgs)
+)
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index d529d3cf09f9..914387979fc2 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -21,8 +21,12 @@ let
     fi
   '';
 
+  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+
 in
 
+libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
+
 { pname
 , version
 , buildInputs ? []
@@ -37,7 +41,7 @@ in
 , ...
 }@args:
 
-stdenv.mkDerivation (finalAttrs: ({
+{
   name = "emacs-${finalAttrs.pname}-${finalAttrs.version}";
 
   unpackCmd = ''
@@ -96,4 +100,4 @@ stdenv.mkDerivation (finalAttrs: ({
   '' + postInstall;
 }
 
-// removeAttrs args handledArgs))
+// removeAttrs args handledArgs)
diff --git a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix
new file mode 100644
index 000000000000..7ae7003c9352
--- /dev/null
+++ b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix
@@ -0,0 +1,56 @@
+# stolen from https://github.com/NixOS/nixpkgs/pull/234651
+# TODO switch to functions in that PR once it is merged
+
+{ lib }:
+
+let
+  inherit (lib)
+    setFunctionArgs
+    id
+    functionArgs
+    optionalAttrs
+    toFunction
+    ;
+in
+{
+
+  extendMkDerivation =
+    {
+      modify ? id,
+      inheritFunctionArgs ? true,
+    }:
+    mkDerivationBase: attrsOverlay:
+    setFunctionArgs
+      # Adds the fixed-point style support.
+      (fpargs: modify ((mkDerivationBase fpargs).overrideAttrs attrsOverlay))
+      # Add __functionArgs
+      (
+        # Inherit the __functionArgs from the base build helper
+        functionArgs (attrsOverlay { })
+        # Recover the __functionArgs from the derived build helper
+        // optionalAttrs inheritFunctionArgs (functionArgs mkDerivationBase)
+      )
+    // {
+      # Passthru attributes attached to the result build helper.
+      attrsOverlays = mkDerivationBase.attrsOverlays or [ ] ++ [ attrsOverlay ];
+    };
+
+  adaptMkDerivation =
+    {
+      modify ? id,
+      inheritFunctionArgs ? true,
+    }:
+    mkDerivationBase: adaptArgs:
+    setFunctionArgs
+      # Adds the fixed-point style support
+      (
+        fpargs: modify (mkDerivationBase (finalAttrs: adaptArgs finalAttrs (toFunction fpargs finalAttrs)))
+      )
+      # Add __functionArgs
+      (
+        # Inherit the __functionArgs from the base build helper
+        optionalAttrs inheritFunctionArgs (functionArgs mkDerivationBase)
+        # Recover the __functionArgs from the derived build helper
+        // functionArgs (adaptArgs { })
+      );
+}
diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index 20f7e79eb683..c5adaac76548 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -4,8 +4,8 @@
 { lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }:
 
 let
-  handledArgs = [ "meta" "preUnpack" "postUnpack" ];
   genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
+  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
 
   packageBuild = stdenv.mkDerivation {
     name = "package-build";
@@ -29,6 +29,8 @@ let
 
 in
 
+libBuildHelper.extendMkDerivation { } genericBuild (finalAttrs:
+
 { /*
     pname: Nix package name without special symbols and without version or
     "emacs-" prefix.
@@ -51,7 +53,7 @@ in
     This will be written into the generated package but it is not needed during
     the build process.
   */
-, commit ? (args.src.rev or "unknown")
+, commit ? (finalAttrs.src.rev or "unknown")
   /*
     files: Optional recipe property specifying the files used to build the package.
     If null, do not set it in recipe, keeping the default upstream behaviour.
@@ -62,9 +64,9 @@ in
     recipe: Optional MELPA recipe.
     Default: a minimally functional recipe
   */
-, recipe ? (writeText "${pname}-recipe" ''
-    (${ename} :fetcher git :url ""
-              ${lib.optionalString (files != null) ":files ${files}"})
+, recipe ? (writeText "${finalAttrs.pname}-recipe" ''
+    (${finalAttrs.ename} :fetcher git :url ""
+              ${lib.optionalString (finalAttrs.files or null != null) ":files ${finalAttrs.files}"})
   '')
 , preUnpack ? ""
 , postUnpack ? ""
@@ -72,14 +74,16 @@ in
 , ...
 }@args:
 
-genericBuild ({
+{
 
-  elpa2nix = ./elpa2nix.el;
-  melpa2nix = ./melpa2nix.el;
+  elpa2nix = args.elpa2nix or ./elpa2nix.el;
+  melpa2nix = args.melpa2nix or ./melpa2nix.el;
 
-  inherit packageBuild commit ename recipe;
+  inherit commit ename recipe;
 
-  melpaVersion =
+  packageBuild = args.packageBuild or packageBuild;
+
+  melpaVersion = args.melpaVersion or (
     let
       parsed = lib.flip builtins.match version
         # match <version>-unstable-YYYY-MM-DD format
@@ -90,7 +94,7 @@ genericBuild ({
     in
     if unstableVersionInNixFormat
     then date + "." + time
-    else version;
+    else finalAttrs.version);
 
   preUnpack = ''
     mkdir -p "$NIX_BUILD_TOP/recipes"
@@ -108,7 +112,7 @@ genericBuild ({
     ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
   '' + postUnpack;
 
-  buildPhase = ''
+  buildPhase = args.buildPhase or ''
     runHook preBuild
 
     cd "$NIX_BUILD_TOP"
@@ -122,7 +126,7 @@ genericBuild ({
     runHook postBuild
     '';
 
-  installPhase = ''
+  installPhase = args.installPhase or ''
     runHook preInstall
 
     archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el"
@@ -143,4 +147,4 @@ genericBuild ({
   } // meta;
 }
 
-// removeAttrs args handledArgs)
+)
diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix
index 522dec811865..71606d463a82 100644
--- a/pkgs/applications/editors/emacs/build-support/trivial.nix
+++ b/pkgs/applications/editors/emacs/build-support/trivial.nix
@@ -2,10 +2,20 @@
 
 { callPackage, lib, ... }@envargs:
 
-args:
+let
+  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+in
 
-callPackage ./generic.nix envargs ({
-  buildPhase = ''
+libBuildHelper.extendMkDerivation { } (callPackage ./generic.nix envargs) (finalAttrs:
+
+{ pname
+, version
+, src
+, ...
+}@args:
+
+{
+  buildPhase = args.buildPhase or ''
     runHook preBuild
 
     emacs -L . --batch -f batch-byte-compile *.el
@@ -13,7 +23,7 @@ callPackage ./generic.nix envargs ({
     runHook postBuild
   '';
 
-  installPhase = ''
+  installPhase = args.installPhase or ''
     runHook preInstall
 
     LISPDIR=$out/share/emacs/site-lisp
@@ -24,4 +34,4 @@ callPackage ./generic.nix envargs ({
   '';
 }
 
-// args)
+)

From 5248f6f8ef5bae4f848adf9865ee1cd792707f0e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 4 Aug 2024 08:56:14 +0800
Subject: [PATCH 048/235] emacs: stop vendoring PR #234651

Previously, we vendor PR #234651 because we want to keep the old
behavior of filtering out packageRequires from the arguments we pass
to the underling stdenv.mkDerivation.  Doing so raises the concern
about the complexity of PR #234651.

Considering that passing packageRequires to stdenv.mkDerivation also
works well, we stop filtering it out and stop vendoring PR #234651.

Now, this PR only uses the existing interface of stdenv.mkDerivation.
Even though the name of the build helper is still extendMkDerivation',
it is nothing new and has been used in Nixpkgs, such as
php.buildComposerProject[1].

[1]: https://github.com/NixOS/nixpkgs/blob/f3834de3782b82bfc666abf664f946d0e7d1f116/pkgs/build-support/php/builders/v1/build-composer-project.nix#L108
---
 .../editors/emacs/build-support/elpa.nix      |  4 +-
 .../editors/emacs/build-support/generic.nix   | 23 ++++----
 .../emacs/build-support/lib-build-helper.nix  | 57 +------------------
 .../editors/emacs/build-support/melpa.nix     |  4 +-
 .../editors/emacs/build-support/trivial.nix   |  4 +-
 5 files changed, 20 insertions(+), 72 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index c87457ff16d9..3e40cd6df56b 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -4,11 +4,11 @@
 
 let
   genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
-  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+  libBuildHelper = import ./lib-build-helper.nix;
 
 in
 
-libBuildHelper.extendMkDerivation { } genericBuild (finalAttrs:
+libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
 
 { pname
 , version
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 914387979fc2..a3943dda188c 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -4,8 +4,6 @@
 
 let
   inherit (lib) optionalAttrs;
-  handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedBuildInputs" "propagatedUserEnvPkgs" "meta" ]
-    ++ lib.optionals (emacs.withNativeCompilation or false) [ "postInstall" ];
 
   setupHook = writeText "setup-hook.sh" ''
     source ${./emacs-funcs.sh}
@@ -21,11 +19,11 @@ let
     fi
   '';
 
-  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+  libBuildHelper = import ./lib-build-helper.nix;
 
 in
 
-libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
+libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
 
 { pname
 , version
@@ -42,9 +40,9 @@ libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
 }@args:
 
 {
-  name = "emacs-${finalAttrs.pname}-${finalAttrs.version}";
+  name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}";
 
-  unpackCmd = ''
+  unpackCmd = args.unpackCmd or ''
     case "$curSrc" in
       *.el)
         # keep original source filename without the hash
@@ -60,12 +58,13 @@ libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
     esac
   '';
 
-  buildInputs = packageRequires ++ buildInputs;
+  inherit packageRequires;
+  buildInputs = finalAttrs.packageRequires ++ buildInputs;
   nativeBuildInputs = [ emacs texinfo ] ++ nativeBuildInputs;
-  propagatedBuildInputs = packageRequires ++ propagatedBuildInputs;
-  propagatedUserEnvPkgs = packageRequires ++ propagatedUserEnvPkgs;
+  propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs;
+  propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs;
 
-  inherit setupHook;
+  setupHook = args.setupHook or setupHook;
 
   meta = {
     broken = false;
@@ -77,7 +76,7 @@ libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
 
 // optionalAttrs (emacs.withNativeCompilation or false) {
 
-  addEmacsNativeLoadPath = true;
+  addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true;
 
   inherit turnCompilationWarningToError ignoreCompilationError;
 
@@ -100,4 +99,4 @@ libBuildHelper.adaptMkDerivation { } stdenv.mkDerivation (finalAttrs:
   '' + postInstall;
 }
 
-// removeAttrs args handledArgs)
+)
diff --git a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix
index 7ae7003c9352..23267f592359 100644
--- a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix
+++ b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix
@@ -1,56 +1,5 @@
-# stolen from https://github.com/NixOS/nixpkgs/pull/234651
-# TODO switch to functions in that PR once it is merged
-
-{ lib }:
-
-let
-  inherit (lib)
-    setFunctionArgs
-    id
-    functionArgs
-    optionalAttrs
-    toFunction
-    ;
-in
 {
-
-  extendMkDerivation =
-    {
-      modify ? id,
-      inheritFunctionArgs ? true,
-    }:
-    mkDerivationBase: attrsOverlay:
-    setFunctionArgs
-      # Adds the fixed-point style support.
-      (fpargs: modify ((mkDerivationBase fpargs).overrideAttrs attrsOverlay))
-      # Add __functionArgs
-      (
-        # Inherit the __functionArgs from the base build helper
-        functionArgs (attrsOverlay { })
-        # Recover the __functionArgs from the derived build helper
-        // optionalAttrs inheritFunctionArgs (functionArgs mkDerivationBase)
-      )
-    // {
-      # Passthru attributes attached to the result build helper.
-      attrsOverlays = mkDerivationBase.attrsOverlays or [ ] ++ [ attrsOverlay ];
-    };
-
-  adaptMkDerivation =
-    {
-      modify ? id,
-      inheritFunctionArgs ? true,
-    }:
-    mkDerivationBase: adaptArgs:
-    setFunctionArgs
-      # Adds the fixed-point style support
-      (
-        fpargs: modify (mkDerivationBase (finalAttrs: adaptArgs finalAttrs (toFunction fpargs finalAttrs)))
-      )
-      # Add __functionArgs
-      (
-        # Inherit the __functionArgs from the base build helper
-        optionalAttrs inheritFunctionArgs (functionArgs mkDerivationBase)
-        # Recover the __functionArgs from the derived build helper
-        // functionArgs (adaptArgs { })
-      );
+  extendMkDerivation' =
+    mkDerivationBase: attrsOverlay: fpargs:
+    (mkDerivationBase fpargs).overrideAttrs attrsOverlay;
 }
diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index c5adaac76548..4a22ea195a98 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -5,7 +5,7 @@
 
 let
   genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
-  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+  libBuildHelper = import ./lib-build-helper.nix;
 
   packageBuild = stdenv.mkDerivation {
     name = "package-build";
@@ -29,7 +29,7 @@ let
 
 in
 
-libBuildHelper.extendMkDerivation { } genericBuild (finalAttrs:
+libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
 
 { /*
     pname: Nix package name without special symbols and without version or
diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix
index 71606d463a82..fa3cd2fe5633 100644
--- a/pkgs/applications/editors/emacs/build-support/trivial.nix
+++ b/pkgs/applications/editors/emacs/build-support/trivial.nix
@@ -3,10 +3,10 @@
 { callPackage, lib, ... }@envargs:
 
 let
-  libBuildHelper = import ./lib-build-helper.nix { inherit lib; };
+  libBuildHelper = import ./lib-build-helper.nix;
 in
 
-libBuildHelper.extendMkDerivation { } (callPackage ./generic.nix envargs) (finalAttrs:
+libBuildHelper.extendMkDerivation' (callPackage ./generic.nix envargs) (finalAttrs:
 
 { pname
 , version

From 5805cf21a8b24491b5d50bb4afb6740bbfe129a8 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 4 Aug 2024 09:19:21 +0800
Subject: [PATCH 049/235] emacs: remove unused parameters to make
 nixf-tidy-review bot happy

---
 pkgs/applications/editors/emacs/build-support/elpa.nix    | 2 --
 pkgs/applications/editors/emacs/build-support/generic.nix | 4 +---
 pkgs/applications/editors/emacs/build-support/trivial.nix | 6 +-----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index 3e40cd6df56b..48381c4239eb 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -11,8 +11,6 @@ in
 libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
 
 { pname
-, version
-, src
 , dontUnpack ? true
 , meta ? {}
 , ...
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index a3943dda188c..3ff10ee865fb 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -25,9 +25,7 @@ in
 
 libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs:
 
-{ pname
-, version
-, buildInputs ? []
+{ buildInputs ? []
 , nativeBuildInputs ? []
 , packageRequires ? []
 , propagatedBuildInputs ? []
diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix
index fa3cd2fe5633..2c20b0567c68 100644
--- a/pkgs/applications/editors/emacs/build-support/trivial.nix
+++ b/pkgs/applications/editors/emacs/build-support/trivial.nix
@@ -8,11 +8,7 @@ in
 
 libBuildHelper.extendMkDerivation' (callPackage ./generic.nix envargs) (finalAttrs:
 
-{ pname
-, version
-, src
-, ...
-}@args:
+args:
 
 {
   buildPhase = args.buildPhase or ''

From e64ccec7e762e326a0b8f042762abb5a3b7d53df Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 4 Aug 2024 09:45:09 +0800
Subject: [PATCH 050/235] emacs: make elpa2nix of elpaBuild consistent with
 melpaBuild

---
 pkgs/applications/editors/emacs/build-support/elpa.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index 48381c4239eb..5a8f0ab9e52c 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -18,12 +18,14 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
 
 {
 
+  elpa2nix = args.elpa2nix or ./elpa2nix.el;
+
   inherit dontUnpack;
 
   installPhase = args.installPhase or ''
     runHook preInstall
 
-    emacs --batch -Q -l ${./elpa2nix.el} \
+    emacs --batch -Q -l "$elpa2nix" \
         -f elpa2nix-install-package \
         "$src" "$out/share/emacs/site-lisp/elpa"
 

From bdd77341419276125dbae522fa4a8a16cc895ecf Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 4 Aug 2024 11:22:47 +0800
Subject: [PATCH 051/235] emacs: inherit files in melpaBuild to make nixf-tidy
 CI happy

---
 pkgs/applications/editors/emacs/build-support/melpa.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index 4a22ea195a98..718a0c4d2c1c 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -66,7 +66,7 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
   */
 , recipe ? (writeText "${finalAttrs.pname}-recipe" ''
     (${finalAttrs.ename} :fetcher git :url ""
-              ${lib.optionalString (finalAttrs.files or null != null) ":files ${finalAttrs.files}"})
+              ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"})
   '')
 , preUnpack ? ""
 , postUnpack ? ""
@@ -79,7 +79,7 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs:
   elpa2nix = args.elpa2nix or ./elpa2nix.el;
   melpa2nix = args.melpa2nix or ./melpa2nix.el;
 
-  inherit commit ename recipe;
+  inherit commit ename files recipe;
 
   packageBuild = args.packageBuild or packageBuild;
 

From 3f7abb4eaf794d913faec6c92939e677a0ac2dd3 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 22:09:26 -0500
Subject: [PATCH 052/235] mupdf: 1.23.6 -> 1.24.8

---
 .../0001-Use-command-v-in-favor-of-which.patch      | 13 -------------
 pkgs/applications/misc/mupdf/default.nix            | 12 ++++++------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch

diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
deleted file mode 100644
index 771ad0583528..000000000000
--- a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Use command -v in favor of which
-
---- a/Makerules
-+++ b/Makerules
-@@ -170,7 +170,7 @@
-   ifneq ($(ARCHFLAGS),)
-     $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
-     HAVE_LIBCRYPTO := no
--  else ifeq (, $(shell which pkg-config))
-+  else ifeq (, $(shell command -v pkg-config))
-     $(warning "No pkg-config found, install it for proper integration of libcrypto")
-   else
-     HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 0f2ec9f39f23..c8ca74c59ff1 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -60,16 +60,15 @@ let
 
 in
 stdenv.mkDerivation rec {
-  version = "1.23.6";
+  version = "1.24.8";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck=";
+    sha256 = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg=";
   };
 
-  patches = [ ./0001-Use-command-v-in-favor-of-which.patch
-              ./0002-Add-Darwin-deps.patch
+  patches = [ ./0002-Add-Darwin-deps.patch
               ./0003-Fix-cpp-build.patch
             ];
 
@@ -166,20 +165,21 @@ stdenv.mkDerivation rec {
     EOF
 
     moveToOutput "bin" "$bin"
+    cp ./build/shared-release/libmupdf.so* $out/lib
   '' + (lib.optionalString (stdenv.isDarwin) ''
     for exe in $bin/bin/*; do
       install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe"
     done
   '') + (lib.optionalString (enableX11 || enableGL) ''
     mkdir -p $bin/share/icons/hicolor/48x48/apps
-    cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps
+    cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps
   '') + (if enableGL then ''
     ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
   '' else lib.optionalString (enableX11) ''
     ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
   '') + (lib.optionalString (enableCxx) ''
     cp platform/c++/include/mupdf/*.h $out/include/mupdf
-    cp build/*/libmupdfcpp.so $out/lib
+    cp build/*/libmupdfcpp.so* $out/lib
   '') + (lib.optionalString (enablePython) (''
     mkdir -p $out/${python3.sitePackages}/mupdf
     cp build/*/_mupdf.so $out/${python3.sitePackages}

From 565ef086232bcabf4542c01b0bc7324653b7da65 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 22:10:44 -0500
Subject: [PATCH 053/235] python312Packages.pymupdf: 1.23.6 -> 1.24.8

---
 .../python-modules/pymupdf/default.nix        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index dd3026712a44..5280c2d91255 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "pymupdf";
-  version = "1.23.26";
+  version = "1.24.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -49,15 +49,14 @@ buildPythonPackage rec {
     owner = "pymupdf";
     repo = "PyMuPDF";
     rev = "refs/tags/${version}";
-    hash = "sha256-m2zq04+PDnlzFuqeSt27UhdHXTHxpHdMPIg5RQl/5bQ=";
+    hash = "sha256-NG4ZJYMYTQHiqpnaOz7hxf5UW417UKawe5EqXaBnKJ8=";
   };
 
   # swig is not wrapped as Python package
   # libclang calls itself just clang in wheel metadata
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail '"swig",' "" \
-      --replace-fail "libclang" "clang"
+    substituteInPlace setup.py \
+      --replace-fail "ret.append( 'swig')" "pass" \
   '';
 
   nativeBuildInputs = [
@@ -81,6 +80,8 @@ buildPythonPackage rec {
   env = {
     # force using system MuPDF (must be defined in environment and empty)
     PYMUPDF_SETUP_MUPDF_BUILD = "";
+    # Setup the name of the package away from the default 'libclang'
+    PYMUPDF_SETUP_LIBCLANG = "clang";
     # provide MuPDF paths
     PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib";
     PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include";
@@ -104,6 +105,9 @@ buildPythonPackage rec {
 
   disabledTests =
     [
+      # Fails in release tarballs without .git
+      "test_codespell"
+      "test_pylint"
       # fails for indeterminate reasons
       "test_2548"
       "test_2753"
@@ -140,6 +144,8 @@ buildPythonPackage rec {
       "test_3140"
       "test_3209"
       "test_3209"
+      "test_3301"
+      "test_3347"
       "test_caret"
       "test_deletion"
       "test_file_info"
@@ -153,6 +159,12 @@ buildPythonPackage rec {
       "test_htmlbox"
       "test_2246"
       "test_3140"
+      "test_3400"
+      "test_707560"
+      "test_open"
+      "test_objectstream1"
+      "test_objectstream2"
+      "test_objectstream3"
       "test_fit_springer"
       "test_write_stabilized_with_links"
       "test_textbox"
@@ -173,10 +185,7 @@ buildPythonPackage rec {
     "tests/test_docs_samples.py"
   ];
 
-  pythonImportsCheck = [
-    "fitz"
-    "fitz_old"
-  ];
+  pythonImportsCheck = [ "fitz" ];
 
   meta = with lib; {
     description = "Python bindings for MuPDF's rendering library";

From 5eb832604afb1ae550ac927133be65b7c2f06eb0 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 22:11:35 -0500
Subject: [PATCH 054/235] python312Packages.textual-universal-directorytree:
 1.1.0 -> 1.5.0

---
 .../textual-universal-directorytree/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
index cc574741ecb2..e5355261be25 100644
--- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix
+++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "textual-universal-directorytree";
-  version = "1.1.0";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "juftin";
     repo = "textual-universal-directorytree";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ncQ3IRaZaCv1rMUWT9dkUKo6OAEC5pziMCM7adIBGWo=";
+    hash = "sha256-hUig0aJWSS0FsgRIrs74/uVaQgH6tczJWO5rj6TVOvQ=";
   };
 
   nativeBuildInputs = [ hatchling ];

From fe95d699290779aa33c34cae8f8abb8e530af87d Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 22:12:13 -0500
Subject: [PATCH 055/235] browsr: 1.19.0 -> 1.21.0

---
 pkgs/applications/file-managers/browsr/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix
index 92895378c355..3e93b9508a34 100644
--- a/pkgs/applications/file-managers/browsr/default.nix
+++ b/pkgs/applications/file-managers/browsr/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "browsr";
-  version = "1.19.0";
+  version = "1.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "browsr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-V5B+/zfUlpF0TMTHqzyjapW93/DoJKgbJkTMX2NZyIQ=";
+    hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -56,6 +56,7 @@ python3.pkgs.buildPythonApplication rec {
     "art"
     "pandas"
     "pymupdf"
+    "pyperclip"
     "rich-click"
     "rich-pixels"
     "rich"

From 6c159d50340a3fa28cb28dacdce2b225ddba40e6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 26 Jul 2024 00:54:15 -0700
Subject: [PATCH 056/235] mesa: fix building with llvm

Use glslang's bin output in nativeBuildInputs to prevent propagating the "dev" output which
then injects the glslang libraries for host into target. Switch to using
the spirv-tools package for buildInputs instead of glslang to further
prevent the wrong things from propagating on host since we only need the
pkg-config and static libraries.
---
 pkgs/development/libraries/mesa/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5782ec9fbedf..b1d5b0ad84f9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -10,6 +10,7 @@
 , file
 , flex
 , glslang
+, spirv-tools
 , intltool
 , jdupes
 , libdrm
@@ -226,7 +227,7 @@ in stdenv.mkDerivation {
     directx-headers
     elfutils
     expat
-    glslang
+    spirv-tools
     libglvnd
     libomxil-bellagio
     libunwind
@@ -275,7 +276,9 @@ in stdenv.mkDerivation {
     python3Packages.mako
     python3Packages.ply
     jdupes
-    glslang
+    # Use bin output from glslang to not propagate the dev output at
+    # the build time with the host glslang.
+    (lib.getBin glslang)
     rustc
     rust-bindgen
     rust-cbindgen

From 513074bb9b4d8f5c1f025300a9cbfaeba79efa92 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 Aug 2024 10:02:57 +0300
Subject: [PATCH 057/235] python312Packages.matplotlib: 3.9.0 -> 3.9.1

Changelog: https://github.com/matplotlib/matplotlib/releases/tag/v3.9.1
---
 pkgs/development/python-modules/matplotlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 66436a2d2669..9282fe02f30f 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -89,7 +89,7 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.9.0";
+  version = "3.9.1";
   pname = "matplotlib";
   pyproject = true;
 
@@ -97,7 +97,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5tKepsGeNLMPt9iLcIH4aaAwFPZv4G1izHfVpuqI7Xo=";
+    hash = "sha256-3gaxm425XdM9DcF8kmx8nr7Z9XIHS2+sT2UGimgU0BA=";
   };
 
   patches = lib.optionals stdenv.isDarwin [

From 19eba8feb8f31af052f847fcec52069dba89be8f Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Mon, 5 Aug 2024 20:14:42 +0200
Subject: [PATCH 058/235] ffmpeg_6: 6.1.1 -> 6.1.2

---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/generic.nix | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index f17ef87dd820..22410168f6f1 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -23,8 +23,8 @@ let
   };
 
   v6 = {
-    version = "6.1.1";
-    hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo=";
+    version = "6.1.2";
+    hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ=";
   };
 
   v7 = {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index f89d76453bdb..35098d742816 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -409,11 +409,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
         hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
       })
-      (fetchpatch2 {
-        name = "fix_vulkan_av1";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24";
-        hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg=";
-      })
       (fetchpatch2 {
         name = "CVE-2024-31582.patch";
         url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";

From 2bb8283a53f2dc2cba86bf827f251cd1bec3f8e4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 Aug 2024 23:20:36 +0200
Subject: [PATCH 059/235] python3Packages.gradio: fix pydantic's
 `nativeCheckInputs`.

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

diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index a25d8baa10d3..44ebf7a80365 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -149,7 +149,7 @@ buildPythonPackage rec {
 
     # mock calls to `shutil.which(...)`
     (writeShellScriptBin "npm" "false")
-  ] ++ passthru.optional-dependencies.oauth ++ pydantic.passthru.optional-dependencies.email;
+  ] ++ passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email;
 
   # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).
   # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi.

From 355e6e60d0b1ac5cea6b2d5157cf22e4b31d262a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 6 Aug 2024 22:45:51 +0100
Subject: [PATCH 060/235] pypy27Packages.kserve.dependencies: fix the eval

Without the change the eval fails as:

    $ nix build --no-link -f. pypy27Packages.kserve.dependencies
    error:
       error: attribute 'optional-dependencies' missing
       at pkgs/development/python-modules/kserve/default.nix:88:8:
           87|     uvicorn
           88|   ] ++ ray.passthru.optional-dependencies.serve-deps;
             |        ^
           89|
---
 pkgs/development/python-modules/kserve/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index bb071fc3f0aa..f4aa517c4ef8 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     tabulate
     timing-asgi
     uvicorn
-  ] ++ ray.passthru.optional-dependencies.serve-deps;
+  ] ++ ray.optional-dependencies.serve-deps;
 
   pythonRelaxDeps = [
     "fastapi"

From 41c2a080d04d2af50200be3658fa65548c212889 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 7 Aug 2024 01:01:37 +0200
Subject: [PATCH 061/235] ffmpeg_7: 7.0.1 -> 7.0.2

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

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 22410168f6f1..15785d24b6aa 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -28,8 +28,8 @@ let
   };
 
   v7 = {
-    version = "7.0.1";
-    hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA=";
+    version = "7.0.2";
+    hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
   };
 in
 

From ff0cc8483388b88b37e65c132346049bb043b2f4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 7 Aug 2024 09:04:46 +1000
Subject: [PATCH 062/235] go_1_22: 1.22.5 -> 1.22.6

Changelog: https://go.dev/doc/devel/release#go1.22
---
 pkgs/development/compilers/go/1.22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix
index 447b9815fbe0..5cc070d34e0d 100644
--- a/pkgs/development/compilers/go/1.22.nix
+++ b/pkgs/development/compilers/go/1.22.nix
@@ -47,11 +47,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.22.5";
+  version = "1.22.6";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-rJxyPyJJaa7mJLw0/TTJ4T8qIS11xxyAfeZEu0bhEvY=";
+    hash = "sha256-nkjZnVGYgleZF9gYnBfpjDc84lq667mHcuKScIiZKlE=";
   };
 
   strictDeps = true;

From cb22276cc7e24a3801203b0bd3920b2ae6e55083 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 02:59:50 +0200
Subject: [PATCH 063/235] python312Packages.cffi: 1.16.0 -> 1.17.0

https://github.com/python-cffi/cffi/releases/tag/v1.17.0
---
 .../development/python-modules/cffi/default.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 83c955b3c1c0..199324d0e420 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -21,12 +21,12 @@ if isPyPy then
 else
   buildPythonPackage rec {
     pname = "cffi";
-    version = "1.16.0";
+    version = "1.17.0";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-vLPvQ+WGZbvaL7GYaY/K5ndkg+DEpjGqVkeAbCXgLMA=";
+      hash = "sha256-8xV2JLdVi5FMsDn9Gvc15egEmofIF8whUQmtHId533Y=";
     };
 
     patches =
@@ -42,19 +42,6 @@ else
         # deemed safe to trust in cffi.
         #
         ./darwin-use-libffi-closures.diff
-
-        (fetchpatch2 {
-          # https://github.com/python-cffi/cffi/pull/34
-          name = "python-3.13-compat-1.patch";
-          url = "https://github.com/python-cffi/cffi/commit/49127c6929bfc7186fbfd3819dd5e058ad888de4.patch";
-          hash = "sha256-RbspsjwDf4uwJxMqG0JZGvipd7/JqXJ2uVB7PO4Qcms=";
-        })
-        (fetchpatch2 {
-          # https://github.com/python-cffi/cffi/pull/24
-          name = "python-3.13-compat-2.patch";
-          url = "https://github.com/python-cffi/cffi/commit/14723b0bbd127790c450945099db31018d80fa83.patch";
-          hash = "sha256-H5rFgRRTr27l5S6REo8+7dmPDQW7WXhP4f4DGZjdi+s=";
-        })
       ]
       ++ lib.optionals (stdenv.cc.isClang && (ccVersion == "boot" || lib.versionAtLeast ccVersion "13")) [
         # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests

From b05d5bc8902801044a7d313c92486c1ddd534c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 08:29:04 +0000
Subject: [PATCH 064/235] hwdata: 0.384 -> 0.385

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

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 81cf885dca86..0fd5af8c5da7 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwdata";
-  version = "0.384";
+  version = "0.385";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    hash = "sha256-FuqjvJ0Jtz4hl7fBPXAkz8fGRXkHN8mnZZ3owdzfrnE=";
+    hash = "sha256-IGyERrqlX+VcbDUGykQ8h87uzbOA6DUm6nTZMgYQYKg=";
   };
 
   configureFlags = [ "--datadir=${placeholder "out"}/share" ];

From c55536c53c35746e38fc9ab6040993a795cea9db Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:31:45 +0200
Subject: [PATCH 065/235] makeFontsConf: accept 'includes'

Lets you add pure font configuration without having to copy/paste the
whole generated config.
---
 pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 8 ++++++--
 pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index a03f7446b0ab..ff0d95ba4451 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -4,7 +4,7 @@ let fontconfig_ = fontconfig; in
 {
   fontconfig ? fontconfig_
   # an array of fonts, e.g. `[ pkgs.dejavu_fonts.minimal ]`
-,  fontDirectories
+  ,  fontDirectories
   , impureFontDirectories ? [
     # nix user profile
     "~/.nix-profile/lib/X11/fonts" "~/.nix-profile/share/fonts"
@@ -18,19 +18,23 @@ let fontconfig_ = fontconfig; in
   ++ lib.optionals stdenv.isDarwin [ "/Library/Fonts" "/System/Library/Fonts" ]
   # nix default profile
   ++ [ "/nix/var/nix/profiles/default/lib/X11/fonts" "/nix/var/nix/profiles/default/share/fonts" ]
+
+  # to include custom config
+  , includes ? ["/etc/fonts/conf.d"]
 }:
 
 runCommand "fonts.conf"
   {
     nativeBuildInputs = [ libxslt ];
     buildInputs = [ fontconfig ];
-    inherit fontDirectories;
+    inherit fontDirectories includes;
     # Add a default font for non-nixos systems, <1MB and in nixos defaults.
     impureFontDirectories = impureFontDirectories ++ [ dejavu_fonts.minimal ];
   }
   ''
     xsltproc --stringparam fontDirectories "$fontDirectories" \
       --stringparam impureFontDirectories "$impureFontDirectories" \
+      --stringparam includes "$includes" \
       --path ${fontconfig.out}/share/xml/fontconfig \
       ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \
       > $out
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index d04e4ffab967..aafa9345c87c 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -16,6 +16,7 @@
 
   <xsl:param name="fontDirectories" />
   <xsl:param name="impureFontDirectories" />
+  <xsl:param name="includes" />
 
   <xsl:template match="/fontconfig">
 
@@ -30,8 +31,10 @@
       <xsl:text>&#0010;</xsl:text>
 
       <!-- system-wide config -->
-      <include ignore_missing="yes">/etc/fonts/conf.d</include>
-      <xsl:text>&#0010;</xsl:text>
+      <xsl:for-each select="str:tokenize($includes)">
+        <include ignore_missing="yes"><xsl:value-of select="." /></include>
+        <xsl:text>&#0010;</xsl:text>
+      </xsl:for-each>
 
       <dir prefix="xdg">fonts</dir>
       <xsl:text>&#0010;</xsl:text>

From a6b7762d34248ba7e6f6c18d0371cbd7525a9e39 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 May 2024 00:20:27 +0200
Subject: [PATCH 066/235] python312Packages.platformdirs: refactor

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

diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 977127a694e6..4a91f11da2a2 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -13,18 +13,18 @@
 buildPythonPackage rec {
   pname = "platformdirs";
   version = "4.2.2";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "platformdirs";
+    repo = "platformdirs";
     rev = "refs/tags/${version}";
     hash = "sha256-WsHB+Si8RnJ9b8dYA9m7YRin3UYdJlL1v6/v8SExXtY=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];

From b2c2b557cd94a93d3baa7aa5021a454cdcb2db91 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 7 Aug 2024 19:33:07 +0100
Subject: [PATCH 067/235] SDL2: switch `maintainers` from `cpages` to
 `teams.sdl.members`

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index bfa9574e1720..8ec7ca43bd5c 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${finalAttrs.version}";
     license = licenses.zlib;
     platforms = platforms.all;
-    maintainers = with maintainers; [ cpages ];
+    maintainers = lib.teams.sdl.members;
     pkgConfigModules = [ "sdl2" ];
   };
 })

From 1a03e743f4bcb9f7f9d84f2ba1b2e8b894b7082d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 7 Aug 2024 13:17:20 -0700
Subject: [PATCH 068/235] python312Packages.cython: 3.0.10 -> 3.0.11

Changelog: https://github.com/cython/cython/blob/3.0.11/CHANGES.rst
---
 pkgs/development/python-modules/cython/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 1efad920d344..2d3333ecec6a 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -34,13 +34,13 @@ let
 in
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.0.10";
+  version = "3.0.11";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "Cython";
+    pname = "cython";
     inherit version;
-    hash = "sha256-3MlnOTMfuFTc9QP5RgdXbP6EiAZsYcpQ39VYNvEy3pk=";
+    hash = "sha256-cUbdKvhoK0ymEzGFHmrrzp/lFY51MAND+AwHyoCx+v8=";
   };
 
   build-system = [

From 06666ea69042efeb33c579c23adbf9362ab6c26f Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 4 Aug 2024 16:11:44 +0000
Subject: [PATCH 069/235] python3Packages.fonttools: 4.53.0 -> 4.53.1

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 419124aea28c..f2c01b985f72 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.53.0";
+  version = "4.53.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-eWN5QcdiQIDfjn7Hrqk0f5jMaADpqNa/kExncjcWXFw=";
+    hash = "sha256-9fxC6OKXZkhih3BFyBqO4t6sKXyarYfFIqBk+WOSiRY=";
   };
 
   build-system = [

From 655ba11ce8588f7cb4ea3478ebd54e10f53433ef Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 4 Aug 2024 18:12:24 +0200
Subject: [PATCH 070/235] python3Packages.fonttools: don't use pname in fetcher

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index f2c01b985f72..c57065ec64fb 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -33,8 +33,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "fonttools";
+    repo = "fonttools";
     rev = "refs/tags/${version}";
     hash = "sha256-9fxC6OKXZkhih3BFyBqO4t6sKXyarYfFIqBk+WOSiRY=";
   };

From 8878d8afcd31cfdcd363d323cf3dabaed6929845 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 15:36:12 +0200
Subject: [PATCH 071/235] python312: 3.12.4 -> 3.12.5

https://docs.python.org/release/3.12.5/whatsnew/changelog.html
---
 ...ix-build-with-_PY_SHORT_FLOAT_REPR-0.patch | 53 -------------------
 .../interpreters/python/cpython/default.nix   |  6 +--
 .../interpreters/python/default.nix           |  4 +-
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
deleted file mode 100644
index a978413a676a..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 04bfb877c8ccbd431dcae429abb487c1e3390801 Mon Sep 17 00:00:00 2001
-From: Yureka <yuka@yuka.dev>
-Date: Sun, 30 Jun 2024 09:37:49 +0200
-Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0
-
----
- Include/internal/pycore_dtoa.h | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h
-index 4d9681d59a..899d413b05 100644
---- a/Include/internal/pycore_dtoa.h
-+++ b/Include/internal/pycore_dtoa.h
-@@ -11,8 +11,6 @@ extern "C" {
- #include "pycore_pymath.h"        // _PY_SHORT_FLOAT_REPR
- 
- 
--#if _PY_SHORT_FLOAT_REPR == 1
--
- typedef uint32_t ULong;
- 
- struct
-@@ -22,15 +20,15 @@ Bigint {
-     ULong x[1];
- };
- 
--#ifdef Py_USING_MEMORY_DEBUGGER
-+#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0
- 
- struct _dtoa_state {
-     int _not_used;
- };
--#define _dtoa_interp_state_INIT(INTERP) \
-+#define _dtoa_state_INIT(INTERP) \
-     {0}
- 
--#else  // !Py_USING_MEMORY_DEBUGGER
-+#else  // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0
- 
- /* The size of the Bigint freelist */
- #define Bigint_Kmax 7
-@@ -65,8 +63,6 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits,
-                         int *decpt, int *sign, char **rve);
- PyAPI_FUNC(void) _Py_dg_freedtoa(char *s);
- 
--#endif // _PY_SHORT_FLOAT_REPR == 1
--
- #ifdef __cplusplus
- }
- #endif
--- 
-2.45.1
-
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index dd569db15358..4128edeaa532 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -366,11 +366,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     };
   in [
     "${mingw-patch}/*.patch"
-  ]) ++ optionals isPy312 [
-    # backport fix for various platforms; armv7l, riscv64, s390
-    # https://github.com/python/cpython/pull/121178
-    ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
-  ];
+  ]);
 
   postPatch = optionalString (!stdenv.hostPlatform.isWindows) ''
     substituteInPlace Lib/subprocess.py \
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index eb859dcb958c..63e0c3914aad 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
       sourceVersion = {
         major = "3";
         minor = "12";
-        patch = "4";
+        patch = "5";
         suffix = "";
       };
-      hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ=";
+      hash = "sha256-+oouEsXmILCfU+ZbzYdVDS5aHi4Ev4upkdzFUROHY5c=";
     };
   };
 

From 176cbe2ddaf9643d8ae28a56ae8ce9f84ec720e7 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Thu, 8 Aug 2024 13:57:33 -0400
Subject: [PATCH 072/235] python311Packages.debugpy: 1.8.2 -> 1.8.5

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

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index ddbf84a511e4..18e9acec9b57 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.2";
+  version = "1.8.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-J63izrJX7/el36kMHv+IyqDQ1C13CKb40HLOVgOzHEw=";
+    hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw=";
   };
 
   patches =

From 63827efb6c924cb184b0db7b92e42f3d24b22429 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 26 Jul 2024 23:50:55 +0200
Subject: [PATCH 073/235] amdenc: init at 1.0-1787253

---
 pkgs/by-name/am/amdenc/package.nix | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/am/amdenc/package.nix

diff --git a/pkgs/by-name/am/amdenc/package.nix b/pkgs/by-name/am/amdenc/package.nix
new file mode 100644
index 000000000000..4887dc53000d
--- /dev/null
+++ b/pkgs/by-name/am/amdenc/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  autoPatchelfHook,
+}:
+
+let
+  amdgpuVersion = "6.1.3";
+  ubuntuVersion = "22.04";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "amdenc";
+  version = "1.0-1787253";
+
+  src = fetchurl {
+    url = "https://repo.radeon.com/amdgpu/${amdgpuVersion}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_${finalAttrs.version}.${ubuntuVersion}_amd64.deb";
+    hash = "sha256-RSkWQ3g++uKVrk5J9R8WA6qL0f+B2z8/mlflQ/cQZcg=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+  ];
+
+  buildInputs = [ stdenv.cc.cc.lib ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 opt/amdgpu-pro/lib/x86_64-linux-gnu/* -t $out/lib
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "AMD Encode Core Library";
+    homepage = "https://www.amd.com/en/support/download/drivers.html";
+    license = lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+})

From 999df5035f41ae462d488a8832feb2f89ce91938 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 24 Jul 2024 20:03:38 +0200
Subject: [PATCH 074/235] amf: init at 1.4.34-1787253

---
 pkgs/by-name/am/amf/package.nix | 54 +++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/am/amf/package.nix

diff --git a/pkgs/by-name/am/amf/package.nix b/pkgs/by-name/am/amf/package.nix
new file mode 100644
index 000000000000..13564a3e7a08
--- /dev/null
+++ b/pkgs/by-name/am/amf/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  libdrm,
+  amdenc,
+  autoPatchelfHook,
+}:
+
+let
+  amdgpuVersion = "6.1.3";
+  ubuntuVersion = "22.04";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "amf";
+  version = "1.4.34-1787253";
+
+  src = fetchurl {
+    url = "https://repo.radeon.com/amdgpu/${amdgpuVersion}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_${finalAttrs.version}.${ubuntuVersion}_amd64.deb";
+    hash = "sha256-5sMI0ktqQDTu5xOKP9T9vjaSIHQizF1wHhqJcVnY40c=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    libdrm
+    amdenc
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 opt/amdgpu-pro/lib/x86_64-linux-gnu/* -t $out/lib
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf $out/lib/* --add-needed libamdenc64.so
+  '';
+
+  meta = {
+    description = "AMD's closed source Advanced Media Framework (AMF) driver";
+    homepage = "https://www.amd.com/en/support/download/drivers.html";
+    license = lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+})

From 03bdfbb4ab4909399945521bce83343410f8d054 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 24 Jul 2024 20:04:16 +0200
Subject: [PATCH 075/235] ffmpeg: add amf support

---
 pkgs/development/libraries/ffmpeg/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4f2be05fc522..e22f366fbb77 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -34,6 +34,7 @@
 
   # Feature flags
 , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT
+, withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding
 , withAom ? withHeadlessDeps # AV1 reference encoder
 , withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework
 , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
@@ -218,6 +219,8 @@
  *  External libraries options
  */
 , alsa-lib
+, amf
+, amf-headers
 , avisynthplus
 , bzip2
 , celt
@@ -570,6 +573,7 @@ stdenv.mkDerivation (finalAttrs: {
      *  External libraries
      */
     (enableFeature withAlsa "alsa")
+    (enableFeature withAmf "amf")
     (enableFeature withAom "libaom")
     (enableFeature withAppKit "appkit")
   ] ++ optionals (versionAtLeast version "6.1") [
@@ -734,6 +738,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = []
   ++ optionals withAlsa [ alsa-lib ]
+  ++ optionals withAmf [ amf-headers ]
   ++ optionals withAom [ libaom ]
   ++ optionals withAppKit [ AppKit ]
   ++ optionals withAribcaption [ libaribcaption ]

From bd046906766161a33c6d7fc393deab687b0fe8bc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 31 Jul 2024 14:08:10 +0200
Subject: [PATCH 076/235] curl: 8.9.0 -> 8.9.1

https://curl.se/ch/8.9.1.html
https://curl.se/docs/CVE-2024-7264.html

Fixes: CVE-2024-7264
---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 06130e8add34..afa05aeb84be 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -49,14 +49,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.9.0";
+  version = "8.9.1";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz"
       "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-/wmyeRylbSX9XD86SSfc58ip3EGCIAxIfKiJ+6H91BI=";
+    hash = "sha256-8pL2zAUdW7q/cl74XUMt/qzIcR3XF+qXYSrlkGQ4AeU=";
   };
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion

From 208069013eea2c989a0b7d70701cff36443ca5e3 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 8 Aug 2024 15:37:21 -0400
Subject: [PATCH 077/235] curl: rm unused patch file

Was missed in 89b8ad6898068a2c9b78a9936a0fd50833b4cc5a.
---
 .../curl/8.7.1-compression-fix.patch          | 168 ------------------
 1 file changed, 168 deletions(-)
 delete mode 100644 pkgs/tools/networking/curl/8.7.1-compression-fix.patch

diff --git a/pkgs/tools/networking/curl/8.7.1-compression-fix.patch b/pkgs/tools/networking/curl/8.7.1-compression-fix.patch
deleted file mode 100644
index 53747b54c461..000000000000
--- a/pkgs/tools/networking/curl/8.7.1-compression-fix.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From b30d694a027eb771c02a3db0dee0ca03ccab7377 Mon Sep 17 00:00:00 2001
-From: Stefan Eissing <stefan@eissing.org>
-Date: Thu, 28 Mar 2024 11:08:15 +0100
-Subject: [PATCH] content_encoding: brotli and others, pass through 0-length
- writes
-
-- curl's transfer handling may write 0-length chunks at the end of the
-  download with an EOS flag. (HTTP/2 does this commonly)
-
-- content encoders need to pass-through such a write and not count this
-  as error in case they are finished decoding
-
-Fixes #13209
-Fixes #13212
-Closes #13219
----
- lib/content_encoding.c         | 10 +++++-----
- tests/http/test_02_download.py | 13 +++++++++++++
- tests/http/testenv/env.py      |  7 ++++++-
- tests/http/testenv/httpd.py    | 20 ++++++++++++++++++++
- 4 files changed, 44 insertions(+), 6 deletions(-)
-
-diff --git a/lib/content_encoding.c b/lib/content_encoding.c
-index c1abf24e8c027c..8e926dd2ecd5ad 100644
---- a/lib/content_encoding.c
-+++ b/lib/content_encoding.c
-@@ -300,7 +300,7 @@ static CURLcode deflate_do_write(struct Curl_easy *data,
-   struct zlib_writer *zp = (struct zlib_writer *) writer;
-   z_stream *z = &zp->z;     /* zlib state structure */
- 
--  if(!(type & CLIENTWRITE_BODY))
-+  if(!(type & CLIENTWRITE_BODY) || !nbytes)
-     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
- 
-   /* Set the compressed input when this function is called */
-@@ -457,7 +457,7 @@ static CURLcode gzip_do_write(struct Curl_easy *data,
-   struct zlib_writer *zp = (struct zlib_writer *) writer;
-   z_stream *z = &zp->z;     /* zlib state structure */
- 
--  if(!(type & CLIENTWRITE_BODY))
-+  if(!(type & CLIENTWRITE_BODY) || !nbytes)
-     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
- 
-   if(zp->zlib_init == ZLIB_INIT_GZIP) {
-@@ -669,7 +669,7 @@ static CURLcode brotli_do_write(struct Curl_easy *data,
-   CURLcode result = CURLE_OK;
-   BrotliDecoderResult r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
- 
--  if(!(type & CLIENTWRITE_BODY))
-+  if(!(type & CLIENTWRITE_BODY) || !nbytes)
-     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
- 
-   if(!bp->br)
-@@ -762,7 +762,7 @@ static CURLcode zstd_do_write(struct Curl_easy *data,
-   ZSTD_outBuffer out;
-   size_t errorCode;
- 
--  if(!(type & CLIENTWRITE_BODY))
-+  if(!(type & CLIENTWRITE_BODY) || !nbytes)
-     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
- 
-   if(!zp->decomp) {
-@@ -916,7 +916,7 @@ static CURLcode error_do_write(struct Curl_easy *data,
-   (void) buf;
-   (void) nbytes;
- 
--  if(!(type & CLIENTWRITE_BODY))
-+  if(!(type & CLIENTWRITE_BODY) || !nbytes)
-     return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
- 
-   failf(data, "Unrecognized content encoding type. "
-diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py
-index 4db9c9d36e9ed5..395fc862f2f839 100644
---- a/tests/http/test_02_download.py
-+++ b/tests/http/test_02_download.py
-@@ -394,6 +394,19 @@ def test_02_27_paused_no_cl(self, env: Env, httpd, nghttpx, repeat):
-         r = client.run(args=[url])
-         r.check_exit_code(0)
- 
-+    @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
-+    def test_02_28_get_compressed(self, env: Env, httpd, nghttpx, repeat, proto):
-+        if proto == 'h3' and not env.have_h3():
-+            pytest.skip("h3 not supported")
-+        count = 1
-+        urln = f'https://{env.authority_for(env.domain1brotli, proto)}/data-100k?[0-{count-1}]'
-+        curl = CurlClient(env=env)
-+        r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
-+            '--compressed'
-+        ])
-+        r.check_exit_code(code=0)
-+        r.check_response(count=count, http_status=200)
-+
-     def check_downloads(self, client, srcfile: str, count: int,
-                         complete: bool = True):
-         for i in range(count):
-diff --git a/tests/http/testenv/env.py b/tests/http/testenv/env.py
-index a207059dcd57c5..13c5d6bd46ee57 100644
---- a/tests/http/testenv/env.py
-+++ b/tests/http/testenv/env.py
-@@ -129,10 +129,11 @@ def __init__(self):
-         self.htdocs_dir = os.path.join(self.gen_dir, 'htdocs')
-         self.tld = 'http.curl.se'
-         self.domain1 = f"one.{self.tld}"
-+        self.domain1brotli = f"brotli.one.{self.tld}"
-         self.domain2 = f"two.{self.tld}"
-         self.proxy_domain = f"proxy.{self.tld}"
-         self.cert_specs = [
--            CertificateSpec(domains=[self.domain1, 'localhost'], key_type='rsa2048'),
-+            CertificateSpec(domains=[self.domain1, self.domain1brotli, 'localhost'], key_type='rsa2048'),
-             CertificateSpec(domains=[self.domain2], key_type='rsa2048'),
-             CertificateSpec(domains=[self.proxy_domain, '127.0.0.1'], key_type='rsa2048'),
-             CertificateSpec(name="clientsX", sub_specs=[
-@@ -376,6 +377,10 @@ def htdocs_dir(self) -> str:
-     def domain1(self) -> str:
-         return self.CONFIG.domain1
- 
-+    @property
-+    def domain1brotli(self) -> str:
-+        return self.CONFIG.domain1brotli
-+
-     @property
-     def domain2(self) -> str:
-         return self.CONFIG.domain2
-diff --git a/tests/http/testenv/httpd.py b/tests/http/testenv/httpd.py
-index c04c22699a62c4..b8615875a9a558 100644
---- a/tests/http/testenv/httpd.py
-+++ b/tests/http/testenv/httpd.py
-@@ -50,6 +50,7 @@ class Httpd:
-         'alias', 'env', 'filter', 'headers', 'mime', 'setenvif',
-         'socache_shmcb',
-         'rewrite', 'http2', 'ssl', 'proxy', 'proxy_http', 'proxy_connect',
-+        'brotli',
-         'mpm_event',
-     ]
-     COMMON_MODULES_DIRS = [
-@@ -203,6 +204,7 @@ def _mkpath(self, path):
- 
-     def _write_config(self):
-         domain1 = self.env.domain1
-+        domain1brotli = self.env.domain1brotli
-         creds1 = self.env.get_credentials(domain1)
-         domain2 = self.env.domain2
-         creds2 = self.env.get_credentials(domain2)
-@@ -285,6 +287,24 @@ def _write_config(self):
-                 f'</VirtualHost>',
-                 f'',
-             ])
-+            # Alternate to domain1 with BROTLI compression
-+            conf.extend([  # https host for domain1, h1 + h2
-+                f'<VirtualHost *:{self.env.https_port}>',
-+                f'    ServerName {domain1brotli}',
-+                f'    Protocols h2 http/1.1',
-+                f'    SSLEngine on',
-+                f'    SSLCertificateFile {creds1.cert_file}',
-+                f'    SSLCertificateKeyFile {creds1.pkey_file}',
-+                f'    DocumentRoot "{self._docs_dir}"',
-+                f'    SetOutputFilter BROTLI_COMPRESS',
-+            ])
-+            conf.extend(self._curltest_conf(domain1))
-+            if domain1 in self._extra_configs:
-+                conf.extend(self._extra_configs[domain1])
-+            conf.extend([
-+                f'</VirtualHost>',
-+                f'',
-+            ])
-             conf.extend([  # https host for domain2, no h2
-                 f'<VirtualHost *:{self.env.https_port}>',
-                 f'    ServerName {domain2}',

From 00e4f26329e8b1896af79aaa75c6e471ae9c39f3 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 8 Aug 2024 15:40:46 -0400
Subject: [PATCH 078/235] curl: fix SIGPIPE regression in 8.9.1

(lib)curl 8.9.1 introduces a bug which causes various programs to crash [0] [1].
curl's developers have no plans to make a new patch release at this time [2].

[0]: https://github.com/curl/curl/issues/14344
[1]: https://github.com/transmission/transmission/issues/7035
[2]: https://github.com/curl/curl/issues/14344#issuecomment-2269497552
---
 pkgs/tools/networking/curl/default.nix        |  6 ++++
 .../networking/curl/fix-sigpipe-leak.patch    | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/fix-sigpipe-leak.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index afa05aeb84be..71fd5e93c02f 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -59,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8pL2zAUdW7q/cl74XUMt/qzIcR3XF+qXYSrlkGQ4AeU=";
   };
 
+  patches = [
+    # fixes https://github.com/curl/curl/issues/14344
+    # https://github.com/curl/curl/pull/14390
+    ./fix-sigpipe-leak.patch
+  ];
+
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
   postPatch = ''
diff --git a/pkgs/tools/networking/curl/fix-sigpipe-leak.patch b/pkgs/tools/networking/curl/fix-sigpipe-leak.patch
new file mode 100644
index 000000000000..f4f0346d8815
--- /dev/null
+++ b/pkgs/tools/networking/curl/fix-sigpipe-leak.patch
@@ -0,0 +1,32 @@
+From 3eec5afbd0b6377eca893c392569b2faf094d970 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 5 Aug 2024 00:17:17 +0200
+Subject: [PATCH] sigpipe: init the struct so that first apply ignores
+
+Initializes 'no_signal' to TRUE, so that a call to sigpipe_apply() after
+init ignores the signal (unless CURLOPT_NOSIGNAL) is set.
+
+I have read the existing code multiple times now and I think it gets the
+initial state reversed this missing to ignore.
+
+Regression from 17e6f06ea37136c36d27
+
+Reported-by: Rasmus Thomsen
+Fixes #14344
+Closes #14390
+---
+ lib/sigpipe.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/sigpipe.h b/lib/sigpipe.h
+index b91a2f51333956..d78afd905d3414 100644
+--- a/lib/sigpipe.h
++++ b/lib/sigpipe.h
+@@ -39,6 +39,7 @@ struct sigpipe_ignore {
+ static void sigpipe_init(struct sigpipe_ignore *ig)
+ {
+   memset(ig, 0, sizeof(*ig));
++  ig->no_signal = TRUE;
+ }
+ 
+ /*

From 31d238110c720ab467cbd7adb715ebca76f9e09d Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 10 Aug 2024 10:32:22 +0300
Subject: [PATCH 079/235] nodejs: disable failing tests on x86_64-darwin

---
 pkgs/development/web/nodejs/nodejs.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 93421c709c43..a589757664e1 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -96,7 +96,7 @@ let
       null;
   # TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi).
 
-  useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
+  useSharedHttpParser = !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4";
 
   sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; });
 
@@ -141,10 +141,10 @@ let
       # Note: do not set TERM=dumb environment variable globally, it is used in
       # test-ci-js test suite to skip tests that otherwise run fine.
       NINJA = "TERM=dumb ninja";
-    } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
+    } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
       # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin.
       # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+.
-      NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
+      NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300 -Wno-macro-redefined";
     };
 
     # NB: technically, we do not need bash in build inputs since all scripts are
@@ -286,7 +286,7 @@ let
         "test-tls-cli-max-version-1.3"
         "test-tls-client-auth"
         "test-tls-sni-option"
-      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      ] ++ lib.optionals stdenv.buildPlatform.isDarwin [
         # Disable tests that don’t work under macOS sandbox.
         "test-macos-app-sandbox"
         "test-os"
@@ -311,6 +311,11 @@ let
         "test-runner-run"
         "test-runner-watch-mode"
         "test-watch-mode-files_watcher"
+      ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
+        # These tests fail on x86_64-darwin (even without sandbox).
+        # TODO: revisit at a later date.
+        "test-fs-readv"
+        "test-fs-readv-sync"
       ])}"
     ];
 

From d728271fcf97727163b35f645ee8739ba059dd21 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 10 Aug 2024 10:57:01 +0200
Subject: [PATCH 080/235] ffmpeg: add snappy option

---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4d73c8ae72be..6d76cf7cdcae 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -100,6 +100,7 @@
 , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol
 , withSdl2 ? withSmallDeps
 , withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0"
+, withSnappy ? withFullDeps # Snappy compression, needed for hap encoding
 , withSoxr ? withHeadlessDeps # Resampling via soxr
 , withSpeex ? withHeadlessDeps # Speex de/encoder
 , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol
@@ -296,6 +297,7 @@
 , samba
 , SDL2
 , shaderc
+, snappy
 , soxr
 , speex
 , srt
@@ -659,6 +661,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (versionAtLeast version "5.0") [
     (enableFeature withShaderc "libshaderc")
   ] ++ [
+    (enableFeature withSnappy "libsnappy")
     (enableFeature withSoxr "libsoxr")
     (enableFeature withSpeex "libspeex")
     (enableFeature withSrt "libsrt")
@@ -798,6 +801,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withSamba [ samba ]
   ++ optionals withSdl2 [ SDL2 ]
   ++ optionals withShaderc [ shaderc ]
+  ++ optionals withSnappy [ snappy ]
   ++ optionals withSoxr [ soxr ]
   ++ optionals withSpeex [ speex ]
   ++ optionals withSrt [ srt ]

From 911869feaf621141647213c90f33ed76a3035e12 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 10 Aug 2024 12:27:53 +0200
Subject: [PATCH 081/235] ffmpeg: add shine option

---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6d76cf7cdcae..95e1dc1b6427 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -100,6 +100,7 @@
 , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol
 , withSdl2 ? withSmallDeps
 , withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0"
+, withShine ? withFullDeps # Fixed-point MP3 encoding
 , withSnappy ? withFullDeps # Snappy compression, needed for hap encoding
 , withSoxr ? withHeadlessDeps # Resampling via soxr
 , withSpeex ? withHeadlessDeps # Speex de/encoder
@@ -297,6 +298,7 @@
 , samba
 , SDL2
 , shaderc
+, shine
 , snappy
 , soxr
 , speex
@@ -661,6 +663,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (versionAtLeast version "5.0") [
     (enableFeature withShaderc "libshaderc")
   ] ++ [
+    (enableFeature withShine "libshine")
     (enableFeature withSnappy "libsnappy")
     (enableFeature withSoxr "libsoxr")
     (enableFeature withSpeex "libspeex")
@@ -801,6 +804,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withSamba [ samba ]
   ++ optionals withSdl2 [ SDL2 ]
   ++ optionals withShaderc [ shaderc ]
+  ++ optionals withShine [ shine ]
   ++ optionals withSnappy [ snappy ]
   ++ optionals withSoxr [ soxr ]
   ++ optionals withSpeex [ speex ]

From 8d00b653a55a38dba05017d34f4447f8b95020d7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:51:27 +0000
Subject: [PATCH 082/235] cagebreak: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/applications/window-managers/cagebreak/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix
index c897e3f66d8f..13618f6afb33 100644
--- a/pkgs/applications/window-managers/cagebreak/default.nix
+++ b/pkgs/applications/window-managers/cagebreak/default.nix
@@ -19,6 +19,7 @@
 , systemd
 , wayland
 , wayland-protocols
+, wayland-scanner
 , withXwayland ? true , xwayland
 , wlroots
 }:
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     scdoc
-    wayland
+    wayland-scanner
   ];
 
   buildInputs = [

From ec9e0c6dc8debea603d612a3b76586d2a2750faf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:51:52 +0000
Subject: [PATCH 083/235] cardboard: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/by-name/ca/cardboard/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ca/cardboard/package.nix b/pkgs/by-name/ca/cardboard/package.nix
index 42f3ade1655f..6c859002114a 100644
--- a/pkgs/by-name/ca/cardboard/package.nix
+++ b/pkgs/by-name/ca/cardboard/package.nix
@@ -21,6 +21,7 @@
 , unzip
 , wayland
 , wayland-protocols
+, wayland-scanner
 , xcbutilerrors
 , xcbutilimage
 , xcbutilwm
@@ -79,6 +80,7 @@ stdenv.mkDerivation {
     pandoc
     pkg-config
     unzip
+    wayland-scanner
   ];
 
   buildInputs = [

From b8baf82e243c9ac07cc6dc066a6ee63bae310823 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 Feb 2023 22:03:59 +0000
Subject: [PATCH 084/235] clightd: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/clight/clightd.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index b6958d86bbd0..7283cc32640e 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub
-, dbus, cmake, pkg-config
+, dbus, cmake, pkg-config, wayland-scanner
 , glib, udev, polkit, libusb1, libjpeg, libmodule
 , pcre, libXdmcp, util-linux, libpthreadstubs
 , enableDdc ? true, ddcutil
@@ -40,10 +40,15 @@ stdenv.mkDerivation rec {
       ++ optional enableScreen     "-DENABLE_SCREEN=1"
       ++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     dbus
     cmake
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = with lib; [

From 4eb2f9c1ce974220323e719f33f693428a0d5580 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:18:38 +0000
Subject: [PATCH 085/235] deepin.dwayland: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/deepin/library/dwayland/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
index 7de7292a4a05..8edf79d365bb 100644
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -6,6 +6,7 @@
 , qtwayland
 , wayland
 , wayland-protocols
+, wayland-scanner
 , extra-cmake-modules
 , deepin-wayland-protocols
 , qttools
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
     cmake
     extra-cmake-modules
     qttools
+    wayland-scanner
   ];
 
   buildInputs = [

From 279f84453e1ab3bcf6429e40d32f63f423a4fd5e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 10 Aug 2024 15:28:23 +0200
Subject: [PATCH 086/235] ffmpeg: add rubberband option

---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6d76cf7cdcae..e1f64f3779d0 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -97,6 +97,7 @@
 , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding
 , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety)
 , withRtmp ? withFullDeps # RTMP[E] support
+, withRubberband ? withFullDeps && withGPL # Rubberband filter
 , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol
 , withSdl2 ? withSmallDeps
 , withShaderc ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0"
@@ -293,6 +294,7 @@
 , quirc
 , rav1e
 , rtmpdump
+, rubberband
 , twolame
 , samba
 , SDL2
@@ -656,6 +658,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ [
     (enableFeature withRav1e "librav1e")
     (enableFeature withRtmp "librtmp")
+    (enableFeature withRubberband "librubberband")
     (enableFeature withSamba "libsmbclient")
     (enableFeature withSdl2 "sdl2")
   ] ++ optionals (versionAtLeast version "5.0") [
@@ -798,6 +801,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withQuirc [ quirc ]
   ++ optionals withRav1e [ rav1e ]
   ++ optionals withRtmp [ rtmpdump ]
+  ++ optionals withRubberband [ rubberband ]
   ++ optionals withSamba [ samba ]
   ++ optionals withSdl2 [ SDL2 ]
   ++ optionals withShaderc [ shaderc ]

From 05f55a6c133090254746463445ec95e6962ae00a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 10 Aug 2024 22:07:46 +0100
Subject: [PATCH 087/235] openblas: 0.3.27 -> 0.3.28

Changes: https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.28
---
 .../libraries/science/math/openblas/default.nix    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e36c92d60b67..825eeabdfe1e 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which
+{ lib, stdenv, fetchFromGitHub, perl, which
 # Most packages depending on openblas expect integer width to match
 # pointer width, but some expect to use 32-bit integers always
 # (for compatibility with reference BLAS).
@@ -142,7 +142,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.27";
+  version = "0.3.28";
 
   outputs = [ "out" "dev" ];
 
@@ -150,17 +150,9 @@ stdenv.mkDerivation rec {
     owner = "OpenMathLib";
     repo = "OpenBLAS";
     rev = "v${version}";
-    hash = "sha256-VKDFSPwHGZMa2DoOXbSKNQRsl07LatMLK1lHVcEep8U=";
+    hash = "sha256-430zG47FoBNojcPFsVC7FA43FhVPxrulxAW3Fs6CHo8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "no-gemm3m-tests-static.patch";
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/48e017de095018c60d83355804a3075658b4970c.patch";
-      hash = "sha256-Wa6EE0M1H0efVn26pOKpi0dFGLuPuzmvAzpBLrAYe5k=";
-    })
-  ];
-
   postPatch = ''
     # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16'
     substituteInPlace Makefile.arm64 --replace "+sve2+bf16" ""

From 64eaa6318185fe0c3e54b0e4e0f2d5b12ebe34ab Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 10 Aug 2024 23:38:10 +0000
Subject: [PATCH 088/235] stdenv: concatStringsSep: quote ${sep}

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7666360fb7bb..5c9b2c1064db 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -382,7 +382,7 @@ concatStringsSep() {
                 local IFS="$sep"
                 echo -n "${nameref[*]}" ;;
             *)
-                echo -n "${nameref// /${sep}}" ;;
+                echo -n "${nameref// /"${sep}"}" ;;
         esac
     fi
 }

From eed069a5bc40ba4d871de7700c7eb8d592e98cb6 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 29 Jul 2024 03:15:12 +0800
Subject: [PATCH 089/235] buildGoModule: fix overrideAttrs overriding

Fix overriding of vendorHash and various attributes via the fixed point
attribute support of stdenv.mkDerivation.

Pass as derivation attributes
goModules, modRoot, vendorHash, deleteVendor, and proxyVendor.

Move goModules and vendorHash out of passthru.

Co-authored-by: Doron Behar <doron.behar@gmail.com>
---
 doc/languages-frameworks/go.section.md        |  59 +++++++++++
 .../manual/release-notes/rl-2411.section.md   |   4 +
 pkgs/build-support/go/module.nix              |  88 +++++++++------
 pkgs/test/overriding.nix                      | 100 ++++++++++++++++++
 4 files changed, 219 insertions(+), 32 deletions(-)

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index b20308c7b4ab..e40b92f952b1 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -62,6 +62,65 @@ The following is an example expression using `buildGoModule`:
 }
 ```
 
+### Obtaining and overriding `vendorHash` for `buildGoModule` {#buildGoModule-vendorHash}
+
+We can use `nix-prefetch` to obtain the actual hash. The following command gets the value of `vendorHash` for package `pet`:
+
+```sh
+cd path/to/nixpkgs
+nix-prefetch -E "{ sha256 }: ((import ./. { }).my-package.overrideAttrs { vendorHash = sha256; }).goModules"
+```
+
+To obtain the hash without external tools, set `vendorHash = lib.fakeHash;` and run the build. ([more details here](#sec-source-hashes)).
+
+`vendorHash` can be overridden with `overrideAttrs`. Override the above example like this:
+
+```nix
+{
+  pet_0_4_0 = pet.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      version = "0.4.0";
+      src = fetchFromGitHub {
+        inherit (previousAttrs.src) owner repo;
+        rev = "v${finalAttrs.version}";
+        hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
+      };
+      vendorHash = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs=";
+    }
+  );
+}
+```
+
+### Overriding `goModules` (#buildGoModule-goModules-override)
+
+Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation. Alternatively, the primary derivation provides an overridable `passthru.overrideModAttrs` function to store the attribute overlay implicitly taken by `goModules.overrideAttrs`. Here's an example usage of `overrideModAttrs`:
+
+```nix
+{
+  pet-overridden = pet.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      passthru = previousAttrs.passthru // {
+        # If the original package has an `overrideModAttrs` attribute set, you'd
+        # want to extend it, and not replace it. Hence we use
+        # `lib.composeExtensions`. If you are sure the `overrideModAttrs` of the
+        # original package trivially does nothing, you can safely replace it
+        # with your own by not using `lib.composeExtensions`.
+        overrideModAttrs = lib.composeExtensions previousAttrs.passthru.overrideModAttrs (
+          finalModAttrs: previousModAttrs: {
+            # goModules-specific overriding goes here
+            postBuild = ''
+              # Here you have access to the `vendor` directory.
+              substituteInPlace vendor/github.com/example/repo/file.go \
+                --replace-fail "panic(err)" ""
+            '';
+          }
+        );
+      };
+    }
+  );
+}
+```
+
 ## `buildGoPackage` (legacy) {#ssec-go-legacy}
 
 The function `buildGoPackage` builds legacy Go programs, not supporting Go modules.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 3185137f971f..acc2f2177f94 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -272,6 +272,10 @@
   [buildRustPackage: Compiling Rust applications with Cargo](https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo)
   for more information.
 
+- The `vendorHash` of Go packages built with `buildGoModule` can now be overridden with `overrideAttrs`.
+  `goModules`, `modRoot`, `vendorHash`, `deleteVendor`, and `proxyVendor` are now passed as derivation attributes.
+  `goModules` and `vendorHash` are no longer placed t under `passthru`.
+
 - `hareHook` has been added as the language framework for Hare. From now on, it,
   not the `hare` package, should be added to `nativeBuildInputs` when building
   Hare programs.
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index a9c09f4ccbb5..214b2603ff7f 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -7,7 +7,7 @@
 , patches ? [ ]
 
   # A function to override the goModules derivation
-, overrideModAttrs ? (_oldAttrs: { })
+, overrideModAttrs ? (finalAttrs: previousAttrs: { })
 
   # path to go.mod and go.sum directory
 , modRoot ? "./"
@@ -58,18 +58,38 @@
 assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
 
 let
-  args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ];
+  args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" ];
 
   GO111MODULE = "on";
   GOTOOLCHAIN = "local";
 
-  goModules = if (vendorHash == null) then "" else
+  toExtension =
+    overlay0:
+    if lib.isFunction overlay0 then
+      final: prev:
+      if lib.isFunction (overlay0 prev) then
+        # `overlay0` is `final: prev: { ... }`
+        overlay0 final prev
+      else
+        # `overlay0` is `prev: { ... }`
+        overlay0 prev
+    else
+      # `overlay0` is `{ ... }`
+      final: prev: overlay0;
+
+in
+(stdenv.mkDerivation (finalAttrs:
+  args
+  // {
+
+  inherit modRoot vendorHash deleteVendor proxyVendor;
+  goModules = if (finalAttrs.vendorHash == null) then "" else
   (stdenv.mkDerivation {
-    name = "${name}-go-modules";
+    name = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-go-modules";
 
-    nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ go git cacert ];
+    nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ go git cacert ];
 
-    inherit (args) src;
+    inherit (finalAttrs) src modRoot;
     inherit (go) GOOS GOARCH;
     inherit GO111MODULE GOTOOLCHAIN;
 
@@ -77,15 +97,15 @@ let
     # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and
     # out in the wild. In anycase, it's documented in:
     # doc/languages-frameworks/go.section.md
-    prePatch = args.prePatch or "";
-    patches = args.patches or [ ];
-    patchFlags = args.patchFlags or [ ];
-    postPatch = args.postPatch or "";
-    preBuild = args.preBuild or "";
-    postBuild = args.modPostBuild or "";
-    sourceRoot = args.sourceRoot or "";
-    setSourceRoot = args.setSourceRoot or "";
-    env = args.env or { };
+    prePatch = finalAttrs.prePatch or "";
+    patches = finalAttrs.patches or [ ];
+    patchFlags = finalAttrs.patchFlags or [ ];
+    postPatch = finalAttrs.postPatch or "";
+    preBuild = finalAttrs.preBuild or "";
+    postBuild = finalAttrs.modPostBuild or "";
+    sourceRoot = finalAttrs.sourceRoot or "";
+    setSourceRoot = finalAttrs.setSourceRoot or "";
+    env = finalAttrs.env or { };
 
     impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
       "GIT_PROXY_COMMAND"
@@ -97,13 +117,13 @@ let
       runHook preConfigure
       export GOCACHE=$TMPDIR/go-cache
       export GOPATH="$TMPDIR/go"
-      cd "${modRoot}"
+      cd "$modRoot"
       runHook postConfigure
     '';
 
     buildPhase = args.modBuildPhase or (''
       runHook preBuild
-    '' + lib.optionalString deleteVendor ''
+    '' + lib.optionalString finalAttrs.deleteVendor ''
       if [ ! -d vendor ]; then
         echo "vendor folder does not exist, 'deleteVendor' is not needed"
         exit 10
@@ -116,7 +136,7 @@ let
         exit 10
       fi
 
-      ${if proxyVendor then ''
+      ${if finalAttrs.proxyVendor then ''
         mkdir -p "''${GOPATH}/pkg/mod/cache/download"
         go mod download
       '' else ''
@@ -134,7 +154,7 @@ let
     installPhase = args.modInstallPhase or ''
       runHook preInstall
 
-      ${if proxyVendor then ''
+      ${if finalAttrs.proxyVendor then ''
         rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
         cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out
       '' else ''
@@ -152,20 +172,19 @@ let
     dontFixup = true;
 
     outputHashMode = "recursive";
-    outputHash = vendorHash;
+    outputHash = finalAttrs.vendorHash;
     # Handle empty vendorHash; avoid
     # error: empty hash requires explicit hash algorithm
-    outputHashAlgo = if vendorHash == "" then "sha256" else null;
-  }).overrideAttrs overrideModAttrs;
+    outputHashAlgo = if finalAttrs.vendorHash == "" then "sha256" else null;
+  }).overrideAttrs finalAttrs.passthru.overrideModAttrs;
 
-  package = stdenv.mkDerivation (args // {
     nativeBuildInputs = [ go ] ++ nativeBuildInputs;
 
     inherit (go) GOOS GOARCH;
 
     GOFLAGS = GOFLAGS
       ++ lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
-        (lib.optional (!proxyVendor) "-mod=vendor")
+        (lib.optional (!finalAttrs.proxyVendor) "-mod=vendor")
       ++ lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
         (lib.optional (!allowGoReference) "-trimpath");
     inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN;
@@ -181,12 +200,12 @@ let
       export GOPROXY=off
       export GOSUMDB=off
       cd "$modRoot"
-    '' + lib.optionalString (vendorHash != null) ''
-      ${if proxyVendor then ''
-        export GOPROXY=file://${goModules}
+    '' + lib.optionalString (finalAttrs.vendorHash != null) ''
+      ${if finalAttrs.proxyVendor then ''
+        export GOPROXY="file://$goModules"
       '' else ''
         rm -rf vendor
-        cp -r --reflink=auto ${goModules} vendor
+        cp -r --reflink=auto "$goModules" vendor
       ''}
     '' + ''
 
@@ -307,12 +326,17 @@ let
 
     disallowedReferences = lib.optional (!allowGoReference) go;
 
-    passthru = { inherit go goModules vendorHash; } // passthru;
+    passthru = {
+      inherit go;
+      # Canonicallize `overrideModAttrs` as an attribute overlay.
+      # `passthru.overrideModAttrs` will be overridden
+      # when users want to override `goModules`.
+      overrideModAttrs = toExtension overrideModAttrs;
+    } // passthru;
 
     meta = {
       # Add default meta information
       platforms = go.meta.platforms or lib.platforms.all;
     } // meta;
-  });
-in
-package
+  }
+))
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index e4c1f257c819..a9fa482e4e58 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -27,6 +27,38 @@ let
         expr = ((stdenvNoCC.mkDerivation { pname = "hello-no-final-attrs"; }).overrideAttrs { pname = "hello-no-final-attrs-overridden"; }).pname == "hello-no-final-attrs-overridden";
         expected = true;
       };
+      buildGoModule-overrideAttrs = {
+        expr = lib.all (
+          attrPath:
+          let
+            attrPathPretty = lib.concatStringsSep "." attrPath;
+            valueNative = lib.getAttrFromPath attrPath pet_0_4_0;
+            valueOverridden = lib.getAttrFromPath attrPath pet_0_4_0-overridden;
+          in
+          lib.warnIfNot
+            (valueNative == valueOverridden)
+            "pet_0_4_0.${attrPathPretty} (${valueNative}) does not equal pet_0_4_0-overridden.${attrPathPretty} (${valueOverridden})"
+            true
+        ) [
+          [ "drvPath" ]
+          [ "name" ]
+          [ "pname" ]
+          [ "version" ]
+          [ "vendorHash" ]
+          [ "goModules" "drvPath" ]
+          [ "goModules" "name" ]
+          [ "goModules" "outputHash" ]
+        ];
+        expected = true;
+      };
+      buildGoModule-goModules-overrideAttrs = {
+        expr = pet-foo.goModules.FOO == "foo";
+        expected = true;
+      };
+      buildGoModule-goModules-overrideAttrs-vendored = {
+        expr = lib.isString pet-vendored.drvPath;
+        expected = true;
+      };
     };
 
   addEntangled = origOverrideAttrs: f:
@@ -51,6 +83,74 @@ let
   overrides1 = example.overrideAttrs (_: super: { pname = "a-better-${super.pname}"; });
 
   repeatedOverrides = overrides1.overrideAttrs (_: super: { pname = "${super.pname}-with-blackjack"; });
+
+  pet_0_3_4 = pkgs.buildGoModule rec {
+    pname = "pet";
+    version = "0.3.4";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "knqyf263";
+      repo = "pet";
+      rev = "v${version}";
+      hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ=";
+    };
+
+    vendorHash = "sha256-ciBIR+a1oaYH+H1PcC8cD8ncfJczk1IiJ8iYNM+R6aA=";
+
+    meta = {
+      description = "Simple command-line snippet manager, written in Go";
+      homepage = "https://github.com/knqyf263/pet";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ kalbasit ];
+    };
+  };
+
+  pet_0_4_0 = pkgs.buildGoModule rec {
+    pname = "pet";
+    version = "0.4.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "knqyf263";
+      repo = "pet";
+      rev = "v${version}";
+      hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
+    };
+
+    vendorHash = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs=";
+
+    meta = {
+      description = "Simple command-line snippet manager, written in Go";
+      homepage = "https://github.com/knqyf263/pet";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ kalbasit ];
+    };
+  };
+
+  pet_0_4_0-overridden = pet_0_3_4.overrideAttrs (finalAttrs: previousAttrs: {
+  version = "0.4.0";
+
+  src = pkgs.fetchFromGitHub {
+    inherit (previousAttrs.src) owner repo;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
+  };
+
+  vendorHash = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs=";
+  });
+
+  pet-foo = pet_0_3_4.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      passthru = previousAttrs.passthru // {
+        overrideModAttrs = lib.composeExtensions previousAttrs.passthru.overrideModAttrs (
+          finalModAttrs: previousModAttrs: {
+            FOO = "foo";
+          }
+        );
+      };
+    }
+  );
+
+  pet-vendored = pet-foo.overrideAttrs { vendorHash = null; };
 in
 
 stdenvNoCC.mkDerivation {

From a93779544568a96f6432d98ac0b2220c4d774dab Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:59:03 +0000
Subject: [PATCH 090/235] enlightenment.efl: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/enlightenment/efl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index 34485cf87363..009150c8a38f 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -50,6 +50,7 @@
 , util-linux
 , wayland
 , wayland-protocols
+, wayland-scanner
 , writeText
 , xorg
 , zlib
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     gtk3
     pkg-config
     check
+    wayland-scanner
   ];
 
   buildInputs = [

From 5670ef01c1185bb17bf6fc08b775cb6d8d5bcca3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:24:53 +0000
Subject: [PATCH 091/235] fcitx5: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 6c0c53f479db..7fdee4f166a3 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -5,6 +5,7 @@
 , pkg-config
 , cmake
 , extra-cmake-modules
+, wayland-scanner
 , cairo
 , pango
 , expat
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
     cmake
     extra-cmake-modules
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

From 6e512236236e8ef963661ce75d4e99d570d2affc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:52:56 +0000
Subject: [PATCH 092/235] gamescope: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/by-name/ga/gamescope/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index e0ac90ed64e9..8ab745ec4588 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -12,6 +12,7 @@
 , vulkan-headers
 , wayland
 , wayland-protocols
+, wayland-scanner
 , libxkbcommon
 , glm
 , gbenchmark
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals enableExecutable [
     makeBinaryWrapper
     glslang
+    wayland-scanner
   ];
 
   buildInputs = [

From f0779ecaf277ee9c9764b1cc3f53dfdf516fbfde Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:59:29 +0000
Subject: [PATCH 093/235] gnome3.mutter43: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/gnome/core/mutter/43/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix
index 1bff840c6d73..cef4edf84c0f 100644
--- a/pkgs/desktops/gnome/core/mutter/43/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/43/default.nix
@@ -37,6 +37,7 @@
 , gnome-settings-daemon
 , xorgserver
 , python3
+, wayland-scanner
 , wrapGAppsHook3
 , gi-docgen
 , sysprof
@@ -111,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
     pkg-config
     python3
+    wayland-scanner
     wrapGAppsHook3
     gi-docgen
     xorgserver

From b29d12cf4c0b2a16a337397d351810853a48024d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:59:52 +0000
Subject: [PATCH 094/235] gnome3.mutter: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/gnome/core/mutter/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index 8ba330623891..78b21f4d215f 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -53,6 +53,7 @@
 , gnome-settings-daemon
 , xorgserver
 , python3
+, wayland-scanner
 , wrapGAppsHook4
 , gi-docgen
 , sysprof
@@ -103,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     xvfb-run
     pkg-config
     python3
+    wayland-scanner
     wrapGAppsHook4
     gi-docgen
     xorgserver

From 4fb55bca32fdca0ff086f06c10c0cf99dea58c13 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 10:00:38 +0000
Subject: [PATCH 095/235] gst_all_1.gst-plugins-bad: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 03e7637944e5..bf27c6f25d7b 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -11,6 +11,7 @@
 , orc
 , gstreamer
 , gobject-introspection
+, wayland-scanner
 , enableZbar ? false
 , faacSupport ? false
 , faac
@@ -142,7 +143,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableDocumentation [
     hotdoc
   ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [
-    wayland # for wayland-scanner
+    wayland-scanner
   ];
 
   buildInputs = [

From b97d2b7eb1172ec4c45494737f36726f7bb7199f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Feb 2023 12:00:40 +0000
Subject: [PATCH 096/235] gst_all_1.gst-plugins-base: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/gstreamer/base/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index e03b223f126b..3d55425190f6 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -26,6 +26,7 @@
 , libXv
 , libdrm
 , enableWayland ? stdenv.isLinux
+, wayland-scanner
 , wayland
 , wayland-protocols
 , enableAlsa ? stdenv.isLinux
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals enableDocumentation [
     hotdoc
   ] ++ lib.optionals enableWayland [
-    wayland
+    wayland-scanner
   ];
 
   buildInputs = [

From 7850b56683987e454a1c7083059bfe78a485ea71 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Feb 2023 13:14:04 +0000
Subject: [PATCH 097/235] gtk-layer-shell: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/gtk-layer-shell/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index f2ce10e58918..417b8523df26 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
+    wayland-scanner
     vala
     wayland-scanner
   ];

From e6fb535aa564ca8ea8649107461c8f679155d2c5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Feb 2023 11:57:19 +0000
Subject: [PATCH 098/235] hello-wayland: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/graphics/hello-wayland/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix
index 79326a6a700f..97b7da3e0f09 100644
--- a/pkgs/applications/graphics/hello-wayland/default.nix
+++ b/pkgs/applications/graphics/hello-wayland/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation {
   };
 
   separateDebugInfo = true;
-
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ];
   buildInputs = [ wayland wayland-protocols ];

From c2b34fed8fecfa03824fd25dff177045d98a23b4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:50:02 +0000
Subject: [PATCH 099/235] kitty: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/terminal-emulators/kitty/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 1bb165101e41..d4d640bca5f0 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -15,6 +15,7 @@
 , UserNotifications
 , libcanberra
 , libicns
+, wayland-scanner
 , libpng
 , python3
 , zlib
@@ -84,8 +85,12 @@ buildPythonApplication rec {
   ] ++ lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.
+  ] ++ lib.optionals stdenv.isLinux [
+    wayland-scanner
   ];
 
+  depsBuildBuild = [ pkg-config ];
+
   outputs = [ "out" "terminfo" "shell_integration" "kitten" ];
 
   patches = [

From ded502285367aeffca7acb9d02688280aad149ff Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:53:31 +0000
Subject: [PATCH 100/235] labwc: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.

From c18e0463fb591cfbd603697f172d40585511332b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:17:38 +0000
Subject: [PATCH 101/235] latte-dock: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/latte-dock/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 0d17b129ac7a..a870a7fec3b0 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,6 +1,9 @@
-{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab
-, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff
-, wayland, plasma-workspace, plasma-desktop }:
+{ lib, mkDerivation, fetchFromGitLab
+, cmake, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash
+, knewstuff, wayland-scanner
+, plasma-framework, plasma-wayland-protocols, plasma-workspace, plasma-desktop, qtwayland
+, wayland, xorg
+}:
 
 mkDerivation rec {
   pname = "latte-dock";
@@ -17,7 +20,7 @@ mkDerivation rec {
   buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace plasma-desktop ];
 
   nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem
-    qtx11extras kcrash knewstuff ];
+    qtx11extras kcrash knewstuff wayland-scanner ];
 
   patches = [
     ./0001-Disable-autostart.patch

From 8714155dd0abb9555d463106f2004fff7f02f709 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 10:01:21 +0000
Subject: [PATCH 102/235] libwpe-fdo: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/libwpe/fdo.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index d54d9706cbd1..3d2df9259a54 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -4,6 +4,7 @@
 , meson
 , pkg-config
 , ninja
+, wayland-scanner
 , wayland
 , libepoxy
 , glib
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
     pkg-config
     meson
     ninja
-    wayland
+    wayland-scanner
   ];
 
   buildInputs = [

From 158cce9f41d6ef5e4ea2685939f44a84bcc70039 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:50:54 +0000
Subject: [PATCH 103/235] looking-glass-client: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 .../virtualization/looking-glass-client/default.nix            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index bfc8d2177ce9..6adb2ebcc163 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -26,6 +26,7 @@
 
 , wayland
 , wayland-protocols
+, wayland-scanner
 
 , pipewire
 , pulseaudio
@@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-client-cmake-move-X11-config-directives-to-displayse.patch
   ];
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [ cmake pkg-config wayland-scanner ];
 
   buildInputs = [ libX11 libGL freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ]
     ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr libXdmcp ]

From 2bc828695e40156109eda0ec20f8a4d163f64677 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:46:53 +0000
Subject: [PATCH 104/235] maliit-framework: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/maliit-framework/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index 3407af8df3d7..7093524fc04d 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -20,6 +20,7 @@
 , doxygen
 , pkg-config
 , wayland-protocols
+, wayland-scanner
 }:
 
 mkDerivation rec {
@@ -62,6 +63,7 @@ mkDerivation rec {
     doxygen
     pkg-config
     wayland-protocols
+    wayland-scanner
   ];
 
   preConfigure = ''

From 95d91005a926712f29492ebaae158802fd742e98 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:47:15 +0000
Subject: [PATCH 105/235] phoc: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/phoc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix
index 9d7664968757..4e3eaacc47f8 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/applications/misc/phoc/default.nix
@@ -6,6 +6,7 @@
 , ninja
 , pkg-config
 , python3
+, wayland-scanner
 , wrapGAppsHook3
 , libinput
 , gobject-introspection
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
+    wayland-scanner
     wrapGAppsHook3
   ];
 

From 115545192f45ce6b1a1f6e83e3e57a2384badda5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:17:56 +0000
Subject: [PATCH 106/235] phosh: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/window-managers/phosh/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 32ece77e4fb0..1f0d72bf3fab 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -6,6 +6,7 @@
 , ninja
 , pkg-config
 , python3
+, wayland-scanner
 , wrapGAppsHook4
 , libadwaita
 , libhandy
@@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
+    wayland-scanner
     wrapGAppsHook4
   ];
 

From 9f692804dbde24d21c6b397f733c1e622ac46231 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:18:15 +0000
Subject: [PATCH 107/235] phosh-mobile-settings: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 .../window-managers/phosh/phosh-mobile-settings.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
index 3a563f9e1723..4c4e0c11900b 100644
--- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
+++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
@@ -6,6 +6,7 @@
 , meson
 , ninja
 , pkg-config
+, wayland-scanner
 , wrapGAppsHook4
 , desktop-file-utils
 , feedbackd
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
     ninja
     phosh
     pkg-config
+    wayland-scanner
     wrapGAppsHook4
   ];
 

From abea49c97730cac3a38e0bb23d814503a9dd1642 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:22:17 +0000
Subject: [PATCH 108/235] plasma5Packages.kguiaddons: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 9254043117ae..61ccde59a7e8 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,12 +1,12 @@
 { mkDerivation
-, extra-cmake-modules
+, extra-cmake-modules, wayland-scanner
 , qtbase, qtx11extras, wayland, plasma-wayland-protocols
 }:
 
 mkDerivation {
   pname = "kguiaddons";
 
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
   buildInputs = [ qtx11extras wayland plasma-wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
 

From 3040aa615c1b8f69bf52313ccdba40712799b35a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:22:36 +0000
Subject: [PATCH 109/235] plasma5Packages.kidletime: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 .../libraries/kde-frameworks/kidletime.nix            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 522e3a2a5de3..cbc94c1bd472 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -1,13 +1,12 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtbase, qtx11extras,
-  wayland, wayland-protocols, plasma-wayland-protocols
+{ mkDerivation
+, extra-cmake-modules, wayland-scanner
+, qtbase, qtx11extras
+, wayland, wayland-protocols, plasma-wayland-protocols
 }:
 
 mkDerivation {
   pname = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
   buildInputs = [ qtx11extras wayland wayland-protocols plasma-wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
 }

From b96f111a718915eea17ad57f194bc1ff8a2cf252 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:17:19 +0000
Subject: [PATCH 110/235] plasma5Packages.krfb: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/kde/krfb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 367e9ab01081..c1294e1f1e3b 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib
-, extra-cmake-modules, kdoctools
+, extra-cmake-modules, kdoctools, wayland-scanner
 , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
 , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire
 , libvncserver, libXtst, libXdamage
@@ -14,7 +14,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2Plus fdl12Plus ];
     maintainers = with lib.maintainers; [ jerith666 ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     libvncserver libXtst libXdamage
     kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons

From cec8d1fd0e3072fd598281c3e3d9970fd168c9e6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:18:56 +0000
Subject: [PATCH 111/235] plasma5Packages.kscreenlocker: depend on
 wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/kscreenlocker.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index b7510cb95bce..68bedb5e4680 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , extra-cmake-modules
 , kdoctools
+, wayland-scanner
 , kcmutils
 , kcrash
 , kdeclarative
@@ -19,7 +20,7 @@
 
 mkDerivation {
   pname = "kscreenlocker";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     kcmutils
     kcrash

From 5f7c8fe1fddbf32343d1b1b3f8d108720092d4f4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:23:02 +0000
Subject: [PATCH 112/235] plasma5Packages.kwayland: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/development/libraries/kde-frameworks/kwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index fbe7d70ec2f1..4d461f6a07c9 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,12 +1,12 @@
 {
   mkDerivation, propagateBin, lib,
-  extra-cmake-modules,
+  extra-cmake-modules, wayland-scanner,
   plasma-wayland-protocols, qtbase, wayland, wayland-protocols
 }:
 
 mkDerivation {
   pname = "kwayland";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
   buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
   setupHook = propagateBin; # XDG_CONFIG_DIRS

From d23c5a444e5f3727bb73e14398c0e46d4e519e01 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:19:24 +0000
Subject: [PATCH 113/235] plasma5Packages.kwin: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/kwin/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 68e128569fec..81f588b4d703 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, wayland-scanner
 , fetchpatch
 , libepoxy
 , lcms2
@@ -61,7 +62,7 @@
 
 mkDerivation {
   pname = "kwin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     libepoxy
     lcms2

From 505c8b2adb53eb2d2dd32704a858c02e0d2ea86e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:20:08 +0000
Subject: [PATCH 114/235] plasma5Packages.plasma-integration: depend on
 wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/plasma-integration/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix
index 45e3a6012bd8..51a66bcc0d8c 100644
--- a/pkgs/desktops/plasma-5/plasma-integration/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix
@@ -1,5 +1,6 @@
 { mkDerivation
 , extra-cmake-modules
+, wayland-scanner
 , breeze-qt5
 , kconfig
 , kconfigwidgets
@@ -18,7 +19,7 @@
 
 mkDerivation {
   pname = "plasma-integration";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
   buildInputs = [
     breeze-qt5
     kconfig

From 8a5862be27ee81e4826b9bc97c5fe48ef6c1df5d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:20:39 +0000
Subject: [PATCH 115/235] plasma5Packages.plasma-remotecontrollers: depend on
 wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/plasma-remotecontrollers.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
index be1c6ff42eff..46f52a6635af 100644
--- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
+++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
@@ -11,6 +11,7 @@
 , kscreenlocker
 , kwindowsystem
 , wayland
+, wayland-scanner
 , pkg-config
 , libcec
 , libcec_platform
@@ -20,7 +21,7 @@
 }:
 mkDerivation {
   pname = "plasma-remotecontrollers";
-  nativeBuildInputs = [ extra-cmake-modules pkg-config ];
+  nativeBuildInputs = [ extra-cmake-modules pkg-config wayland-scanner ];
   buildInputs = [
     kconfig
     knotifications

From 11ed329b6d7e702105e4f5a6ee59e14b957910c2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:21:14 +0000
Subject: [PATCH 116/235] plasma5Packages.plasma-workspace: depend on
 wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/plasma-workspace/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index af5edc2f7d01..70922f31557c 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, wayland-scanner
 , isocodes
 , libdbusmenu
 , libSM
@@ -74,7 +75,7 @@ mkDerivation {
   pname = "plasma-workspace";
   passthru.providedSessions = [ "plasma" "plasmawayland" ];
 
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     isocodes
     libdbusmenu

From 75ea55bdfe5ff3c0da716df76b5b75ad04d7bd85 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:21:37 +0000
Subject: [PATCH 117/235] plasma5Packages.xdg-desktop-portal-kde: depend on
 wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index cbda6124a319..e5822cb89803 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -2,6 +2,7 @@
 , extra-cmake-modules
 , gettext
 , kdoctools
+, wayland-scanner
 , cups
 , libepoxy
 , mesa
@@ -25,7 +26,7 @@
 
 mkDerivation {
   pname = "xdg-desktop-portal-kde";
-  nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules gettext kdoctools wayland-scanner ];
   buildInputs = [
     cups
     libepoxy

From bc10b4260d0f4826f553b967ad87712ba6d85921 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 Feb 2023 22:59:48 +0000
Subject: [PATCH 118/235] python3.pkgs.pywayland: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/qt-video-wlr/default.nix       | 3 ++-
 pkgs/development/python-modules/pywayland/default.nix | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix
index 4ebd059c9274..dc634a8f2ad8 100644
--- a/pkgs/applications/misc/qt-video-wlr/default.nix
+++ b/pkgs/applications/misc/qt-video-wlr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt, wayland-scanner }:
 let
  gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
      gstreamer
@@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
     cmake # only used for find layer-shell-qt
     ninja
     wrapQtAppsHook
+    wayland-scanner
   ];
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix
index 35e3fe6133e4..f07d855fd615 100644
--- a/pkgs/development/python-modules/pywayland/default.nix
+++ b/pkgs/development/python-modules/pywayland/default.nix
@@ -6,6 +6,7 @@
   cffi,
   pkg-config,
   wayland,
+  wayland-scanner,
   pytestCheckHook,
 }:
 
@@ -19,7 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  depsBuildBuild = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config wayland-scanner ];
   propagatedNativeBuildInputs = [ cffi ];
   buildInputs = [ wayland ];
   propagatedBuildInputs = [ cffi ];

From e2c1352232b6c076b0008c99f5c8712ab4f529a2 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:53:45 +0000
Subject: [PATCH 119/235] river: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.

River also needs `wayland` itself in `buildInputs`.
---
 pkgs/by-name/ri/river/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 2291defb0c2e..2f3ed61976af 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -13,6 +13,7 @@
 , udev
 , wayland
 , wayland-protocols
+, wayland-scanner
 , wlroots_0_18
 , xwayland
 , zig_0_13
@@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    wayland
+    wayland-scanner
     xwayland
     zig_0_13.hook
   ]
@@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     pixman
     udev
+    wayland
     wayland-protocols
     wlroots_0_18
   ] ++ lib.optional xwaylandSupport libX11;

From 4fad15058d88b9bd77159829ae6667f2f4ac1b77 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Feb 2023 09:45:28 +0000
Subject: [PATCH 120/235] river-tag-overlay: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/river-tag-overlay/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix
index 63092e3586f9..af78bab02eac 100644
--- a/pkgs/applications/misc/river-tag-overlay/default.nix
+++ b/pkgs/applications/misc/river-tag-overlay/default.nix
@@ -1,5 +1,11 @@
-{ lib, stdenv, fetchFromSourcehut, fetchpatch
-, wayland, pixman, pkg-config, wayland-scanner
+{ lib
+, stdenv
+, fetchFromSourcehut
+, fetchpatch
+, wayland
+, pixman
+, pkg-config
+, wayland-scanner
 }:
 
 stdenv.mkDerivation rec {

From 07faca9bcbbd86b74158073b64d512bba61bd8ff Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:48:01 +0000
Subject: [PATCH 121/235] rofi-wayland: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/rofi/wayland.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index ecf0db9db9b0..ee0a183f6b5d 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , rofi-unwrapped
 , wayland-scanner
+, pkg-config
 , wayland-protocols
 , wayland
 }:
@@ -18,7 +19,8 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
     hash = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8=";
   };
 
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
+  depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols wayland-scanner ];
   buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
 
   meta = with lib; {

From c9492d8f34f56ab7b85990d4f05fbbbcb1eab42f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:43:43 +0000
Subject: [PATCH 122/235] squeekboard: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/applications/accessibility/squeekboard/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix
index 05d8af554a05..6d0864237282 100644
--- a/pkgs/applications/accessibility/squeekboard/default.nix
+++ b/pkgs/applications/accessibility/squeekboard/default.nix
@@ -10,6 +10,7 @@
 , gtk3
 , wayland
 , wayland-protocols
+, wayland-scanner
 , libbsd
 , libxml2
 , libxkbcommon
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     glib
-    wayland
+    wayland-scanner
     wrapGAppsHook3
     rustPlatform.cargoSetupHook
     cargo

From b21621aab578ffc344772f25336adef8cffc4dcf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:48:35 +0000
Subject: [PATCH 123/235] tofi: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/applications/misc/tofi/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix
index 076a5af3cf1c..c501c7acb573 100644
--- a/pkgs/applications/misc/tofi/default.nix
+++ b/pkgs/applications/misc/tofi/default.nix
@@ -28,7 +28,12 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [
-    meson ninja pkg-config scdoc wayland-protocols wayland-scanner
+    meson
+    ninja
+    pkg-config
+    scdoc
+    wayland-protocols
+    wayland-scanner
   ];
   buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ];
 

From aaafc00079e09f47e38bc25874e9535c4233f485 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 5 Aug 2024 22:19:26 +0300
Subject: [PATCH 124/235] vaapiIntel: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 .../libraries/intel-vaapi-driver/default.nix          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/development/libraries/intel-vaapi-driver/default.nix
index 5622ad158f91..9f9e2f2bbd40 100644
--- a/pkgs/development/libraries/intel-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/intel-vaapi-driver/default.nix
@@ -1,7 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
-, intel-gpu-tools, libdrm, libva
+{ lib, stdenv, fetchFromGitHub
+, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner
+, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
 , enableHybridCodec ? false, vaapi-intel-hybrid
-, enableGui ? true, libX11, libGL, wayland, libXext
+, enableGui ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +28,9 @@ stdenv.mkDerivation rec {
     (lib.enableFeature enableGui "wayland")
   ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
 
-  nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ];
+  nativeBuildInputs = [
+    autoreconfHook gnum4 pkg-config python3 wayland-scanner
+  ];
 
   buildInputs = [ intel-gpu-tools libdrm libva ]
     ++ lib.optionals enableGui [ libX11 libXext libGL wayland ]

From c5287193127ee57cd81a09803bdff40d08bc25b7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:50:26 +0000
Subject: [PATCH 125/235] vlc: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/by-name/vl/vlc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 7c8b1e646985..83154aa24906 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -79,6 +79,7 @@
 , unzip
 , wayland
 , wayland-protocols
+, wayland-scanner
 , wrapGAppsHook3
 , writeShellScript
 , xcbutilkeysyms
@@ -120,8 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals chromecastSupport [ protobuf ]
   ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ]
   ++ optionals waylandSupport [
-    wayland
-    wayland-protocols
+    wayland-scanner
   ];
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of

From 2e7aab8885807a40479e5d392fe399c7fee9cc2d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 10:02:33 +0000
Subject: [PATCH 126/235] vulkan-cts: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/tools/graphics/vulkan-cts/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix
index b4e6db869a34..8347e06518c6 100644
--- a/pkgs/tools/graphics/vulkan-cts/default.nix
+++ b/pkgs/tools/graphics/vulkan-cts/default.nix
@@ -91,6 +91,10 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   cmakeFlags = [
     # Fix cts cmake not coping with absolute install dirs
     "-DCMAKE_INSTALL_BINDIR=bin"

From 05f18e12098768b1b777617304dcd433c1fb5adc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 10:02:57 +0000
Subject: [PATCH 127/235] vulkan-tools: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/tools/graphics/vulkan-tools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index b507ed416c12..2f43f76584a9 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -17,6 +17,7 @@
 , vulkan-volk
 , wayland
 , wayland-protocols
+, wayland-scanner
 , moltenvk
 , AppKit
 , Cocoa
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
     libXrandr
     wayland
     wayland-protocols
+    wayland-scanner
   ] ++ lib.optionals stdenv.isDarwin [
     moltenvk
     moltenvk.dev
@@ -64,14 +66,13 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
 
-  env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER="${buildPackages.wayland-scanner}/bin/wayland-scanner";
+  env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "${lib.getBin buildPackages.wayland-scanner}/bin/wayland-scanner";
 
   cmakeFlags = [
     # Don't build the mock ICD as it may get used instead of other drivers, if installed
     "-DBUILD_ICD=OFF"
     # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
     "-DCMAKE_INSTALL_RPATH=${libraryPath}"
-    "-DPKG_CONFIG_EXECUTABLE=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
     "-DGLSLANG_INSTALL_DIR=${glslang}"
     # Hide dev warnings that are useless for packaging
     "-Wno-dev"

From 649aa5999b819d2f1a5928f829ea7852065e4f3e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 17:07:46 +0200
Subject: [PATCH 128/235] python312Packages.versioningit: migrate to
 pytest-cov-stub

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

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index c578f96e1883..68729dc107ba 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -10,6 +10,7 @@
   build,
   hatchling,
   pydantic,
+  pytest-cov-stub,
   pytest-mock,
   setuptools,
   git,
@@ -28,12 +29,6 @@ buildPythonPackage rec {
     hash = "sha256-sLpYblrwi4fb4zVAgpEKHQUCw2IC1JbhrmDvO0HuKcE=";
   };
 
-  postPatch = ''
-    substituteInPlace tox.ini \
-      --replace "--cov=versioningit" "" \
-      --replace "--cov-config=tox.ini" "" \
-      --replace "--no-cov-on-fail" ""
-  '';
 
   nativeBuildInputs = [ hatchling ];
 
@@ -47,6 +42,7 @@ buildPythonPackage rec {
     build
     hatchling
     pydantic
+    pytest-cov-stub
     pytest-mock
     setuptools
     git

From 3d856e4c3b978e7dbc0ed7c7035a4aa6df665c71 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 17:40:52 +0200
Subject: [PATCH 129/235] python312Packages.versioningit: 3.1.1 -> 3.1.2

https://versioningit.readthedocs.io/en/latest/changelog.html#v3-1-2-2024-07-20
---
 pkgs/development/python-modules/versioningit/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 68729dc107ba..9abbf8bba33b 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -19,17 +19,16 @@
 
 buildPythonPackage rec {
   pname = "versioningit";
-  version = "3.1.1";
+  version = "3.1.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sLpYblrwi4fb4zVAgpEKHQUCw2IC1JbhrmDvO0HuKcE=";
+    hash = "sha256-Tbg+2Z9WsH2DlAvuNEXKRsoSDRO2swTNtftE5apO3sA=";
   };
 
-
   nativeBuildInputs = [ hatchling ];
 
   propagatedBuildInputs =

From 750047954598fb7f4a89c922be2d4451a64a238a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 17:41:34 +0200
Subject: [PATCH 130/235] python312Packages.isal: 1.7.0 -> 1.7.0

https://github.com/pycompression/python-isal/blob/v1.7.0/CHANGELOG.rst
---
 .../python-modules/isal/default.nix            | 18 +++++++++++++++---
 .../python-modules/isal/version.patch          | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/isal/version.patch

diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix
index 795eacab36b0..3a7ca9a07a2b 100644
--- a/pkgs/development/python-modules/isal/default.nix
+++ b/pkgs/development/python-modules/isal/default.nix
@@ -2,9 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  substituteAll,
 
   # build-system
   setuptools,
+  versioningit,
 
   # native dependencies
   isa-l,
@@ -16,17 +18,27 @@
 
 buildPythonPackage rec {
   pname = "isal";
-  version = "1.6.1";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-isal";
     rev = "v${version}";
-    hash = "sha256-EhdKT2ftyU2zevFg9Yi3q2FVx0FmKwJMzszsK1NS3Qg=";
+    hash = "sha256-wasybbNWBa6Zd0JI2/lBNUkvEOY3/iBqsVWh/4WPM2s=";
   };
 
-  build-system = [ setuptools ];
+  patches = [
+    (substituteAll {
+      src = ./version.patch;
+      inherit version;
+    })
+  ];
+
+  build-system = [
+    setuptools
+    versioningit
+  ];
 
   buildInputs = [ isa-l ];
 
diff --git a/pkgs/development/python-modules/isal/version.patch b/pkgs/development/python-modules/isal/version.patch
new file mode 100644
index 000000000000..9a8500a12d46
--- /dev/null
+++ b/pkgs/development/python-modules/isal/version.patch
@@ -0,0 +1,16 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index bf5fe99..b559255 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,9 +2,8 @@
+ requires = ["setuptools>=64", "versioningit>=1.1.0"]
+ build-backend = "setuptools.build_meta"
+ 
+-[tool.versioningit.vcs]
+-method="git"
+-default-tag = "v0.0.0"
++[tool.versioningit]
++default-version = "@version@"
+ 
+ [tool.versioningit.write]
+ file = "src/isal/_version.py"

From 73af18ee3dfec4f4927dc8f8c33199c73b21a8b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 17:45:20 +0200
Subject: [PATCH 131/235] python312Packages.zlib-ng: 0.5.0 -> 0.5.0

https://github.com/pycompression/python-zlib-ng/blob/v0.5.0/CHANGELOG.rst
---
 .../python-modules/zlib-ng/default.nix           | 16 +++++++++++++---
 .../python-modules/zlib-ng/version.patch         | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/zlib-ng/version.patch

diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix
index d8c926c4729b..697a8405ecbd 100644
--- a/pkgs/development/python-modules/zlib-ng/default.nix
+++ b/pkgs/development/python-modules/zlib-ng/default.nix
@@ -2,10 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  substituteAll,
 
   # build-system
   cmake,
   setuptools,
+  versioningit,
 
   # native dependencies
   zlib-ng,
@@ -16,19 +18,27 @@
 
 buildPythonPackage rec {
   pname = "zlib-ng";
-  version = "0.4.3";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-zlib-ng";
     rev = "v${version}";
-    hash = "sha256-M0R39vUX3JMDEDJfsRzg1ipxbWJ/kl0FzW6ZUMXvGDs=";
+    hash = "sha256-H8Niz6BbmNCccNKHBfRma4SUt0RY846fCiHidEvcd5E=";
   };
 
-  nativeBuildInputs = [
+  patches = [
+    (substituteAll {
+      src = ./version.patch;
+      inherit version;
+    })
+  ];
+
+  build-system = [
     cmake
     setuptools
+    versioningit
   ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/zlib-ng/version.patch b/pkgs/development/python-modules/zlib-ng/version.patch
new file mode 100644
index 000000000000..e1f335525646
--- /dev/null
+++ b/pkgs/development/python-modules/zlib-ng/version.patch
@@ -0,0 +1,16 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 28ae41d..05ad409 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,9 +2,8 @@
+ requires = ["setuptools>=64", "versioningit>=1.1.0"]
+ build-backend = "setuptools.build_meta"
+ 
+-[tool.versioningit.vcs]
+-method="git"
+-default-tag = "v0.0.0"
++[tool.versioningit]
++default-version = "@version@"
+ 
+ [tool.versioningit.write]
+ file = "src/zlib_ng/_version.py"

From f61999af9c8f176bbf963ebcb0d53aa55c911c96 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Aug 2024 18:04:54 +0200
Subject: [PATCH 132/235] python312Packages.aiohttp-isal: drop

"This library is obsolete and replaced by https://github.com/bdraco/aiohttp-fast-zlib"
---
 .../python-modules/aiohttp-isal/default.nix   | 51 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/aiohttp-isal/default.nix

diff --git a/pkgs/development/python-modules/aiohttp-isal/default.nix b/pkgs/development/python-modules/aiohttp-isal/default.nix
deleted file mode 100644
index a518d2431c77..000000000000
--- a/pkgs/development/python-modules/aiohttp-isal/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  poetry-core,
-
-  # dependencies
-  aiohttp,
-  isal,
-
-  # tests
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "aiohttp-isal";
-  version = "0.3.2";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "bdraco";
-    repo = "aiohttp-isal";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-sAtAzqMJoKryhB8q/TxqgFE+Z4Uxxw0hghk/Y2VNvx0=";
-  };
-
-  build-system = [ poetry-core ];
-
-  dependencies = [
-    aiohttp
-    isal
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  preCheck = ''
-    sed -i '/addopts/d' pyproject.toml
-  '';
-
-  pythonImportsCheck = [ "aiohttp_isal" ];
-
-  meta = with lib; {
-    changelog = "https://github.com/bdraco/aiohttp-isal/blob/${src.rev}/CHANGELOG.md";
-    description = "Isal support for aiohttp";
-    homepage = "https://github.com/bdraco/aiohttp-isal";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b6ad1e3e8f43..0be2f1a7c543 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -38,6 +38,7 @@ mapAliases ({
   acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
   adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
   aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
+  aiohttp-isal = throw "aiohttp-isal has been removed, as it has been archived and replace by aiohttp-fast-zlib"; # Added 2024-08-11
   aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
   aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c24f453d6f9a..02a1dad7e43a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -247,8 +247,6 @@ self: super: with self; {
 
   aiohttp-fast-zlib = callPackage ../development/python-modules/aiohttp-fast-zlib { };
 
-  aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { };
-
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
   aiohttp-middlewares = callPackage ../development/python-modules/aiohttp-middlewares { };

From d474d6efe28a0805f9b63a5deeb1f5177f13207c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:23:50 +0000
Subject: [PATCH 133/235] waffle: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.

Also, add pkg-config to depsBuildBuild to fix cross.
---
 pkgs/development/libraries/waffle/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix
index 361c1e17336a..9dccdb9dded3 100644
--- a/pkgs/development/libraries/waffle/default.nix
+++ b/pkgs/development/libraries/waffle/default.nix
@@ -11,7 +11,7 @@
 , pkg-config
 , python3
 , x11Support ? true, libxcb, libX11
-, waylandSupport ? true, wayland, wayland-protocols
+, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner
 , useGbm ? true, mesa, udev
 }:
 
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
     mesa
   ];
 
+  depsBuildBuild = [ pkg-config ];
+
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [
@@ -52,6 +54,8 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
+  ] ++ lib.optionals waylandSupport [
+    wayland-scanner
   ];
 
   PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";

From f043fe4abb790c9ecaed3e784304b3f8fab78b17 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 10 Feb 2023 12:01:40 +0000
Subject: [PATCH 134/235] way-displays: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/tools/wayland/way-displays/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix
index 62f4e3e62b25..0d694bc5029a 100644
--- a/pkgs/tools/wayland/way-displays/default.nix
+++ b/pkgs/tools/wayland/way-displays/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , pkg-config
+, wayland-scanner
 , wayland
 , libinput
 , yaml-cpp
@@ -20,9 +21,13 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     pkg-config
-    wayland
+    wayland-scanner
   ];
 
   buildInputs = [

From e22928181e64383ee4fa45d5436dd3998419dd60 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:48:49 +0000
Subject: [PATCH 135/235] waylock: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
---
 pkgs/by-name/wa/waylock/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index c6c6c0b0cfd3..fe5d024585a3 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -8,6 +8,7 @@
   pkg-config,
   scdoc,
   wayland,
+  wayland-scanner,
   wayland-protocols,
   zig_0_12,
 }:
@@ -30,11 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     scdoc
-    wayland
+    wayland-scanner
     zig_0_12.hook
   ];
 
   buildInputs = [
+    wayland
     wayland-protocols
     libxkbcommon
     pam

From b46f93f04b8eaca6f5171bf005ce6df0e3145efa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 11:24:23 +0000
Subject: [PATCH 136/235] webkitgtk: depend on wayland-scanner

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.

The previous explicit -DWAYLAND_SCANNER= is removed - the binary is in
a separate bin output and it works out of the box just with
wayland-scanner in nativeBuildInputs.
---
 .../libraries/webkitgtk/default.nix           | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index b1fb3231a2b6..d26f6902ca16 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -20,6 +20,7 @@
 , gtk3
 , wayland
 , wayland-protocols
+, wayland-scanner
 , libwebp
 , enchant2
 , xorg
@@ -117,6 +118,8 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
     glib # for gdbus-codegen
     unifdef
+  ] ++ lib.optionals stdenv.isLinux [
+    wayland-scanner
   ];
 
   buildInputs = [
@@ -186,34 +189,35 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup
   ];
 
-  cmakeFlags = let
-    cmakeBool = x: if x then "ON" else "OFF";
-  in [
-    "-DENABLE_INTROSPECTION=ON"
-    "-DPORT=GTK"
-    "-DUSE_LIBHYPHEN=OFF"
-    "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
-    "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
-    "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
-  ] ++ lib.optionals stdenv.isLinux [
-    # Have to be explicitly specified when cross.
-    # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
-    "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
-    "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
-    "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "-DENABLE_GAMEPAD=OFF"
-    "-DENABLE_GTKDOC=OFF"
-    "-DENABLE_MINIBROWSER=OFF"
-    "-DENABLE_QUARTZ_TARGET=ON"
-    "-DENABLE_X11_TARGET=OFF"
-    "-DUSE_APPLE_ICU=OFF"
-    "-DUSE_OPENGL_OR_ES=OFF"
-  ] ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [
-    "-DUSE_GTK4=OFF"
-  ] ++ lib.optionals (!systemdSupport) [
-    "-DENABLE_JOURNALD_LOG=OFF"
-  ];
+  cmakeFlags =
+    let
+      cmakeBool = x: if x then "ON" else "OFF";
+    in
+    [
+      "-DENABLE_INTROSPECTION=ON"
+      "-DPORT=GTK"
+      "-DUSE_LIBHYPHEN=OFF"
+      "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
+      "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
+      "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
+    ] ++ lib.optionals stdenv.isLinux [
+      # Have to be explicitly specified when cross.
+      # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
+      "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
+      "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
+    ] ++ lib.optionals stdenv.isDarwin [
+      "-DENABLE_GAMEPAD=OFF"
+      "-DENABLE_GTKDOC=OFF"
+      "-DENABLE_MINIBROWSER=OFF"
+      "-DENABLE_QUARTZ_TARGET=ON"
+      "-DENABLE_X11_TARGET=OFF"
+      "-DUSE_APPLE_ICU=OFF"
+      "-DUSE_OPENGL_OR_ES=OFF"
+    ] ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [
+      "-DUSE_GTK4=OFF"
+    ] ++ lib.optionals (!systemdSupport) [
+      "-DENABLE_JOURNALD_LOG=OFF"
+    ];
 
   postPatch = ''
     patchShebangs .

From 2aa25051f757220e2433a8a7660f219bc895f405 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 11 Feb 2023 09:56:02 +0000
Subject: [PATCH 137/235] wio: depend on wayland-scanner

Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
---
 pkgs/by-name/wi/wio/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix
index 5982f80cef36..b41db6fcf2a3 100644
--- a/pkgs/by-name/wi/wio/package.nix
+++ b/pkgs/by-name/wi/wio/package.nix
@@ -10,6 +10,7 @@
 , meson
 , ninja
 , pkg-config
+, wayland-scanner
 , udev
 , unstableGitUpdater
 , wayland
@@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

From 9876c2fe9e90b49f693da628e8b8b696ec5f63a4 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sun, 11 Aug 2024 14:42:42 +0000
Subject: [PATCH 138/235] stdenv: concatStringsSep: test sep="&"

The test fails without 64eaa6318185fe0c3e54b0e4e0f2d5b12ebe34ab
("stdenv: concatStringsSep: quote ${sep}")

Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
---
 pkgs/test/stdenv/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index a6885d65cea8..a5b571b5a9f4 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -136,18 +136,21 @@ let
       {
         inherit name;
 
+        # NOTE: Testing with "&" as separator is intentional, because unquoted
+        # "&" has a special meaning in the "${var//pattern/replacement}" syntax.
+        # Cf. https://github.com/NixOS/nixpkgs/pull/318614#discussion_r1706191919
         passAsFile = [ "buildCommand" ];
         buildCommand = ''
           declare -A associativeArray=(["X"]="Y")
           [[ $(concatStringsSep ";" associativeArray 2>&1) =~ "trying to use" ]] || (echo "concatStringsSep did not throw concatenating associativeArray" && false)
 
           string="lorem ipsum dolor sit amet"
-          stringWithSep="$(concatStringsSep ";" string)"
-          [[ "$stringWithSep" == "lorem;ipsum;dolor;sit;amet" ]] || (echo "'\$stringWithSep' was not 'lorem;ipsum;dolor;sit;amet'" && false)
+          stringWithSep="$(concatStringsSep "&" string)"
+          [[ "$stringWithSep" == "lorem&ipsum&dolor&sit&amet" ]] || (echo "'\$stringWithSep' was not 'lorem&ipsum&dolor&sit&amet'" && false)
 
           array=("lorem ipsum" "dolor" "sit amet")
-          arrayWithSep="$(concatStringsSep ";" array)"
-          [[ "$arrayWithSep" == "lorem ipsum;dolor;sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum;dolor;sit amet'" && false)
+          arrayWithSep="$(concatStringsSep "&" array)"
+          [[ "$arrayWithSep" == "lorem ipsum&dolor&sit amet" ]] || (echo "'\$arrayWithSep' was not 'lorem ipsum&dolor&sit amet'" && false)
 
           touch $out
         '';

From 7536a7fec9ec2809c6c1ec4b42495d8caf288f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 12 Aug 2024 03:27:11 -0700
Subject: [PATCH 139/235] python312Packages.aiohttp: 3.10.2 -> 3.10.3

Diff: https://github.com/aio-libs/aiohttp/compare/refs/tags/v3.10.2...v3.10.3

Changelog: https://github.com/aio-libs/aiohttp/blob/v3.10.3/CHANGES.rst
---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index e54494b7907a..c96f0b1384e7 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.10.2";
+  version = "3.10.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiohttp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jetgFHFD9l2hW7FWbGESM6Tqeav+2rM8C2TCV0bPJwU=";
+    hash = "sha256-3dWd/IcCiPI3Ral6ULEUzOEOLkcdWVreDn7EI6eEy2k=";
   };
 
   patches = [

From 84e2939d825b11505f4f3cdc8722e1444004ac46 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Aug 2024 02:04:41 +0200
Subject: [PATCH 140/235] rust-cbindgen: 0.26.0 -> 0.27.0

https://github.com/mozilla/cbindgen/blob/v0.27.0/CHANGES
---
 pkgs/development/tools/rust/cbindgen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 1e4d755fde0b..fe8566e7da56 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cbindgen";
     rev = "v${version}";
-    hash = "sha256-gyNZAuxpeOjuC+Rh9jAyHSBQRRYUlYoIrBKuCFg3Hao=";
+    hash = "sha256-XTGHHD5Qw3mr+lkPKOXyqb0K3sEENW8Sf0n9mtrFFXI=";
   };
 
-  cargoHash = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc=";
+  cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 

From c791dc612605cfa5d2a000a77a0db6d9fe9b1c60 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Aug 2024 03:47:28 +0200
Subject: [PATCH 141/235] buildMozillaMach: prune patches

These do not apply to any version we carry any longer.
---
 .../firefox/122.0-libvpx-mozbz1875201.patch   | 80 -------------------
 .../networking/browsers/firefox/common.nix    | 33 +-------
 2 files changed, 4 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch

diff --git a/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch b/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch
deleted file mode 100644
index 4acf0fa6a7fc..000000000000
--- a/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-This patch is a rebase of https://bugzilla.mozilla.org/attachment.cgi?id=9377318
-on top of Firefox 122.0.
-
-Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1875201
-
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index c5dabce8b0..e325905282 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/third_party/libwebrtc/",
-     "/third_party/libwebrtc/third_party/abseil-cpp/",
-     "/tools/profiler/public"
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 77a6b3870b..d515bc0595 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/media/libyuv/",
-     "/media/libyuv/libyuv/include/",
-     "/third_party/libwebrtc/",
-diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 4bece72807..5cc8d30e1a 100644
---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -5,6 +5,8 @@
- 
-   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
-   ### DO NOT edit it by hand.                                       ###
-+if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
-+    LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ]
- 
- COMPILE_FLAGS["OS_INCLUDES"] = []
- AllowCompilerWarnings()
-@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [
-     "!/ipc/ipdl/_ipdlheaders",
-     "!/third_party/libwebrtc/gen",
-     "/ipc/chromium/src",
--    "/media/libvpx/libvpx/",
-     "/media/libyuv/",
-     "/media/libyuv/libyuv/include/",
-     "/third_party/libwebrtc/",
-diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
-index 7baea55b7e..86d4f0f288 100644
---- a/third_party/libwebrtc/moz.build
-+++ b/third_party/libwebrtc/moz.build
-@@ -436,7 +436,6 @@ DIRS += [
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn",
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn",
-     "/third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn",
--    "/third_party/libwebrtc/third_party/libvpx/libvpx_gn",
-     "/third_party/libwebrtc/third_party/libyuv/libyuv_gn",
-     "/third_party/libwebrtc/third_party/pffft/pffft_gn",
-     "/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn",
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4d28004a0d0d..438f0c3078d5 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -234,32 +234,10 @@ buildStdenv.mkDerivation {
     "profilingPhase"
   ];
 
-  patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [
-    # dbus cflags regression fix
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083
-    (fetchpatch {
-      url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3";
-      hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI=";
-    })
-  ]
-  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
-  ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch
-  ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch
-  ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [
-    (fetchpatch {
-      # Do not crash on systems without an expected statically assumed page size.
-      # https://phabricator.services.mozilla.com/D194458
-      name = "mozbz1866025.patch";
-      url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951";
-      hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
-    })
-  ]
-  ++ lib.optionals (lib.versionOlder version "122") [
-    ./bindgen-0.64-clang-18.patch
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
-    ./122.0-libvpx-mozbz1875201.patch
-  ]
+  patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
+  ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
+  ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch  ]
   ++ lib.optionals (lib.versionOlder version "123") [
     (fetchpatch {
       name = "clang-18.patch";
@@ -267,9 +245,6 @@ buildStdenv.mkDerivation {
       hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
     })
   ]
-  ++ lib.optionals (lib.versionOlder version "115.12") [
-    ./rust-1.78.patch
-  ]
   ++ extraPatches;
 
   postPatch = ''

From ec0a59d44c8fc1c5bfa36c7d833f0287085b1824 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Aug 2024 04:00:56 +0200
Subject: [PATCH 142/235] buildMozillaMach: backport cbindgen 0.27.0 compat

The preliminary assumption is that this will land in 131 and then get
backported into the ESR releases. I don't plan to guess the correct
version boundaries at this time.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 438f0c3078d5..47937c661dbf 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -237,6 +237,14 @@ buildStdenv.mkDerivation {
   patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
   ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
   ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
+  ++ lib.optionals (lib.versionOlder version "131") [
+    (fetchpatch {
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
+      name = "cbindgen-0.27.0-compat.patch";
+      url = "https://hg.mozilla.org/integration/autoland/raw-rev/98cd34c7ff57";
+      hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug=";
+    })
+  ]
   ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch  ]
   ++ lib.optionals (lib.versionOlder version "123") [
     (fetchpatch {

From 46fac414355bca03e226a4c0d4717ee04a242ccd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 12 Aug 2024 04:06:07 +0200
Subject: [PATCH 143/235] rust-cbindgen: test firefox and mesa in passthru

---
 pkgs/development/tools/rust/cbindgen/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index fe8566e7da56..95dacabcf5d2 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -5,6 +5,11 @@
 , cmake
 , python3Packages
 , Security
+
+# tests
+, firefox-unwrapped
+, firefox-esr-unwrapped
+, mesa
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -41,6 +46,14 @@ rustPlatform.buildRustPackage rec {
     "--skip test_body"
   ];
 
+  passthru.tests = {
+    inherit
+      firefox-unwrapped
+      firefox-esr-unwrapped
+      mesa
+    ;
+  };
+
   meta = with lib; {
     changelog = "https://github.com/mozilla/cbindgen/blob/v${version}/CHANGES";
     description = "Project for generating C bindings from Rust code";

From f5846d25a1335267bc8bad633ffcbdf2109b18dc Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 8 Aug 2024 12:09:14 +0200
Subject: [PATCH 144/235] nodejs: skip tests failing in sandbox in all
 platforms

ce685a8422 added list of tests failing on sandbox, but for some reason
only for Darwin. We should skip those tests on all platforms otherwise
OfBorg builds are failing.
---
 pkgs/development/web/nodejs/nodejs.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index a589757664e1..96c8d9f64551 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -286,11 +286,6 @@ let
         "test-tls-cli-max-version-1.3"
         "test-tls-client-auth"
         "test-tls-sni-option"
-      ] ++ lib.optionals stdenv.buildPlatform.isDarwin [
-        # Disable tests that don’t work under macOS sandbox.
-        "test-macos-app-sandbox"
-        "test-os"
-        "test-os-process-priority"
         # This is a bit weird, but for some reason fs watch tests fail with
         # sandbox.
         "test-fs-promises-watch"
@@ -311,6 +306,11 @@ let
         "test-runner-run"
         "test-runner-watch-mode"
         "test-watch-mode-files_watcher"
+      ] ++ lib.optionals stdenv.buildPlatform.isDarwin [
+        # Disable tests that don’t work under macOS sandbox.
+        "test-macos-app-sandbox"
+        "test-os"
+        "test-os-process-priority"
       ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
         # These tests fail on x86_64-darwin (even without sandbox).
         # TODO: revisit at a later date.

From 35b556d314ff99940619f4f16920542fd5b8f972 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 24 Jul 2024 15:37:15 +0200
Subject: [PATCH 145/235] nodejs_20: 20.15.1 -> 20.16.0

---
 pkgs/development/web/nodejs/v20.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index ae031708f6a7..1aa0fbf72e8d 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -12,8 +12,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.15.1";
-  sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=";
+  version = "20.16.0";
+  sha256 = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
@@ -21,14 +21,6 @@ buildNodejs {
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch";
-      hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
-      hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
-    })
     (fetchpatch2 {
       url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch";
       hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8=";

From 921bd99f8de553bd45be0ed298619589f2b7fee4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 6 Feb 2023 10:09:55 +0000
Subject: [PATCH 146/235] wayland-scanner: split from wayland
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've used a wayland-scanner = wayland.bin alias for ages, to make
packages clearer and allow them to be independently overridden.
Going the whole way into splitting them into separate packages is
useful because it means we can have different meta.platforms
attributes for libwayland and wayland-scanner.

There is no duplication in outputs between the two packages — they
don't install any files in common.

Since we're no longer pulling just one output into nativeBuildInputs
of packages using wayland-scanner, we can use upstream's
wayland-scanner.pc, which gets installed into the dev output, rather
than providing our own.
---
 .../window-managers/owl/default.nix           |  2 -
 .../development/libraries/wayland/default.nix | 43 +++--------------
 .../libraries/wayland/protocols.nix           |  6 ++-
 .../development/libraries/wayland/scanner.nix | 48 +++++++++++++++++++
 .../python-modules/pywayland/default.nix      |  2 +-
 pkgs/tools/graphics/mesa-demos/default.nix    |  9 ++--
 pkgs/top-level/all-packages.nix               |  2 +-
 7 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/development/libraries/wayland/scanner.nix

diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix
index 2bef1b024b3e..812e65830b33 100644
--- a/pkgs/applications/window-managers/owl/default.nix
+++ b/pkgs/applications/window-managers/owl/default.nix
@@ -9,8 +9,6 @@
 , darwin
 }:
 
-assert wayland.withLibraries;
-
 let
   stdenv = clangStdenv;
 in
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 5a78a5c993ef..8398dce70790 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -5,13 +5,10 @@
 , pkg-config
 , ninja
 , wayland-scanner
-, expat
-, libxml2
-, withLibraries ? stdenv.isLinux || stdenv.isDarwin
 , withTests ? stdenv.isLinux
 , libffi
 , epoll-shim
-, withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
+, withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
 , graphviz-nox
 , doxygen
 , libxslt
@@ -23,15 +20,6 @@
 , testers
 }:
 
-# Documentation is only built when building libraries.
-assert withDocumentation -> withLibraries;
-
-# Tests are only built when building libraries.
-assert withTests -> withLibraries;
-
-let
-  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland";
   version = "1.23.0";
@@ -53,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i '/os-wrappers-test/d' tests/meson.build
   '';
 
-  outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
+  outputs = [ "out" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
   separateDebugInfo = true;
 
   mesonFlags = [
-    "-Ddocumentation=${lib.boolToString withDocumentation}"
-    "-Dlibraries=${lib.boolToString withLibraries}"
-    "-Dtests=${lib.boolToString withTests}"
+    (lib.mesonBool "documentation" withDocumentation)
+    (lib.mesonBool "tests" withTests)
+    (lib.mesonBool "scanner" false) # wayland-scanner is a separate derivation
   ];
 
   depsBuildBuild = [
@@ -70,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     pkg-config
     ninja
-  ] ++ lib.optionals isCross [
     wayland-scanner
   ] ++ lib.optionals withDocumentation [
     (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
@@ -83,11 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    expat
-    libxml2
-  ] ++ lib.optionals withLibraries [
     libffi
-  ] ++ lib.optionals (withLibraries && !stdenv.hostPlatform.isLinux) [
+  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     epoll-shim
   ] ++ lib.optionals withDocumentation [
     docbook_xsl
@@ -95,20 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_42
   ];
 
-  postFixup = ''
-    # The pkg-config file is required for cross-compilation:
-    mkdir -p $bin/lib/pkgconfig/
-    cat <<EOF > $bin/lib/pkgconfig/wayland-scanner.pc
-    wayland_scanner=$bin/bin/wayland-scanner
-
-    Name: Wayland Scanner
-    Description: Wayland scanner
-    Version: ${finalAttrs.version}
-    EOF
-  '';
-
   passthru = {
-    inherit withLibraries;
     tests.pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;
     };
@@ -130,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos codyopel qyliss ];
     pkgConfigModules = [
-      "wayland-scanner"
-    ] ++ lib.optionals withLibraries [
       "wayland-client"
       "wayland-cursor"
       "wayland-egl"
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index ca1e84b1c609..a341fed9e6be 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
   pname = "wayland-protocols";
   version = "1.36";
 
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform &&
   # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries;
+  stdenv.hostPlatform.linker == "bfd" && lib.meta.availableOn stdenv.hostPlatform wayland;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
@@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ meson ninja wayland-scanner ];
-  nativeCheckInputs = [ python3 wayland ];
+  nativeCheckInputs = [ python3 ];
+  checkInputs = [ wayland ];
 
   mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ];
 
diff --git a/pkgs/development/libraries/wayland/scanner.nix b/pkgs/development/libraries/wayland/scanner.nix
new file mode 100644
index 000000000000..946b73468c57
--- /dev/null
+++ b/pkgs/development/libraries/wayland/scanner.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  wayland,
+  meson,
+  pkg-config,
+  ninja,
+  wayland-scanner,
+  expat,
+  libxml2,
+}:
+
+stdenv.mkDerivation {
+  pname = "wayland-scanner";
+  inherit (wayland) version src;
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
+  separateDebugInfo = true;
+
+  mesonFlags = [
+    (lib.mesonBool "documentation" false)
+    (lib.mesonBool "libraries" false)
+    (lib.mesonBool "tests" false)
+  ];
+
+  depsBuildBuild = [ pkg-config ];
+
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    ninja
+  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) wayland-scanner;
+
+  buildInputs = [
+    expat
+    libxml2
+  ];
+
+  meta = with lib; {
+    inherit (wayland.meta) homepage license maintainers;
+    description = "C code generator for Wayland protocol XML files";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix
index f07d855fd615..4dc2fb89330d 100644
--- a/pkgs/development/python-modules/pywayland/default.nix
+++ b/pkgs/development/python-modules/pywayland/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   };
 
   depsBuildBuild = [ pkg-config ];
-  nativeBuildInputs = [ pkg-config wayland-scanner ];
+  nativeBuildInputs = [ wayland-scanner ];
   propagatedNativeBuildInputs = [ cffi ];
   buildInputs = [ wayland ];
   propagatedBuildInputs = [ cffi ];
diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix
index 3bbc20bc4cad..dca8bf0950c7 100644
--- a/pkgs/tools/graphics/mesa-demos/default.nix
+++ b/pkgs/tools/graphics/mesa-demos/default.nix
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs=";
   };
 
-  strictDeps = true;
-
   depsBuildBuild = [
     pkg-config
   ];
@@ -57,9 +55,10 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dwith-system-data-files=true"
-    "-Dgles1=disabled"
-    "-Dosmesa=disabled"
+    "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}"
+    (lib.mesonEnable "libdrm" (stdenv.isLinux))
+    (lib.mesonEnable "osmesa" (mesa ? osmesa))
+    (lib.mesonEnable "wayland" (lib.meta.availableOn stdenv.hostPlatform wayland))
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbad110c06ac..4b8c4a636183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24271,7 +24271,7 @@ with pkgs;
   wavpack = callPackage ../development/libraries/wavpack { };
 
   wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
-  wayland-scanner = wayland.bin;
+  wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };
 
   wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
 

From 26a4a052bae1fb8eb83f5078442bb3eb963eabec Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 23 Apr 2023 11:04:34 +0000
Subject: [PATCH 147/235] clightd: fix cross

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

diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 7283cc32640e..27f4e0e1ebab 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    dbus
     cmake
     pkg-config
     wayland-scanner
   ];
 
   buildInputs = with lib; [
+    dbus
     glib
     udev
     polkit

From dbffd9be779fb4257e58f837e1cd05c660b5999d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 11 Aug 2024 12:43:06 +0300
Subject: [PATCH 148/235] freerdp: don't set WAYLAND_SCANNER explicitly

This is in fact wrong since moving the binary to the `bin` output, and
works just fine only with it in `nativeBuildInputs`.
---
 pkgs/applications/networking/remote/freerdp/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index e2b974a41e40..988986812e30 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -167,7 +167,6 @@ stdenv.mkDerivation rec {
     "-Wno-dev"
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
-    "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
   ]
   ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
     BUILD_TESTING = false; # false is recommended by upstream

From 4509215980a0ddd025b04a5667e9b67802de1bb4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 11 Aug 2024 12:47:04 +0300
Subject: [PATCH 149/235] freerdp3: don't set WAYLAND_SCANNER explicitly

This is in fact wrong since moving the binary to the `bin` output, and
works just fine only with it in `nativeBuildInputs`.

Also, add wayland-scanner to buildInputs, so the pkg-config machinery
does discover it.
---
 pkgs/applications/networking/remote/freerdp/3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix
index 0637526d1616..e7ce194119e6 100644
--- a/pkgs/applications/networking/remote/freerdp/3.nix
+++ b/pkgs/applications/networking/remote/freerdp/3.nix
@@ -145,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     fuse3
     systemd
     wayland
+    wayland-scanner
   ] ++ lib.optionals stdenv.isDarwin [
     AudioToolbox
     AVFoundation
@@ -160,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-Wno-dev"
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
-    "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
   ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
     BUILD_TESTING = false; # false is recommended by upstream
     WITH_CAIRO = (cairo != null);

From 0b16a47cd2031b6433c6e2dc733c565049cd433a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 11 Aug 2024 20:40:07 +0300
Subject: [PATCH 150/235] gamescope: fix cross

This needs to be buildPackages.patchelfUnstable, as it's executed by the
build platform, during the build.
---
 pkgs/by-name/ga/gamescope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 8ab745ec4588..bae7cd700ba1 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -1,4 +1,5 @@
 { stdenv
+, buildPackages
 , edid-decode
 , fetchFromGitHub
 , meson
@@ -31,7 +32,6 @@
 , lcms
 , lib
 , makeBinaryWrapper
-, patchelfUnstable
 , nix-update-script
 , enableExecutable ? true
 , enableWsi ? true
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = lib.optionalString enableExecutable ''
     # using patchelf unstable because the stable version corrupts the binary
-    ${lib.getExe patchelfUnstable} $out/bin/gamescope \
+    ${lib.getExe buildPackages.patchelfUnstable} $out/bin/gamescope \
       --add-rpath ${vulkan-loader}/lib --add-needed libvulkan.so.1
 
     # --debug-layers flag expects these in the path

From efaee7c99bfef7b6d35b86a560a22685e9c47454 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 12 Aug 2024 21:35:49 +0300
Subject: [PATCH 151/235] wayland-scanner: set mainProgram

---
 pkgs/development/libraries/wayland/scanner.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/wayland/scanner.nix b/pkgs/development/libraries/wayland/scanner.nix
index 946b73468c57..d826901d01e6 100644
--- a/pkgs/development/libraries/wayland/scanner.nix
+++ b/pkgs/development/libraries/wayland/scanner.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     inherit (wayland.meta) homepage license maintainers;
+    mainProgram = "wayland-scanner";
     description = "C code generator for Wayland protocol XML files";
     platforms = platforms.unix;
   };

From 1120942b912c00c3e2ba606bec5315bb29fe7371 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 12 Aug 2024 21:36:00 +0300
Subject: [PATCH 152/235] vulkan-tools: use lib.getExe

---
 pkgs/tools/graphics/vulkan-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 2f43f76584a9..19d1597b72d0 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
 
-  env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = "${lib.getBin buildPackages.wayland-scanner}/bin/wayland-scanner";
+  env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner;
 
   cmakeFlags = [
     # Don't build the mock ICD as it may get used instead of other drivers, if installed

From f5b3dd7ab2d2850da6e95ec4a0b9c7d14a30380b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 28 Jul 2024 20:17:56 +0100
Subject: [PATCH 153/235] libheif: 1.18.0 -> 1.18.2

Changes:
- https://github.com/strukturag/libheif/releases/tag/v1.18.1
- https://github.com/strukturag/libheif/releases/tag/v1.18.2
---
 pkgs/development/libraries/libheif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index b3f22bb2b51f..1b9c0c0768c3 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libheif";
-  version = "1.18.0";
+  version = "1.18.2";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "strukturag";
     repo = "libheif";
     rev = "v${version}";
-    sha256 = "sha256-3au6xCJd1kP6qJI6TBeWJ2ittCqE0QvmSYxWYcgPOcw=";
+    hash = "sha256-Z21E2b4E9jGtwR1RpFMAbGsWFw6jXn++WexlzdoyZzE=";
   };
 
   nativeBuildInputs = [

From f28114421f4d0e6fd3a1b7ea5417b3f92877a07f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:30:46 -0700
Subject: [PATCH 154/235] libwacom: nixfmt

---
 .../libraries/libwacom/default.nix            | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 0e9a0d54e178..281b23cfe1aa 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,22 +1,26 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, meson
-, ninja
-, glib
-, pkg-config
-, udev
-, libevdev
-, libgudev
-, python3
-, valgrind
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  glib,
+  pkg-config,
+  udev,
+  libevdev,
+  libgudev,
+  python3,
+  valgrind,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libwacom";
   version = "2.12.2";
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   src = fetchFromGitHub {
     owner = "linuxwacom";
@@ -43,9 +47,10 @@ stdenv.mkDerivation rec {
     libgudev
   ];
 
-  doCheck = stdenv.hostPlatform == stdenv.buildPlatform
-            && lib.meta.availableOn stdenv.hostPlatform valgrind
-            && !stdenv.hostPlatform.isPower  # one test times out
+  doCheck =
+    stdenv.hostPlatform == stdenv.buildPlatform
+    && lib.meta.availableOn stdenv.hostPlatform valgrind
+    && !stdenv.hostPlatform.isPower # one test times out
   ;
 
   mesonFlags = [
@@ -55,11 +60,13 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = [
     valgrind
-    (python3.withPackages (ps: with ps; [
-      ps.libevdev
-      pytest
-      pyudev
-    ]))
+    (python3.withPackages (
+      ps: with ps; [
+        ps.libevdev
+        pytest
+        pyudev
+      ]
+    ))
   ];
 
   meta = with lib; {

From 1bab863789dafb7bc5fb149d1f4fbb70319f3ddb Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:31:04 -0700
Subject: [PATCH 155/235] libwacom-surface: nixfmt

---
 .../libraries/libwacom/surface.nix            | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix
index 0d6ec49a6a5b..73f1e5549ea9 100644
--- a/pkgs/development/libraries/libwacom/surface.nix
+++ b/pkgs/development/libraries/libwacom/surface.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, libwacom
+{
+  lib,
+  fetchFromGitHub,
+  libwacom,
 }:
 
 let
@@ -10,29 +11,32 @@ let
     rev = "v2.12.0-1";
     hash = "sha256-z/qNXbe89/0GIDj0BDQY6xdjHKA9chAPpviHPtBLjFM=";
   };
-in libwacom.overrideAttrs (old: {
+in
+libwacom.overrideAttrs (old: {
   pname = "libwacom-surface";
 
   # These patches will not be included upstream:
   # https://github.com/linux-surface/libwacom/issues/2
-  patches = old.patches or [ ] ++ map (p: "${libwacom-surface}/patches/v2/${p}") [
-    "0001-Add-support-for-BUS_VIRTUAL.patch"
-    "0002-Add-support-for-Intel-Management-Engine-bus.patch"
-    "0003-data-Add-Microsoft-Surface-Pro-3.patch"
-    "0004-data-Add-Microsoft-Surface-Pro-4.patch"
-    "0005-data-Add-Microsoft-Surface-Pro-5.patch"
-    "0006-data-Add-Microsoft-Surface-Pro-6.patch"
-    "0007-data-Add-Microsoft-Surface-Pro-7.patch"
-    "0008-data-Add-Microsoft-Surface-Pro-7.patch"
-    "0009-data-Add-Microsoft-Surface-Pro-8.patch"
-    "0010-data-Add-Microsoft-Surface-Pro-9.patch"
-    "0011-data-Add-Microsoft-Surface-Book.patch"
-    "0012-data-Add-Microsoft-Surface-Book-2-13.5.patch"
-    "0013-data-Add-Microsoft-Surface-Book-2-15.patch"
-    "0014-data-Add-Microsoft-Surface-Book-3-13.5.patch"
-    "0015-data-Add-Microsoft-Surface-Book-3-15.patch"
-    "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
-  ];
+  patches =
+    old.patches or [ ]
+    ++ map (p: "${libwacom-surface}/patches/v2/${p}") [
+      "0001-Add-support-for-BUS_VIRTUAL.patch"
+      "0002-Add-support-for-Intel-Management-Engine-bus.patch"
+      "0003-data-Add-Microsoft-Surface-Pro-3.patch"
+      "0004-data-Add-Microsoft-Surface-Pro-4.patch"
+      "0005-data-Add-Microsoft-Surface-Pro-5.patch"
+      "0006-data-Add-Microsoft-Surface-Pro-6.patch"
+      "0007-data-Add-Microsoft-Surface-Pro-7.patch"
+      "0008-data-Add-Microsoft-Surface-Pro-7.patch"
+      "0009-data-Add-Microsoft-Surface-Pro-8.patch"
+      "0010-data-Add-Microsoft-Surface-Pro-9.patch"
+      "0011-data-Add-Microsoft-Surface-Book.patch"
+      "0012-data-Add-Microsoft-Surface-Book-2-13.5.patch"
+      "0013-data-Add-Microsoft-Surface-Book-2-15.patch"
+      "0014-data-Add-Microsoft-Surface-Book-3-13.5.patch"
+      "0015-data-Add-Microsoft-Surface-Book-3-15.patch"
+      "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
+    ];
 
   meta = old.meta // {
     homepage = "https://github.com/linux-surface/libwacom-surface";

From 20b9ff566a8839f0968324e062e1149bc7213e61 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:34:17 -0700
Subject: [PATCH 156/235] libwacom: move to by-name

---
 .../libwacom/default.nix => by-name/li/libwacom/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libwacom/default.nix => by-name/li/libwacom/package.nix} (100%)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/by-name/li/libwacom/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwacom/default.nix
rename to pkgs/by-name/li/libwacom/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a4610c37aff..a42649b6f444 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22562,8 +22562,6 @@ with pkgs;
 
   libzdb = callPackage ../development/libraries/libzdb { };
 
-  libwacom = callPackage ../development/libraries/libwacom { };
-
   libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { };
 
   lightlocker = callPackage ../misc/screensavers/light-locker { };

From f5402ed76a8ffb27cf426f36a717d01569a6e7f1 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:34:34 -0700
Subject: [PATCH 157/235] libwacom-surface: move to by-name

---
 .../surface.nix => by-name/li/libwacom-surface/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libwacom/surface.nix => by-name/li/libwacom-surface/package.nix} (100%)

diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/by-name/li/libwacom-surface/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwacom/surface.nix
rename to pkgs/by-name/li/libwacom-surface/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a42649b6f444..be385fb75231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22562,8 +22562,6 @@ with pkgs;
 
   libzdb = callPackage ../development/libraries/libzdb { };
 
-  libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { };
-
   lightlocker = callPackage ../misc/screensavers/light-locker { };
 
   lightspark = callPackage ../misc/lightspark { };

From 16324f699aacf14595fc9c40f9080de192d2fc10 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:38:08 -0700
Subject: [PATCH 158/235] libwacom: use finalAttrs style

---
 pkgs/by-name/li/libwacom/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 281b23cfe1aa..e17601179e72 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -13,7 +13,7 @@
   valgrind,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
   version = "2.12.2";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linuxwacom";
     repo = "libwacom";
-    rev = "libwacom-${version}";
+    rev = "libwacom-${finalAttrs.version}";
     hash = "sha256-dxnXh+O/8q8ShsPbpqvaBPNQR6lJBphBolYTmcJEF/0=";
   };
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   ;
 
   mesonFlags = [
-    "-Dtests=${if doCheck then "enabled" else "disabled"}"
+    "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}"
     "--sysconfdir=/etc"
   ];
 
@@ -72,9 +72,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     platforms = platforms.linux;
     homepage = "https://linuxwacom.github.io/";
-    changelog = "https://github.com/linuxwacom/libwacom/blob/${src.rev}/NEWS";
+    changelog = "https://github.com/linuxwacom/libwacom/blob/${finalAttrs.src.rev}/NEWS";
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
     maintainers = teams.freedesktop.members;
     license = licenses.hpnd;
   };
-}
+})

From 09ce1650e906d6ed5e6f09789c6e36fc0c97b771 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 09:48:42 -0700
Subject: [PATCH 159/235] libwacom-surface: v2.12.0-1 -> v2.12.2-1

---
 pkgs/by-name/li/libwacom-surface/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libwacom-surface/package.nix b/pkgs/by-name/li/libwacom-surface/package.nix
index 73f1e5549ea9..04fa64d1e822 100644
--- a/pkgs/by-name/li/libwacom-surface/package.nix
+++ b/pkgs/by-name/li/libwacom-surface/package.nix
@@ -8,17 +8,17 @@ let
   libwacom-surface = fetchFromGitHub {
     owner = "linux-surface";
     repo = "libwacom-surface";
-    rev = "v2.12.0-1";
-    hash = "sha256-z/qNXbe89/0GIDj0BDQY6xdjHKA9chAPpviHPtBLjFM=";
+    rev = "v2.12.2-1";
+    hash = "sha256-MreAwOaT8pd5NMWBpZDBbPz73DhcChgeXXBNyjw99Pw=";
   };
 in
-libwacom.overrideAttrs (old: {
+libwacom.overrideAttrs (prevAttrs: {
   pname = "libwacom-surface";
 
   # These patches will not be included upstream:
   # https://github.com/linux-surface/libwacom/issues/2
   patches =
-    old.patches or [ ]
+    (prevAttrs.patches or [ ])
     ++ map (p: "${libwacom-surface}/patches/v2/${p}") [
       "0001-Add-support-for-BUS_VIRTUAL.patch"
       "0002-Add-support-for-Intel-Management-Engine-bus.patch"
@@ -38,7 +38,7 @@ libwacom.overrideAttrs (old: {
       "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
     ];
 
-  meta = old.meta // {
+  meta = prevAttrs.meta // {
     homepage = "https://github.com/linux-surface/libwacom-surface";
     maintainers = with lib.maintainers; [ dotlambda ];
   };

From 1bf99ab6f56481f0fe4032695009ccd3123c8980 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 12 Aug 2024 11:42:54 -0700
Subject: [PATCH 160/235] libwacom: move tests to passthru.tests

---
 pkgs/by-name/li/libwacom/package.nix | 48 ++++++++++++++++++----------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index e17601179e72..3ee4267caee0 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -13,6 +13,17 @@
   valgrind,
 }:
 
+let
+  testsDisabled = "-Dtests=disabled";
+  testsEnabled = "-Dtests=enabled";
+  replaceDisabledWithEnabled =
+    flag:
+    lib.replaceStrings [
+      testsDisabled
+      testsEnabled
+    ] flag;
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
   version = "2.12.2";
@@ -47,27 +58,30 @@ stdenv.mkDerivation (finalAttrs: {
     libgudev
   ];
 
-  doCheck =
-    stdenv.hostPlatform == stdenv.buildPlatform
-    && lib.meta.availableOn stdenv.hostPlatform valgrind
-    && !stdenv.hostPlatform.isPower # one test times out
-  ;
-
+  # Tests are in the `tests` pass-through derivation.
+  # See https://github.com/NixOS/nixpkgs/issues/328140
+  doCheck = false;
   mesonFlags = [
-    "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}"
+    testsDisabled
     "--sysconfdir=/etc"
   ];
 
-  nativeCheckInputs = [
-    valgrind
-    (python3.withPackages (
-      ps: with ps; [
-        ps.libevdev
-        pytest
-        pyudev
-      ]
-    ))
-  ];
+  passthru = {
+    tests = finalAttrs.finalPackage.overrideAttrs (prevAttrs: {
+      doCheck = true;
+
+      mesonFlags = map replaceDisabledWithEnabled prevAttrs.mesonFlags;
+
+      nativeCheckInputs = [
+        valgrind
+        (python3.withPackages (ps: [
+          ps.libevdev
+          ps.pytest
+          ps.pyudev
+        ]))
+      ];
+    });
+  };
 
   meta = with lib; {
     platforms = platforms.linux;

From bf6088c5bcb0578183b36def937c55e76c377906 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Mon, 12 Aug 2024 23:02:59 +0200
Subject: [PATCH 161/235] libwacom: simplify tests enablement

---
 pkgs/by-name/li/libwacom/package.nix | 44 ++++++++++------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 3ee4267caee0..e74f1614909e 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -13,17 +13,6 @@
   valgrind,
 }:
 
-let
-  testsDisabled = "-Dtests=disabled";
-  testsEnabled = "-Dtests=enabled";
-  replaceDisabledWithEnabled =
-    flag:
-    lib.replaceStrings [
-      testsDisabled
-      testsEnabled
-    ] flag;
-in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "libwacom";
   version = "2.12.2";
@@ -58,29 +47,26 @@ stdenv.mkDerivation (finalAttrs: {
     libgudev
   ];
 
-  # Tests are in the `tests` pass-through derivation.
-  # See https://github.com/NixOS/nixpkgs/issues/328140
-  doCheck = false;
   mesonFlags = [
-    testsDisabled
+    (lib.mesonEnable "tests" finalAttrs.doCheck)
     "--sysconfdir=/etc"
   ];
 
+  # Tests are in the `tests` pass-through derivation because one of them is flaky, frequently causing build failures.
+  # See https://github.com/NixOS/nixpkgs/issues/328140
+  doCheck = false;
+
+  nativeCheckInputs = [
+    valgrind
+    (python3.withPackages (ps: [
+      ps.libevdev
+      ps.pytest
+      ps.pyudev
+    ]))
+  ];
+
   passthru = {
-    tests = finalAttrs.finalPackage.overrideAttrs (prevAttrs: {
-      doCheck = true;
-
-      mesonFlags = map replaceDisabledWithEnabled prevAttrs.mesonFlags;
-
-      nativeCheckInputs = [
-        valgrind
-        (python3.withPackages (ps: [
-          ps.libevdev
-          ps.pytest
-          ps.pyudev
-        ]))
-      ];
-    });
+    tests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
   };
 
   meta = with lib; {

From 976209e971d28e70d9cb5d3f5701e835656a4dcd Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Mon, 12 Aug 2024 23:03:31 +0200
Subject: [PATCH 162/235] libwacom: remove ambiguous with statement

Now passes nixf-tidy
---
 pkgs/by-name/li/libwacom/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index e74f1614909e..54a0ca4d8f0f 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -69,12 +69,12 @@ stdenv.mkDerivation (finalAttrs: {
     tests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
   };
 
-  meta = with lib; {
-    platforms = platforms.linux;
+  meta = {
+    platforms = lib.platforms.linux;
     homepage = "https://linuxwacom.github.io/";
     changelog = "https://github.com/linuxwacom/libwacom/blob/${finalAttrs.src.rev}/NEWS";
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
-    maintainers = teams.freedesktop.members;
-    license = licenses.hpnd;
+    maintainers = lib.teams.freedesktop.members;
+    license = lib.licenses.hpnd;
   };
 })

From dbdbd72fc67facb72fe0e028c1bec23d5c6a2105 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Mon, 12 Aug 2024 23:05:54 +0200
Subject: [PATCH 163/235] libwacom: use lib.mesonOption

---
 pkgs/by-name/li/libwacom/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix
index 54a0ca4d8f0f..e8bf5c74f71d 100644
--- a/pkgs/by-name/li/libwacom/package.nix
+++ b/pkgs/by-name/li/libwacom/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     (lib.mesonEnable "tests" finalAttrs.doCheck)
-    "--sysconfdir=/etc"
+    (lib.mesonOption "sysconfdir" "/etc")
   ];
 
   # Tests are in the `tests` pass-through derivation because one of them is flaky, frequently causing build failures.

From ddddc574a016f9d73ebdf4b238f3133e87025d55 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 12 Aug 2024 22:53:46 +0100
Subject: [PATCH 164/235] x265: apply darwin patch unconditionally

---
 pkgs/development/libraries/x265/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 3d10538314f0..6eacb730a544 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -41,9 +41,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-ZjUx80HFOJ9GDXMOYuEKT8yjQoyiyhCWk4Z7xf4uKAc=";
   };
 
-  # TODO: apply patch unconditionally in staging. It's conditional to
-  # save rebuild on staging-next.
-  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+  patches = [
     ./darwin-__rdtsc.patch
   ];
 

From 3f6f0c80f1a8804b0b91bbed6165e4257f0f46d7 Mon Sep 17 00:00:00 2001
From: April Merrill <april@andymerrill.tech>
Date: Mon, 12 Aug 2024 17:22:16 -0500
Subject: [PATCH 165/235] graphviz: 10.0.1 -> 12.1.0

---
 pkgs/tools/graphics/graphviz/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 9a9bd3a0f2b6..5cb3c24bc150 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "graphviz";
-  version = "10.0.1";
+  version = "12.1.0";
 
   src = fetchFromGitLab {
     owner = "graphviz";
     repo = "graphviz";
     rev = version;
-    hash = "sha256-KAqJUVqPld3F2FHlUlfbw848GPXXOmyRQkab8jlH1NM=";
+    hash = "sha256-C+FFmWExEzPsDAmUiu/HmRVmb1Km4dJujagxN+v0uWw=";
   };
 
   nativeBuildInputs = [
@@ -76,10 +76,6 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs
 
   preAutoreconf = ''
-    # components under this directory require a tool `CompileXIB` to build
-    # and there's no official way to disable this on darwin.
-    substituteInPlace Makefile.am --replace-fail 'SUBDIRS += macosx' ""
-
     ./autogen.sh
   '';
 

From 129eace28d9ffdba9280242c2582044853fbe4bb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 13 Aug 2024 20:47:07 +0300
Subject: [PATCH 166/235] python312Packages.gast: modernize

---
 pkgs/development/python-modules/gast/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index e275cc3170c2..75206d17ef88 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -16,8 +16,8 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
-    repo = pname;
-    rev = version;
+    repo = "gast";
+    rev = "refs/tags/${version}";
     hash = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg=";
   };
 
@@ -28,11 +28,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gast" ];
 
-  meta = with lib; {
+  meta = {
     description = "Compatibility layer between the AST of various Python versions";
     homepage = "https://github.com/serge-sans-paille/gast/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       jyp
       cpcloud
     ];

From 20ba6d165ed587d229aee9b7324d362704dffa04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 03:40:17 -0700
Subject: [PATCH 167/235] python312Packages.gast: 0.5.3 -> 0.6.0

Diff: https://github.com/serge-sans-paille/gast/compare/0.5.3...0.6.0
---
 pkgs/development/python-modules/gast/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index 75206d17ef88..d62c2bc4cd41 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -5,12 +5,13 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "gast";
-  version = "0.5.3";
-  format = "setuptools";
+  version = "0.6.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -18,9 +19,11 @@ buildPythonPackage rec {
     owner = "serge-sans-paille";
     repo = "gast";
     rev = "refs/tags/${version}";
-    hash = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg=";
+    hash = "sha256-zrbxW8qWhCY6tObP+/WDReoCnlCpMEzQucX2inpRTL4=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     astunparse
     pytestCheckHook

From 8c63be6c613467ebde11be70400bfe56fcc7d48a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 13 Aug 2024 20:50:22 +0300
Subject: [PATCH 168/235] python312Packages.beniget: modernize

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

diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix
index 3e3e104a9062..0ef62fc0573c 100644
--- a/pkgs/development/python-modules/beniget/default.nix
+++ b/pkgs/development/python-modules/beniget/default.nix
@@ -15,11 +15,12 @@ buildPythonPackage rec {
     sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c";
   };
 
-  propagatedBuildInputs = [ gast ];
+  dependencies = [ gast ];
 
   meta = {
     description = "Extract semantic information about static Python code";
     homepage = "https://github.com/serge-sans-paille/beniget";
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 7828a0d8ac3bbacb1112e2a1d290f5d556e7661a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 03:35:09 -0700
Subject: [PATCH 169/235] python312Packages.beniget: 0.4.1 -> 0.4.2.post1

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

diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix
index 0ef62fc0573c..b0dfc690841d 100644
--- a/pkgs/development/python-modules/beniget/default.nix
+++ b/pkgs/development/python-modules/beniget/default.nix
@@ -1,22 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   gast,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "beniget";
-  version = "0.4.1";
-  format = "setuptools";
+  version = "0.4.2.post1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c";
+  src = fetchFromGitHub {
+    owner = "serge-sans-paille";
+    repo = "beniget";
+    rev = "refs/tags/${version}";
+    hash = "sha256-rNMgCEkI6p9KtLSz/2jVJ9rPeJzxv5rT+Pu6OHM8z70=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [ gast ];
 
+  pythonImportsCheck = [ "beniget" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
   meta = {
     description = "Extract semantic information about static Python code";
     homepage = "https://github.com/serge-sans-paille/beniget";

From d1c788840ecc51990c249f24d63abd183666c580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 13 Aug 2024 09:52:39 -0700
Subject: [PATCH 170/235] python312Packages.pythran: bump gast to 0.6.0

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

diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix
index e99283bc49ae..0fd4597b0a85 100644
--- a/pkgs/development/python-modules/pythran/default.nix
+++ b/pkgs/development/python-modules/pythran/default.nix
@@ -3,6 +3,7 @@
   python,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   isPy3k,
   substituteAll,
 
@@ -36,6 +37,11 @@ buildPythonPackage rec {
   };
 
   patches = [
+    (fetchpatch2 {
+      name = "bump-gast-to-0.6.0.patch";
+      url = "https://github.com/serge-sans-paille/pythran/commit/840a0e706ec39963aec6bcd1f118bf33177c20b4.patch";
+      hash = "sha256-FHGXWuAX/Nmn6uEfQgAXfUxIdApDwSfHHtOStxyme/0=";
+    })
     # Hardcode path to mp library
     (substituteAll {
       src = ./0001-hardcode-path-to-libgomp.patch;

From c338237e0e328c0ca6ddf0b9248645564282078f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 13 Aug 2024 07:02:05 -0700
Subject: [PATCH 171/235] python312Packages.pythran: modernize

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

diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix
index 0fd4597b0a85..e74a9d62b210 100644
--- a/pkgs/development/python-modules/pythran/default.nix
+++ b/pkgs/development/python-modules/pythran/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch2,
-  isPy3k,
   substituteAll,
 
   # build-system
@@ -32,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
     repo = "pythran";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0=";
   };
 
@@ -57,9 +56,9 @@ buildPythonPackage rec {
     ln -s '${lib.getDev xsimd}'/include/xsimd pythran/
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     ply
     gast
     numpy
@@ -79,9 +78,8 @@ buildPythonPackage rec {
   # Test suite is huge and has a circular dependency on scipy.
   doCheck = false;
 
-  disabled = !isPy3k;
-
   meta = {
+    changelog = "https://github.com/serge-sans-paille/pythran/blob/${src.rev}/Changelog";
     description = "Ahead of Time compiler for numeric kernels";
     homepage = "https://github.com/serge-sans-paille/pythran";
     license = lib.licenses.bsd3;

From f236d96d3bc15b0c86efdb1beaae30203ceacdcf Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 13 Aug 2024 23:24:11 +0200
Subject: [PATCH 172/235] libilbc: init at 3.0.4

---
 pkgs/by-name/li/libilbc/package.nix | 53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/li/libilbc/package.nix

diff --git a/pkgs/by-name/li/libilbc/package.nix b/pkgs/by-name/li/libilbc/package.nix
new file mode 100644
index 000000000000..e2d2ab71bdb8
--- /dev/null
+++ b/pkgs/by-name/li/libilbc/package.nix
@@ -0,0 +1,53 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  testers,
+  lib,
+  cmake,
+  ninja,
+  pkg-config,
+  abseil-cpp_202103,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libilbc";
+  version = "3.0.4";
+
+  src = fetchFromGitHub {
+    owner = "TimothyGu";
+    repo = "libilbc";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-GpvHDyvmWPxSt0K5PJQrTso61vGGWHkov7U9/LPrDBU=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [ abseil-cpp_202103 ];
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "doc"
+  ];
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = with lib; {
+    description = "Packaged version of iLBC codec from the WebRTC project";
+    homepage = "https://github.com/TimothyGu/libilbc";
+    changelog = "https://github.com/TimothyGu/libilbc/blob/v${finalAttrs.version}/NEWS.md";
+    maintainers = with maintainers; [ jopejoe1 ];
+    pkgConfigModules = [ "lilbc" ];
+    platforms = platforms.all;
+    license = licenses.bsd3;
+  };
+})

From d91ad22d821e0406b34f250a8ed361fb781009e2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 13 Aug 2024 23:24:26 +0200
Subject: [PATCH 173/235] ffmpeg: add ilbc options

---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6d76cf7cdcae..57ef741fb528 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -69,6 +69,7 @@
 , withGsm ? withFullDeps # GSM de/encoder
 , withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter
 , withIconv ? withHeadlessDeps
+, withIlbc ? withFullDeps # iLBC de/encoding
 , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
 , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
 , withLadspa ? withFullDeps # LADSPA audio filtering
@@ -252,6 +253,7 @@
 , libGL
 , libGLU
 , libiconv
+, libilbc
 , libjack2
 , libjxl
 , libmodplug
@@ -619,6 +621,7 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withHarfbuzz "libharfbuzz")
   ] ++ [
     (enableFeature withIconv "iconv")
+    (enableFeature withIlbc "libilbc")
     (enableFeature withJack "libjack")
   ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [
     (enableFeature withJxl "libjxl")
@@ -774,6 +777,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withGsm [ gsm ]
   ++ optionals withHarfbuzz [ harfbuzz ]
   ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
+  ++ optionals withIlbc [ libilbc ]
   ++ optionals withJack [ libjack2 ]
   ++ optionals withJxl [ libjxl ]
   ++ optionals withLadspa [ ladspaH ]

From bba26b6dfc45cb739439d7bd5269f41f2baf9e92 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 14 Aug 2024 06:50:17 +0100
Subject: [PATCH 174/235] x265: move both `arm` `CROSS_COMPILE_*` under isCross

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

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 6eacb730a544..9f3f97b1bc57 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -96,13 +96,13 @@ stdenv.mkDerivation rec {
       ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"}
       -DHIGH_BIT_DEPTH=OFF
       -DENABLE_HDR10_PLUS=ON
-      ${mkFlag (isCross && stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
       ${mkFlag cliSupport "ENABLE_CLI"}
       ${mkFlag unittestsSupport "ENABLE_TESTS"}
     )
   '' + lib.optionalString isCross ''
     cmakeFlagsArray+=(
-      ${mkFlag (isCross && stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
+      ${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
+      ${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
     )
   '';
 

From 0a3ed67ff66fe992ea08636d6518efbe22d2d3ac Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Wed, 14 Aug 2024 06:54:27 +0000
Subject: [PATCH 175/235] autoPatchelfHook: add keep_libc flag (#332617)

* autoPatchelfHook: add keep_libc flag

- Add keep_libc flag to disable the default libc handling. Intended
  to be used by systemd.
- Add autoPatchelfFlags to autoPatchelfHook for passing arguments to
  the autoPatchelf script

This reverts part of the change made in #307068 / 80be926.

Fixes #332533
---
 .../setup-hooks/auto-patchelf.py              | 30 +++++++++++++++----
 .../setup-hooks/auto-patchelf.sh              |  3 ++
 pkgs/os-specific/linux/systemd/default.nix    |  2 ++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py
index a6744b9211f4..eca3007514de 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.py
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.py
@@ -197,7 +197,7 @@ class Dependency:
     found: bool = False     # Whether it was found somewhere
 
 
-def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], extra_args: list[str] = []) -> list[Dependency]:
+def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], keep_libc: bool = False, extra_args: list[str] = []) -> list[Dependency]:
     try:
         with open_elf(path) as elf:
 
@@ -257,26 +257,36 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list
             # 1. If a candidate is an absolute path, it is already a
             #    valid dependency if that path exists, and nothing needs
             #    to be done. It should be an error if that path does not exist.
-            # 2. If a candidate is found in our library dependencies, that
+            # 2. If a candidate is found within libc, it should be dropped
+            #    and resolved automatically by the dynamic linker, unless
+            #    keep_libc is enabled.
+            # 3. If a candidate is found in our library dependencies, that
             #    dependency should be added to rpath.
-            # 3. If a candidate is found in libc, it will be correctly
-            #    resolved by the dynamic linker automatically.
+            # 4. If all of the above fail, libc dependencies should still be
+            #    considered found. This is in contrast to step 2, because
+            #    enabling keep_libc should allow libc to be found in step 3
+            #    if possible to preserve its presence in rpath.
             #
             # These conditions are checked in this order, because #2
             # and #3 may both be true. In that case, we still want to
             # add the dependency to rpath, as the original binary
             # presumably had it and this should be preserved.
 
+            is_libc = (libc_lib / candidate).is_file()
+
             if candidate.is_absolute() and candidate.is_file():
                 was_found = True
                 break
+            elif is_libc and not keep_libc:
+                was_found = True
+                break
             elif found_dependency := find_dependency(candidate.name, file_arch, file_osabi):
                 rpath.append(found_dependency)
                 dependencies.append(Dependency(path, candidate, found=True))
                 print(f"    {candidate} -> found: {found_dependency}")
                 was_found = True
                 break
-            elif (libc_lib / candidate).is_file():
+            elif is_libc and keep_libc:
                 was_found = True
                 break
 
@@ -306,6 +316,7 @@ def auto_patchelf(
         recursive: bool = True,
         ignore_missing: list[str] = [],
         append_rpaths: list[Path] = [],
+        keep_libc: bool = False,
         extra_args: list[str] = []) -> None:
 
     if not paths_to_patch:
@@ -319,7 +330,7 @@ def auto_patchelf(
     dependencies = []
     for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch):
         if not path.is_symlink() and path.is_file():
-            dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, extra_args)
+            dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, keep_libc, extra_args)
 
     missing = [dep for dep in dependencies if not dep.found]
 
@@ -377,6 +388,12 @@ def main() -> None:
         type=Path,
         help="Paths to append to all runtime paths unconditionally",
     )
+    parser.add_argument(
+        "--keep-libc",
+        dest="keep_libc",
+        action="store_true",
+        help="Attempt to search for and relink libc dependencies.",
+    )
     parser.add_argument(
         "--extra-args",
         # Undocumented Python argparse feature: consume all remaining arguments
@@ -398,6 +415,7 @@ def main() -> None:
         args.recursive,
         args.ignore_missing,
         append_rpaths=args.append_rpaths,
+        keep_libc=args.keep_libc,
         extra_args=args.extra_args)
 
 
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 783ea45f8eeb..59b596d27172 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -58,11 +58,13 @@ autoPatchelf() {
         local appendRunpathsArray=( "${appendRunpaths[@]}" )
         local runtimeDependenciesArray=( "${runtimeDependencies[@]}" )
         local patchelfFlagsArray=( "${patchelfFlags[@]}" )
+        local autoPatchelfFlagsArray=( "${autoPatchelfFlags[@]}" )
     else
         readarray -td' ' ignoreMissingDepsArray < <(echo -n "$autoPatchelfIgnoreMissingDeps")
         local appendRunpathsArray=($appendRunpaths)
         local runtimeDependenciesArray=($runtimeDependencies)
         local patchelfFlagsArray=($patchelfFlags)
+        local autoPatchelfFlagsArray=($autoPatchelfFlags)
     fi
 
     # Check if ignoreMissingDepsArray contains "1" and if so, replace it with
@@ -85,6 +87,7 @@ autoPatchelf() {
                "${extraAutoPatchelfLibs[@]}"                            \
         --runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}"  \
         --append-rpaths "${appendRunpathsArray[@]}"                     \
+        "${autoPatchelfFlagsArray[@]}"                                  \
         --extra-args "${patchelfFlagsArray[@]}"
 }
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 8ea24064aa09..9dff1838607c 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -336,6 +336,8 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   ;
 
+  autoPatchelfFlags = [ "--keep-libc" ];
+
   buildInputs =
     [
       libxcrypt

From 0ec3712f8a3d65f366c167159a5cd9d526889598 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 14 Aug 2024 14:12:55 +0100
Subject: [PATCH 176/235] mupdf: fix review suggestions

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/applications/misc/mupdf/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index c8ca74c59ff1..c393a3ca0abd 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -65,12 +65,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    sha256 = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg=";
+    hash = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg=";
   };
 
-  patches = [ ./0002-Add-Darwin-deps.patch
-              ./0003-Fix-cpp-build.patch
-            ];
+  patches = [
+    ./0002-Add-Darwin-deps.patch
+    ./0003-Fix-cpp-build.patch
+  ];
 
   postPatch = ''
     substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG"

From f0e142a4cde80c58487a9960bc5a7ce08b91a796 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 26 May 2024 03:35:00 +0300
Subject: [PATCH 177/235] gawk: move gawkbug to gawkInteractive

This change removes gawkbug program from non-interactive build, similar
to the bash{,Interactive} package.
---
 pkgs/tools/text/gawk/default.nix | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 8857fa29d1c6..941e102cb3b0 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl
+, removeReferencesTo
 , runtimeShellPackage
 # TODO: links -lsigsegv but loses the reference for some reason
 , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
@@ -36,15 +37,25 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ]
     ++ lib.optional (!interactive) "man";
 
-  # no-pma fix
-  nativeBuildInputs = [ autoreconfHook ]
-    ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;
+  strictDeps = true;
 
-  buildInputs = [
+  # no-pma fix
+  nativeBuildInputs = [
+    autoreconfHook
+  ] ++ lib.optionals interactive [
+    removeReferencesTo
+  ] ++ lib.optionals (doCheck && stdenv.isLinux) [
+    glibcLocales
+  ];
+
+  buildInputs = lib.optionals interactive [
     runtimeShellPackage
-  ] ++ lib.optional withSigsegv libsigsegv
-    ++ lib.optional interactive readline
-    ++ lib.optional stdenv.isDarwin locale;
+    readline
+  ] ++ lib.optionals withSigsegv [
+    libsigsegv
+  ] ++ lib.optionals stdenv.isDarwin [
+    locale
+  ];
 
   configureFlags = [
     (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
@@ -57,7 +68,12 @@ stdenv.mkDerivation rec {
 
   inherit doCheck;
 
-  postInstall = ''
+  postInstall = (if interactive then ''
+    remove-references-to -t "$NIX_CC" "$out"/bin/gawkbug
+    patchShebangs --host "$out"/bin/gawkbug
+  '' else ''
+    rm "$out"/bin/gawkbug
+  '') + ''
     rm "$out"/bin/gawk-*
     ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
   '';

From edce18da936b15d17452da8aa6d784dadc30c241 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 15 Aug 2024 02:30:28 +0800
Subject: [PATCH 178/235] emacs.pkgs.libgit: remove fix because it has been
 removed from MELPA

https://github.com/melpa/melpa/commit/9babd723f51466ae23266f1f4f0246a228d60258
---
 .../emacs/elisp-packages/melpa-packages.nix   | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index d580b0dfdb71..ec73ddb29d50 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -384,26 +384,6 @@ let
           };
         });
 
-        libgit = super.libgit.overrideAttrs(attrs: {
-          nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
-          buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
-          dontUseCmakeBuildDir = true;
-          postPatch = ''
-            sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt
-          '';
-          postBuild = ''
-            pushd working/libgit
-            make
-            popd
-          '';
-          postInstall = (attrs.postInstall or "") + "\n" + ''
-            outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**)
-            mkdir $outd/build
-            install -m444 -t $outd/build ./source/src/libegit2.so
-            rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt
-          '';
-        });
-
         evil-magit = buildWithGit super.evil-magit;
 
         eopengrok = buildWithGit super.eopengrok;

From 9f592a2829394095421491b5127af0a681642342 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 15 Aug 2024 02:32:57 +0800
Subject: [PATCH 179/235] emacsPackages.osx-dictionary: remove unneeded
 dontUnpack

The default value is false.
---
 .../applications/editors/emacs/elisp-packages/melpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index ec73ddb29d50..999f16b4ad0c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -717,7 +717,6 @@ let
             buildInputs =
               old.buildInputs ++
               (with pkgs.darwin.apple_sdk.frameworks; [CoreServices Foundation]);
-            dontUnpack = false;
             buildPhase = (old.buildPhase or "") + ''
               cd source
               $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli

From 997df6b9aa287073ae54bee8cb72a2f5e303982d Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 15 Aug 2024 02:35:22 +0800
Subject: [PATCH 180/235] emacs: replace cd with pushd/popd in buildPhase of
 melpaBuild

It is better to not change the working directory.

One example showing the benefit is the rewriting[1] of lspce, where
the Rust build hook assumes the working directory is unchanged.

[1]: https://github.com/NixOS/nixpkgs/pull/334476
---
 .../editors/emacs/build-support/melpa.nix     |  4 +-
 .../manual-packages/lsp-bridge/default.nix    |  1 -
 .../emacs/elisp-packages/melpa-packages.nix   | 41 +++++++------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index 20f7e79eb683..b163a43ab99a 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -111,7 +111,7 @@ genericBuild ({
   buildPhase = ''
     runHook preBuild
 
-    cd "$NIX_BUILD_TOP"
+    pushd "$NIX_BUILD_TOP"
 
     emacs --batch -Q \
         -L "$NIX_BUILD_TOP/package-build" \
@@ -119,6 +119,8 @@ genericBuild ({
         -f melpa2nix-build-package \
         $ename $melpaVersion $commit
 
+    popd
+
     runHook postBuild
     '';
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index a44a9d79529e..ac4c669e28e0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -77,7 +77,6 @@ melpaBuild {
   checkPhase = ''
     runHook preCheck
 
-    cd "$sourceRoot"
     mkfifo test.log
     cat < test.log &
     HOME=$(mktemp -d) python -m test.test
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 999f16b4ad0c..2bd17437c1ff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -186,13 +186,13 @@ let
           buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
 
           postBuild = ''
-            cd source/sqlite
+            pushd sqlite
             make
-            cd -
+            popd
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
-            install -m=755 -D source/sqlite/emacsql-sqlite \
+            install -m=755 -D sqlite/emacsql-sqlite \
               $out/share/emacs/site-lisp/elpa/emacsql-${old.version}/sqlite/emacsql-sqlite
           '';
 
@@ -203,13 +203,13 @@ let
           buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
 
           postBuild = ''
-            cd source/sqlite
+            pushd sqlite
             make
-            cd -
+            popd
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
-            install -m=755 -D source/sqlite/emacsql-sqlite \
+            install -m=755 -D sqlite/emacsql-sqlite \
               $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite
           '';
 
@@ -296,7 +296,7 @@ let
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
-            install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-*
+            install hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-*
           '';
         });
 
@@ -304,17 +304,17 @@ let
           cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
           env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
           preConfigure = ''
-            cd server
+            pushd server
           '';
           preBuild = ''
             make
             install -D bin/irony-server $out/bin/irony-server
-            cd ..
+            popd
           '';
           checkPhase = ''
-            cd source/server
+            pushd server
             make check
-            cd ../..
+            popd
           '';
           preFixup = ''
             rm -rf $out/share/emacs/site-lisp/elpa/*/server
@@ -343,18 +343,14 @@ let
           buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ];
 
           postBuild = ''
-            pushd working/jinx
             NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
             $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2
-            popd
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
-            pushd source
             outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*)
             install -m444 --target-directory=$outd jinx-mod${libExt}
             rm $outd/jinx-mod.c $outd/emacs-module.h
-            popd
           '';
 
           meta = old.meta // {
@@ -366,17 +362,13 @@ let
           buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ];
 
           postBuild = ''
-            pushd working/sqlite3
             make
-            popd
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
-            pushd source
             outd=$out/share/emacs/site-lisp/elpa/sqlite3-*
             install -m444 -t $outd sqlite3-api.so
             rm $outd/*.c $outd/*.h
-            popd
           '';
 
           meta = old.meta // {
@@ -539,14 +531,14 @@ let
           '';
 
           postBuild = ''
-            cd source/server
+            pushd server
             make
-            cd -
+            popd
           '';
 
           postInstall = (old.postInstall or "") + "\n" + ''
             mkdir -p $out/bin
-            install -m755 -Dt $out/bin ./source/server/telega-server
+            install -m755 -Dt $out/bin server/telega-server
           '';
         });
 
@@ -676,10 +668,8 @@ let
           # we need the proper out directory to exist, so we do this in the
           # postInstall instead of postBuild
           postInstall = (old.postInstall or "") + "\n" + ''
-            pushd source/build >/dev/null
             make
             install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so
-            popd > /dev/null
             rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h}
           '';
         });
@@ -717,8 +707,7 @@ let
             buildInputs =
               old.buildInputs ++
               (with pkgs.darwin.apple_sdk.frameworks; [CoreServices Foundation]);
-            buildPhase = (old.buildPhase or "") + ''
-              cd source
+            postBuild = (old.postBuild or "") + ''
               $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli
             '';
             postInstall = (old.postInstall or "") + "\n" + ''

From 9f8b4031ad9e328c96c62cba450ce1ebc093295c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 9 Aug 2024 22:03:26 +0100
Subject: [PATCH 181/235] openfec: 1.4.2.9 -> 1.4.2.11

Changes:
- https://github.com/roc-streaming/openfec/releases/tag/v1.4.2.10
- https://github.com/roc-streaming/openfec/releases/tag/v1.4.2.11
---
 pkgs/development/libraries/openfec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix
index 35ce5806aea7..964f5d86f672 100644
--- a/pkgs/development/libraries/openfec/default.nix
+++ b/pkgs/development/libraries/openfec/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "openfec";
-  version = "1.4.2.9";
+  version = "1.4.2.11";
 
   src = fetchzip {
     url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz";
-    hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA=";
+    hash = "sha256-lBR8vz8whEdPVHAGVq9eRriKtmS5tUAvtoyXwO4AuEs=";
   };
 
   outputs = [ "out" "dev" ];

From 0dda88967287cf6aafc8c07dd71e43c9bebeb1a0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 14 Aug 2024 21:51:19 +0100
Subject: [PATCH 182/235] libedit: 20240517-3.1 -> 20240808-3.1

---
 pkgs/by-name/li/libedit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 0b4490a46654..90d69aa6db20 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libedit";
-  version = "20240517-3.1";
+  version = "20240808-3.1";
 
   src = fetchurl {
     url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OkiQl7tBFUlfO9ha54KFK3CXxVbZUACI10tvo429Ev8=";
+    hash = "sha256-XwVzNJ13xKSJZxkc3WY03Xql9jmMalf+A3zAJpbWCZ8=";
   };
 
   outputs = [ "out" "dev" "man" ];

From 4405fd10d7cf2d77c38e235e8c48479e778e4374 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 15 Aug 2024 09:07:03 +0300
Subject: [PATCH 183/235] mesa: 24.1.5 -> 24.1.6

---
 pkgs/development/libraries/mesa/common.nix  | 4 ++--
 pkgs/development/libraries/mesa/default.nix | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 06efd715c23f..5628ca1b49e0 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.1.5";
+  version = "24.1.6";
 
   src = fetchurl {
     urls = [
       "https://archive.mesa3d.org/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    hash = "sha256-AnYf/ZZd1kuVQh6/yhGR1zckq6APMANACSN1ZPNM+XY=";
+    hash = "sha256-2pTAkI1WYkZzabae2CNtoeFXcUGm59JRcam/Vjg7NOg=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 17ab53980b9d..b1d5b0ad84f9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -139,13 +139,6 @@ in stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
-
-    # Fixes video corruption / crashes when decoding video on AMD iGPUs
-    # FIXME: remove in the next update
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/8b35da91b23afc65256b78a59d116fd09544cd28.patch";
-      hash = "sha256-z0KKBtot3VxXiS16YcmwZbeg8HSCLzEbvWdufI/fOk8=";
-    })
   ];
 
   postPatch = ''

From 9fa6d793dd061878784be4c3fa2ad7cb12c5cdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 15 Aug 2024 08:17:44 -0700
Subject: [PATCH 184/235] python312Packages.pikepdf: 9.1.0 -> 9.1.1

Diff: https://github.com/pikepdf/pikepdf/compare/v9.1.0...v9.1.1

Changelog: https://github.com/pikepdf/pikepdf/blob/v9.1.1/docs/releasenotes/version9.rst
---
 pkgs/development/python-modules/pikepdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index fc105cbe0aa7..2f3ace4dd7e5 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "9.1.0";
+  version = "9.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-rcL4kwF8aBHy/sxZiQsQGvN3i1geiPFyrv8nRSXUZSA=";
+    hash = "sha256-++je4tKnXr504Yl9VBH9dc9fycDrMstRN5hu4s/oe9w=";
   };
 
   patches = [

From fca63549ac4dcd414225889b3fc025e93baedac3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 15 Aug 2024 23:11:54 +0200
Subject: [PATCH 185/235] python312Packages.uvloop: 0.19.0 -> 0.20.0

https://github.com/MagicStack/uvloop/releases/tag/v0.20.0
---
 pkgs/development/python-modules/uvloop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 9d3240bdf3dd..06447432f218 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -22,17 +22,17 @@
 
 buildPythonPackage rec {
   pname = "uvloop";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Akb0/Rvyv3AuBrDUXukWd+5cMSQvOaq06m/gxRrt0P0=";
+    hash = "sha256-RgPKcUp1T8jZsZfjJdslsuoEU4Xoo60F00Y95yX99Gk=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython_0
     setuptools
   ];

From 571e1a8251ee7d617445d910a93326076a770d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 2 Aug 2024 08:43:09 +0200
Subject: [PATCH 186/235] iproute2: fix static build again

---
 pkgs/os-specific/linux/iproute/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index d14b6210f257..56a5e24e1b81 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl
 , buildPackages, bison, flex, pkg-config
 , db, iptables, elfutils, libmnl ,libbpf
-, gitUpdater
+, gitUpdater, pkgsStatic
 }:
 
 stdenv.mkDerivation rec {
@@ -47,9 +47,11 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [ bison flex pkg-config ];
-  buildInputs = [ db iptables libmnl libbpf ]
+  buildInputs = [ db iptables libmnl  ]
     # needed to uploaded bpf programs
-    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ];
+    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+      elfutils libbpf
+  ];
 
   enableParallelBuilding = true;
 
@@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
     url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git";
     rev-prefix = "v";
   };
+  # needed for nixos-anywhere
+  passthru.tests.static = pkgsStatic.iproute2;
 
   meta = with lib; {
     homepage = "https://wiki.linuxfoundation.org/networking/iproute2";

From 8b3a4a617e545284622226cc10b32f0e82a571f0 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 15 Aug 2024 10:06:52 +0200
Subject: [PATCH 187/235] bluez: fix when gobject-introspection unsupported

For example, when cross compiling to s390-linux.
---
 pkgs/by-name/bl/bluez/package.nix | 40 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 1a459bba189b..77b2fdf7dfc2 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -15,6 +15,11 @@
 , readline
 , systemdMinimal
 , udev
+# Test gobject-introspection instead of pygobject because the latter
+# causes an infinite recursion.
+, gobject-introspection
+, buildPackages
+, installTests ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -60,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.wrapPython
   ];
 
-  outputs = [ "out" "dev" "test" ];
+  outputs = [ "out" "dev" ]
+    ++ lib.optional installTests "test";
 
   postPatch = ''
     substituteInPlace tools/hid2hci.rules \
@@ -122,22 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
   in
   ''
-    mkdir -p $test/{bin,test}
-    cp -a test $test
-    pushd $test/test
-    for t in \
-            list-devices \
-            monitor-bluetooth \
-            simple-agent \
-            test-adapter \
-            test-device \
-            test-thermometer \
-            ; do
-      ln -s ../test/$t $test/bin/bluez-$t
-    done
-    popd
-    wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}"
-
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
@@ -157,6 +147,22 @@ stdenv.mkDerivation (finalAttrs: {
       install -Dm755 tools/$filename $out/bin/$filename
     done
     install -Dm755 attrib/gatttool $out/bin/gatttool
+  '' + lib.optionalString installTests ''
+    mkdir -p $test/{bin,test}
+    cp -a test $test
+    pushd $test/test
+    for t in \
+            list-devices \
+            monitor-bluetooth \
+            simple-agent \
+            test-adapter \
+            test-device \
+            test-thermometer \
+            ; do
+      ln -s ../test/$t $test/bin/bluez-$t
+    done
+    popd
+    wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}"
   '';
 
   enableParallelBuilding = true;

From ebf6790c393f4e89eede6d8049c95dc738734bea Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Thu, 15 Aug 2024 23:37:46 +0000
Subject: [PATCH 188/235] stdenv: concatTo: fall back to old behaviour for
 "*Array" variables

Fixes e.g. the `sudo` build failure
---
 pkgs/stdenv/generic/setup.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ea61ec7509ce..ef645e4e513e 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -400,8 +400,15 @@ concatTo() {
                 -a*)
                     targetref+=( "${nameref[@]}" ) ;;
                 *)
-                    # shellcheck disable=SC2206
-                    targetref+=( ${nameref-} ) ;;
+                    if [[ "$name" = *"Array" ]]; then
+                        nixErrorLog "concatTo(): $name is not declared as array, treating as a singleton. This will become an error in future"
+                        # Reproduces https://github.com/NixOS/nixpkgs/pull/318614/files#diff-7c7ca80928136cfc73a02d5b28350bd900e331d6d304857053ffc9f7beaad576L359
+                        targetref+=( ${nameref+"${nameref[@]}"} )
+                    else
+                        # shellcheck disable=SC2206
+                        targetref+=( ${nameref-} )
+                    fi
+                    ;;
             esac
         fi
     done

From f974fa11e7e55f7e419492d472e1522d25ebdaf7 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Thu, 15 Aug 2024 23:38:27 +0000
Subject: [PATCH 189/235] sudo: amend the concatTo warning
 (configureFlagsArray)

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index c5dcc5f864a0..885fcc51aa48 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   # e.g. links to man pages, value constraints etc.
   version = "1.9.15p5";
 
+  __structuredAttrs = true;
+
   src = fetchurl {
     url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
     hash = "sha256-VY0QuaGZH7O5+n+nsH7EQFt677WzywsIcdvIHjqI5Vg=";

From 75c122699aa9b111b20124af29873762479c6cff Mon Sep 17 00:00:00 2001
From: Gabriella Gonzalez <GenuineGabriella@gmail.com>
Date: Fri, 16 Aug 2024 16:26:08 +0200
Subject: [PATCH 190/235] lib.cli.escapeShellArg{,s}: Only escape when
 necessary (#333744)

These utilities will now leave the string undisturbed if it doesn't need to be quoted (because it doesn't have any special characters). This can help generate nicer-looking command lines.

This also transitively improves the output of `lib.toGNUCommandLine` which uses `escapeShellArg` internally
---
 lib/strings.nix    | 16 ++++++++++++----
 lib/tests/misc.nix | 28 ++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index aafbdffaa7bc..54a5b9c67434 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1026,7 +1026,8 @@ rec {
     replaceStrings (builtins.attrNames toEscape) (lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape);
 
   /**
-    Quote `string` to be used safely within the Bourne shell.
+    Quote `string` to be used safely within the Bourne shell if it has any
+    special characters.
 
 
     # Inputs
@@ -1051,10 +1052,17 @@ rec {
 
     :::
   */
-  escapeShellArg = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'";
+  escapeShellArg = arg:
+    let
+      string = toString arg;
+    in
+      if match "[[:alnum:],._+:@%/-]+" string == null
+      then "'${replaceStrings ["'"] ["'\\''"] string}'"
+      else string;
 
   /**
-    Quote all arguments to be safely passed to the Bourne shell.
+    Quote all arguments that have special characters to be safely passed to the
+    Bourne shell.
 
     # Inputs
 
@@ -1073,7 +1081,7 @@ rec {
 
     ```nix
     escapeShellArgs ["one" "two three" "four'five"]
-    => "'one' 'two three' 'four'\\''five'"
+    => "one 'two three' 'four'\\''five'"
     ```
 
     :::
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index d59f5586b82d..7445c634558c 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -470,6 +470,26 @@ runTests {
     expected = [ "A" "B" ];
   };
 
+  testEscapeShellArg = {
+    expr = strings.escapeShellArg "esc'ape\nme";
+    expected = "'esc'\\''ape\nme'";
+  };
+
+  testEscapeShellArgEmpty = {
+    expr = strings.escapeShellArg "";
+    expected = "''";
+  };
+
+  testEscapeShellArgs = {
+    expr = strings.escapeShellArgs ["one" "two three" "four'five"];
+    expected = "one 'two three' 'four'\\''five'";
+  };
+
+  testEscapeShellArgsUnicode = {
+    expr = strings.escapeShellArg "á";
+    expected = "'á'";
+  };
+
   testSplitStringsDerivation = {
     expr = take 3  (strings.splitString "/" (derivation {
       name = "name";
@@ -569,12 +589,12 @@ runTests {
     '';
     expected = ''
       STRing01='just a '\'''string'\''''
-      declare -a _array_=('with' 'more strings')
+      declare -a _array_=(with 'more strings')
       declare -A assoc=(['with some']='strings
       possibly newlines
       ')
-      drv='/drv'
-      path='/path'
+      drv=/drv
+      path=/path
       stringable='hello toString'
     '';
   };
@@ -1754,7 +1774,7 @@ runTests {
       verbose = true;
     };
 
-    expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'";
+    expected = "-X PUT --data '{\"id\":0}' --retry 3 --url https://example.com/foo --url https://example.com/bar --verbose";
   };
 
   testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName {

From 311277204d035558b2eb965a5fd58113d905e4aa Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Wed, 10 Jul 2024 17:13:36 -0400
Subject: [PATCH 191/235] krb5: merge krb5 and libkrb5 with krb5.lib output

krb5 and libkrb5 are two separate derivations that can easily end up
in the same closure. They both provide the same shared libraries and
some packages end up getting both copies. Since both copies come from
the same source, packages often get lucky in this situation and just
use whichever library is found first. Sometimes packages are less
fortunate and end up trying to load both. This has gone largely
unnoticed in Nixpkgs, likely because Kerberos is not widely used
outside of enterprise deployments.

This situation seems to have arisen out of a need to break a cycle
in `fetchurl -> curl -> krb5 -> fetchurl`. The libkrb5 build was able to
avoid depending on bison and libedit, making it easier to break the
cycle.

However, we can break the cycle without resorting to two variants of
krb5. Libedit can be removed with configure flags and byacc can be used
instead of bison, allowing a much smaller build closure that can easily
be resolved when breaking the cycle.

This change also adds a "lib" output to krb5 so that packages depending
on krb5 can still benefit from a smaller runtime closure if they only
need the shared libraries.

A future change will include a tree-wide refactor to switch uses of
libkrb5 to krb5.
---
 pkgs/development/libraries/kerberos/krb5.nix | 89 ++++++++++----------
 pkgs/top-level/aliases.nix                   |  2 +-
 pkgs/top-level/all-packages.nix              |  6 +-
 3 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 7a51d454cf14..f48a2136ad11 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,5 +1,13 @@
-{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds
-, openssl, openldap, libedit, keyutils, libverto, darwin
+{ lib
+, stdenv
+, fetchurl
+, bootstrap_cmds
+, byacc # can also use bison, but byacc has fewer dependencies
+, darwin
+, keyutils
+, openssl
+, perl
+, pkg-config
 
 # for passthru.tests
 , bind
@@ -10,27 +18,17 @@
 , python3
 
 # Extra Arguments
-, type ? ""
+, withLdap ? false, openldap
+, withLibedit ? true, libedit
+, withVerto ? false, libverto
+
 # This is called "staticOnly" because krb5 does not support
 # builting both static and shared, see below.
 , staticOnly ? false
-, withLdap ? false
-, withVerto ? false
 }:
 
-# Note: this package is used for bootstrapping fetchurl, and thus
-# cannot use fetchpatch! All mutable patches (generated by GitHub or
-# cgit) that are needed here should be included directly in Nixpkgs as
-# files.
-
-let
-  libOnly = type == "lib";
-in
-
-assert withLdap -> !libOnly;
-
 stdenv.mkDerivation rec {
-  pname = "${type}krb5";
+  pname = "krb5";
   version = "1.21.3";
 
   src = fetchurl {
@@ -38,14 +36,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU=";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "lib" "dev" ];
 
-  configureFlags = [ "--localstatedir=/var/lib" ]
+  # While "out" acts as the bin output, most packages only care about the lib output.
+  # We set prefix such that all the pkg-config configuration stays inside the dev and lib outputs.
+  # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries.
+  prefix = builtins.placeholder "lib";
+
+  configureFlags = [
+      "--localstatedir=/var/lib"
+      (lib.withFeature withLdap "ldap")
+      (lib.withFeature withLibedit "libedit")
+      (lib.withFeature withVerto "system-verto")
+    ]
     # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.
     # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737
     ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ]
-    ++ lib.optional withLdap "--with-ldap"
-    ++ lib.optional withVerto "--with-system-verto"
     ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=''
     ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
        [ "krb5_cv_attr_constructor_destructor=yes,yes"
@@ -53,15 +59,14 @@ stdenv.mkDerivation rec {
          "ac_cv_printf_positional=yes"
        ];
 
-  nativeBuildInputs = [ pkg-config perl ]
-    ++ lib.optional (!libOnly) bison
+  nativeBuildInputs = [ byacc perl pkg-config ]
     # Provides the mig command used by the build scripts
     ++ lib.optional stdenv.isDarwin bootstrap_cmds;
 
   buildInputs = [ openssl ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ]
-    ++ lib.optionals (!libOnly) [ libedit ]
     ++ lib.optionals withLdap [ openldap ]
+    ++ lib.optionals withLibedit [ libedit ]
     ++ lib.optionals withVerto [ libverto ];
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [
@@ -73,7 +78,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace config/shlib.conf \
-        --replace "'ld " "'${stdenv.cc.targetPrefix}ld "
+      --replace "'ld " "'${stdenv.cc.targetPrefix}ld "
   ''
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
@@ -83,27 +88,17 @@ stdenv.mkDerivation rec {
 
   libFolders = [ "util" "include" "lib" "build-tools" ];
 
-  buildPhase = lib.optionalString libOnly ''
-    runHook preBuild
-
-    MAKE="make -j $NIX_BUILD_CORES"
-    for folder in $libFolders; do
-      $MAKE -C $folder
+  # To avoid cyclic outputs, we can't let lib depend on out in any way. Unfortunately, the configure
+  # options don't give us enough granularity to specify that, so we have to override the generated
+  # Makefiles manually.
+  postConfigure = ''
+    find $libFolders -type f -name Makefile -print0 | while IFS= read -rd "" f; do
+      substituteInPlace "$f" --replace-fail "$out" "$lib"
     done
-
-    runHook postBuild
   '';
 
-  installPhase = lib.optionalString libOnly ''
-    runHook preInstall
-
-    mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \
-      "$dev"/include/{gssapi,gssrpc,kadm5,krb5}
-    for folder in $libFolders; do
-      $MAKE -C $folder install
-    done
-
-    runHook postInstall
+  preInstall = ''
+    mkdir -p "$lib"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}}
   '';
 
   # not via outputBin, due to reference from libkrb5.so
@@ -111,6 +106,14 @@ stdenv.mkDerivation rec {
     moveToOutput bin/krb5-config "$dev"
   '';
 
+  # Disable _multioutDocs in stdenv by overriding it to be a no-op.
+  # We do this because $lib has its own docs and we don't want to squash them into $out.
+  preFixup = ''
+    _multioutDocs() {
+      echo Skipping multioutDocs
+    }
+  '';
+
   enableParallelBuilding = true;
   doCheck = false; # fails with "No suitable file for testing purposes"
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b15f42c3fa9..007ca15cda24 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -718,7 +718,7 @@ mapAliases ({
   keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
   keepkey_agent = keepkey-agent; # added 2024-01-06
-  kerberos = libkrb5; # moved from top-level 2021-03-14
+  kerberos = krb5; # moved from top-level 2021-03-14
   kexectools = kexec-tools; # Added 2021-09-03
   keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
   kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00afc7a54b0a..634d2fccc14b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1143,9 +1143,11 @@ with pkgs;
           if stdenv.isDarwin || stdenv.hostPlatform.isWindows
             then false
             else old.gssSupport or true; # `? true` is the default
-        libkrb5 = buildPackages.libkrb5.override {
+        libkrb5 = buildPackages.krb5.override {
           fetchurl = stdenv.fetchurlBoot;
           inherit pkg-config perl openssl;
+          withLibedit = false;
+          byacc = buildPackages.byacc.override { fetchurl = stdenv.fetchurlBoot; };
           keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
         };
         nghttp2 = buildPackages.nghttp2.override {
@@ -21079,7 +21081,7 @@ with pkgs;
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     inherit (buildPackages.darwin) bootstrap_cmds;
   };
-  libkrb5 = krb5.override { type = "lib"; };
+  libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency
 
   kronosnet = callPackage ../development/libraries/kronosnet { };
 

From b485499dd713c0599c57c937be518e66eac91f07 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sat, 17 Aug 2024 04:17:27 +0800
Subject: [PATCH 192/235] rl-2411.section.md: fix typo

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 5b3888d72c75..92f7e67e7f48 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -330,7 +330,7 @@
 
 - The `vendorHash` of Go packages built with `buildGoModule` can now be overridden with `overrideAttrs`.
   `goModules`, `modRoot`, `vendorHash`, `deleteVendor`, and `proxyVendor` are now passed as derivation attributes.
-  `goModules` and `vendorHash` are no longer placed t under `passthru`.
+  `goModules` and `vendorHash` are no longer placed under `passthru`.
 
 - `hareHook` has been added as the language framework for Hare. From now on, it,
   not the `hare` package, should be added to `nativeBuildInputs` when building

From ee1d23853f5fd73ddeb48091346b4e700a26d10e Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 Aug 2024 22:41:07 +0200
Subject: [PATCH 193/235] vim: 9.1.0595 -> 9.1.0679

Fixes CVE-2024-43374 (https://github.com/vim/vim/security/advisories/GHSA-2w8m-443v-cgvw),
CVE-2024-41957 (https://github.com/vim/vim/security/advisories/GHSA-f9cr-gv85-hcr4) and
CVE-2024-41965 (https://github.com/vim/vim/security/advisories/GHSA-46pw-v7qw-xc2f).

https://github.com/vim/vim/compare/v9.1.0595...v9.1.0679
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 50857ed1592b..a54ad6321339 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.0595";
+  version = "9.1.0679";
 
   outputs = [ "out" "xxd" ];
 
@@ -8,7 +8,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-v8xVP1WuvE9XdQl1LDIq3pjaKyqPWM0fsFKcpIwPbNA=";
+    hash = "sha256-o8GQfHw7KNjDx4zrCfZXyViS9WGiYD3tzS8inq0xqh0=";
   };
 
   enableParallelBuilding = true;

From d9780a8b8fda54f96eb2a58a0526235d18a08a39 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 00:05:34 +0200
Subject: [PATCH 194/235] python312Packages.aiohappyeyeballs: 2.3.5 -> 2.3.6

Diff: https://github.com/bdraco/aiohappyeyeballs/compare/refs/tags/v2.3.5...v2.3.6

Changelog: https://github.com/bdraco/aiohappyeyeballs/blob/v2.3.6/CHANGELOG.md
---
 pkgs/development/python-modules/aiohappyeyeballs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index b91d78c4db58..9ff8b61feed8 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohappyeyeballs";
-  version = "2.3.5";
+  version = "2.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "aiohappyeyeballs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-elWMUOrR7wVi3C+BBpz1T8jiEg7LiJDw6hSlnr5kNxU=";
+    hash = "sha256-3cin755WD3e75l+mm//KG+g2UEkHvdYYEFvkJ9j9D6s=";
   };
 
   outputs = [

From 3257fa4884945f9f64dd2be49ab4e696188eb14f Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Thu, 15 Aug 2024 19:34:36 +0200
Subject: [PATCH 195/235] unbound: 1.20.0 -> 1.21.0

Changes: https://github.com/NLnetLabs/unbound/releases/tag/release-1.21.0
Fixes: CVE-2024-43167
---
 pkgs/by-name/un/unbound/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 1a9025a4a907..0d827159358f 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz";
-    hash = "sha256-VrTO7TNjlSIAD9lndVdt34eCuzYXYQcV1/Hnd8XsHb8=";
+    hash = "sha256-59yn1rD4G9+m+mTr8QU7WpmaWukniofvGCQlBn6hRSE=";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From 31a6e1387f69eaaf01638764cd2fa3903d2d621d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 May 2024 00:39:31 +0200
Subject: [PATCH 196/235] python312Packages.exceptiongroup: refactor

---
 .../python-modules/exceptiongroup/default.nix          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 7dc9c78852ea..c39354ac24cc 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -4,30 +4,30 @@
   fetchFromGitHub,
   flit-scm,
   pytestCheckHook,
-  pythonOlder,
   pythonAtLeast,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "exceptiongroup";
   version = "1.2.1";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "agronholm";
     repo = "exceptiongroup";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-87HmZsbsoV7QPHux50sYsFY2RaIc3627dH3WAwqXfQU=";
   };
 
   nativeBuildInputs = [ flit-scm ];
 
-  doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest
-
   nativeCheckInputs = [ pytestCheckHook ];
 
+  doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest
+
   pythonImportsCheck = [ "exceptiongroup" ];
 
   meta = with lib; {

From ff69a5986077327ec04ad7b5e1a8a15191babf5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 May 2024 00:36:35 +0200
Subject: [PATCH 197/235] python312Packages.freezegun: refactor

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

diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix
index cc15733d053b..046b3f20046f 100644
--- a/pkgs/development/python-modules/freezegun/default.nix
+++ b/pkgs/development/python-modules/freezegun/default.nix
@@ -21,9 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-sp3t/NptXo4IPOcbK1QnU61Iz+xEA3s/x5cC4pgKiek=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-dateutil ];
+  dependencies = [ python-dateutil ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From e6f8f04f9e0e03fe13c61fc3c38f76eabc8f2ca9 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Sat, 17 Aug 2024 00:50:38 -0400
Subject: [PATCH 198/235] openssh: use krb5 dev output

---
 pkgs/tools/networking/openssh/common.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 17e228b041f3..6445aa4840ee 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -24,7 +24,7 @@
 , etcDir ? null
 , withKerberos ? false
 , withLdns ? true
-, libkrb5
+, krb5
 , libfido2
 , libxcrypt
 , hostname
@@ -60,15 +60,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
   nativeBuildInputs = [ autoreconfHook pkg-config ]
-    # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is
+    # This is not the same as the krb5 from the inputs! pkgs.krb5 is
     # needed here to access krb5-config in order to cross compile. See:
     # https://github.com/NixOS/nixpkgs/pull/107606
-    ++ lib.optional withKerberos pkgs.libkrb5
+    ++ lib.optional withKerberos pkgs.krb5
     ++ extraNativeBuildInputs;
   buildInputs = [ zlib libedit ]
     ++ [ (if linkOpenssl then openssl else libxcrypt) ]
     ++ lib.optional withFIDO libfido2
-    ++ lib.optional withKerberos libkrb5
+    ++ lib.optional withKerberos krb5
     ++ lib.optional withLdns ldns
     ++ lib.optional withPAM pam;
 
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature dsaKeysSupport "dsa-keys")
   ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
     ++ lib.optional withFIDO "--with-security-key-builtin=yes"
-    ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}")
+    ++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}")
     ++ lib.optional stdenv.isDarwin "--disable-libutil"
     ++ lib.optional (!linkOpenssl) "--without-openssl"
     ++ lib.optional withLdns "--with-ldns"

From 5f5c2e1f038f795accf9e712951f3ef1169712c2 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Sat, 17 Aug 2024 00:53:19 -0400
Subject: [PATCH 199/235] libgssglue: use krb5 lib output

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

diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix
index ef9b3d282156..b11c9e3600a5 100644
--- a/pkgs/development/libraries/libgssglue/default.nix
+++ b/pkgs/development/libraries/libgssglue/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitLab,
   autoreconfHook,
-  libkrb5,
+  krb5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir -p $out/etc
     cat <<EOF > $out/etc/gssapi_mech.conf
-    ${libkrb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init
+    ${lib.getLib krb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init
     EOF
   '';
 

From 28290731fb94876aa1a9fa7c0efbc3373ab41e70 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Sat, 17 Aug 2024 00:56:19 -0400
Subject: [PATCH 200/235] dotnet: use krb5 lib output

---
 pkgs/development/compilers/dotnet/vmr.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 8fd7cce1aa94..0a89e558915a 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -11,7 +11,7 @@
 , zlib
 , icu
 , lttng-ust_2_12
-, libkrb5
+, krb5
 , glibcLocales
 , ensureNewerSourcesForZipFilesHook
 , darwin
@@ -98,13 +98,13 @@ in stdenv.mkDerivation rec {
     openssl
   ]
   ++ lib.optionals isLinux [
-    libkrb5
+    krb5
     lttng-ust_2_12
   ]
   ++ lib.optionals isDarwin (with apple_sdk.frameworks; [
     xcbuild
     swift
-    (libkrb5.overrideAttrs (old: {
+    (krb5.overrideAttrs (old: {
       # the propagated build inputs break swift compilation
       buildInputs = old.buildInputs ++ old.propagatedBuildInputs;
       propagatedBuildInputs = [];
@@ -249,7 +249,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace \
       src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \
-      --replace-fail '"libgssapi_krb5.so.2"' '"${libkrb5}/lib/libgssapi_krb5.so.2"'
+      --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"'
 
     substituteInPlace \
       src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \

From cfe0e8e874f609c71d8511eb6a8c9d53f884aee0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 06:10:19 +0000
Subject: [PATCH 201/235] liburing: 2.6 -> 2.7

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

diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 95df981d02e7..c35df57b6052 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liburing";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "axboe";
     repo = "liburing";
     rev = "refs/tags/liburing-${version}";
-    hash = "sha256-UOhnFT4UKZmPchKxew3vYeKH2oETDVylE1RmJ2hnLq0=";
+    hash = "sha256-WhNlO2opPM7v4LOLWpmzPv31++zmn5Hmb6Su9IQBDH8=";
   };
 
   separateDebugInfo = true;

From 4c38d8a84621ed8c0a4f133ba167cb37f2ab0c9d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sat, 17 Aug 2024 17:24:28 +0200
Subject: [PATCH 202/235] nodejs: 22.5.1 -> 22.6.0 (#333210)

---
 pkgs/development/web/nodejs/v22.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 40aadb1f583d..9724d70c2b51 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
+{ callPackage, openssl, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
@@ -12,8 +12,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.5.1";
-  sha256 = "924f381a32cf26b6bedbe95feedde348450f4fd321283d3bf3f7965aa45ce831";
+  version = "22.6.0";
+  sha256 = "37259d618d5565ca55acc2585045c7e1c5b9965a3d4eb44c0a237fdae84b9d44";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch
@@ -22,9 +22,5 @@ buildNodejs {
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
-      hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";
-    })
   ] ++ gypPatches;
 }

From 9b9d7041a4dba3ffbd8a484d90a171765327d818 Mon Sep 17 00:00:00 2001
From: Elliot Cameron <nixpkgs-commits@deshaw.com>
Date: Sat, 17 Aug 2024 09:21:50 -0400
Subject: [PATCH 203/235] Reapply "gss: re-enable tests"

Two in-flight PRs (#327128 and #328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb4f8b236d5c54af6be631783299a4f5ec8.

The original commit was accidentally merged to master instead of
staging.
---
 pkgs/development/libraries/gss/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index ffa4ca77e251..42d22c2bd5fe 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/gss/gss-${version}.tar.gz";
     hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM=";
   };
-  # This test crashes now.  Most likely triggered by expiration on 20240711.
+
+  # krb5context test uses certificates that expired on 2024-07-11.
+  # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
   postPatch = ''
     rm tests/krb5context.c
   '';
@@ -29,10 +31,6 @@ stdenv.mkDerivation rec {
     "--${if withShishi then "enable" else "disable"}-kerberos5"
   ];
 
-  # krb5context test uses certificates that expired on 2024-07-11.
-  # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
-  doCheck = !withShishi;
-
   # Fixup .la files
   postInstall = lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la

From b9096d0d865f7e0fb202490f9c554dc1b34eb06d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 12:08:02 +0300
Subject: [PATCH 204/235] versionCheckHook: small indentation improvement

---
 pkgs/by-name/ve/versionCheckHook/hook.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh
index cd417493e6c2..4ff808a6da51 100644
--- a/pkgs/by-name/ve/versionCheckHook/hook.sh
+++ b/pkgs/by-name/ve/versionCheckHook/hook.sh
@@ -1,6 +1,11 @@
 _handleCmdOutput(){
     local versionOutput
-    versionOutput="$(env --chdir=/ --argv0="$(basename "$1")" --ignore-environment "$@" 2>&1 || true)"
+    versionOutput="$(env \
+        --chdir=/ \
+        --argv0="$(basename "$1")" \
+        --ignore-environment \
+        "$@" 2>&1 \
+        || true)"
     if [[ "$versionOutput" =~ "$version" ]]; then
         echoPrefix="Successfully managed to"
     else

From 393e966194039c3655bd75570e74ae8696640461 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 12:08:28 +0300
Subject: [PATCH 205/235] versionCheckHook: ignore echoed store paths

This makes sure the hook will catch cases where the --version or --help output
prints the installation dir or something alike that includes the
builtins.storeDir, and later on the `${pname}-${version}` string. Could
have avoided #334245 which was a fixup for #330456.
---
 pkgs/by-name/ve/versionCheckHook/hook.sh     | 1 +
 pkgs/by-name/ve/versionCheckHook/package.nix | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh
index 4ff808a6da51..88a046b552ee 100644
--- a/pkgs/by-name/ve/versionCheckHook/hook.sh
+++ b/pkgs/by-name/ve/versionCheckHook/hook.sh
@@ -5,6 +5,7 @@ _handleCmdOutput(){
         --argv0="$(basename "$1")" \
         --ignore-environment \
         "$@" 2>&1 \
+        | sed -e 's|@storeDir@/[^/ ]*/|{{storeDir}}/|g' \
         || true)"
     if [[ "$versionOutput" =~ "$version" ]]; then
         echoPrefix="Successfully managed to"
diff --git a/pkgs/by-name/ve/versionCheckHook/package.nix b/pkgs/by-name/ve/versionCheckHook/package.nix
index ed35384d7960..d5039db3f219 100644
--- a/pkgs/by-name/ve/versionCheckHook/package.nix
+++ b/pkgs/by-name/ve/versionCheckHook/package.nix
@@ -5,6 +5,9 @@
 
 makeSetupHook {
   name = "version-check-hook";
+  substitutions = {
+    storeDir = builtins.storeDir;
+  };
   meta = {
     description = "Lookup for $version in the output of --help and --version";
     maintainers = with lib.maintainers; [ doronbehar ];

From 2ecfdda4cd6c2dabe7377a5a3e667f7b1e0637d8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 16 Aug 2024 18:24:22 +0300
Subject: [PATCH 206/235] c3c: switch from testVersion to versionCheckHook

`versionCheckHook` is much more verbose then `testVersion`, and it
forces you to observe the failure when building it, and not only on CI /
if you explicitly build `c3c.passthru.tests`.
---
 pkgs/development/compilers/c3c/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix
index 6187b75cc874..7b9b2086b39f 100644
--- a/pkgs/development/compilers/c3c/default.nix
+++ b/pkgs/development/compilers/c3c/default.nix
@@ -8,7 +8,7 @@
   libxml2,
   libffi,
   xar,
-  testers,
+  versionCheckHook,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
@@ -48,9 +48,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  passthru.tests = {
-    version = testers.testVersion { package = finalAttrs.finalPackage; };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = with lib; {
     description = "Compiler for the C3 language";

From 3f648e2891cfc8f37086bb20248cb0bada556616 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 26 May 2024 01:42:41 +0300
Subject: [PATCH 207/235] gnumake: do not use MAKE_CXX

Removes unnecessary C++ compiler reference when CXX environment variable
is set to an absolute path.
---
 .../tools/build-managers/gnumake/default.nix  |  6 +-
 .../build-managers/gnumake/make-cxx.patch     | 64 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/make-cxx.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 4f6bc99fbf01..0e2619b69fdb 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, updateAutotoolsGnuConfigScriptsHook
+, autoreconfHook
 , guileSupport ? false, guile
 # avoid guile depend on bootstrap to prevent dependency cycles
 , inBootstrap ? false
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git
   patches = [
+    # See patch message.
+    ./make-cxx.patch
     # Replaces /bin/sh with sh, see patch file for reasoning
     ./0001-No-impure-bin-sh.patch
     # Purity: don't look for library dependencies (of the form `-lfoo') in /lib
@@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
     ./0002-remove-impure-dirs.patch
   ];
 
-  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals guileEnabled [ pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = lib.optionals guileEnabled [ guile ];
 
   configureFlags = lib.optional guileEnabled "--with-guile"
diff --git a/pkgs/development/tools/build-managers/gnumake/make-cxx.patch b/pkgs/development/tools/build-managers/gnumake/make-cxx.patch
new file mode 100644
index 000000000000..ccb63aab93d4
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/make-cxx.patch
@@ -0,0 +1,64 @@
+Do not search for a C++ compiler and set MAKE_CXX.
+
+Removes unnecessary reference to C++ compiler if CXX is set to an
+absolute path. If CXX is not an absolute path, we avoid defaulting CXX
+to a compiler name that was used to build the package.
+
+Context: GNU Make defines default values for CC, CXX and other
+environment variables. For CXX, it usually defaults to g++, however,
+FreeBSD and OpenBSD no longer ship GCC as a system compiler (and use
+Clang instead). For C compiler, POSIX standardizes the name to be "cc",
+but there is no such standard for C++ compiler name. As a fix, GNU Make
+uses CXX set for build as a default (via MAKE_CXX preprocessor macro in
+the source code).
+
+We revert the change that added this behavior and set the default to c++
+or g++ that does not depend on the build platform.
+
+In stdenv, CXX environment variable is always defined and overrides the
+default value.
+
+References:
+• https://savannah.gnu.org/bugs/?63668
+• https://git.savannah.gnu.org/cgit/make.git/commit/?id=ffa28f3914ff402b3915f75e4fed86ac6fb1449d
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,6 +37,4 @@ AM_INIT_AUTOMAKE([1.16.1 foreign -Werror -Wall])
+ # Checks for programs.
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+-AC_PROG_CXX
+-AC_DEFINE_UNQUOTED(MAKE_CXX, ["$CXX"], [Default C++ compiler.])
+
+--- a/src/default.c
++++ b/src/default.c
+@@ -528,22 +528,15 @@ static const char *default_variables[] =
+ #ifdef GCC_IS_NATIVE
+     "CC", "gcc",
+     "OBJC", "gcc",
++# ifdef __MSDOS__
++    "CXX", "gpp",       /* g++ is an invalid name on MSDOS */
++# else
++    "CXX", "g++",
++# endif /* __MSDOS__ */
+ #else
+     "CC", "cc",
+     "OBJC", "cc",
++    "CXX", "c++",
+ #endif
+-#ifdef MAKE_CXX
+-    "CXX", MAKE_CXX,
+-#else
+-# ifdef GCC_IS_NATIVE
+-#  ifdef __MSDOS__
+-    "CXX", "gpp",       /* g++ is an invalid name on MSDOS */
+-#  else
+-    "CXX", "gcc",
+-#  endif /* __MSDOS__ */
+-# else
+-    "CXX", "g++",
+-# endif
+-#endif
+     /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist,
+        and to the empty string if $@ does exist.  */

From 5fec23489572200c8da12dc7efecf4530afeaeb4 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 18 Aug 2024 08:43:30 +0300
Subject: [PATCH 208/235] gnumake: recreate patch set and move to patches
 directory

---
 .../tools/build-managers/gnumake/default.nix  | 23 ++++++------
 .../{ => patches}/0001-No-impure-bin-sh.patch | 10 +++---
 .../0002-Remove-impure-dirs.patch}            | 20 ++++++-----
 ...h-for-a-C-compiler-and-set-MAKE_CXX.patch} | 35 ++++++++++++++-----
 4 files changed, 56 insertions(+), 32 deletions(-)
 rename pkgs/development/tools/build-managers/gnumake/{ => patches}/0001-No-impure-bin-sh.patch (82%)
 rename pkgs/development/tools/build-managers/gnumake/{0002-remove-impure-dirs.patch => patches/0002-Remove-impure-dirs.patch} (55%)
 rename pkgs/development/tools/build-managers/gnumake/{make-cxx.patch => patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch} (68%)

diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 0e2619b69fdb..fcbb23a7119e 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -22,17 +22,18 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M=";
   };
 
-  # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git
-  patches = [
-    # See patch message.
-    ./make-cxx.patch
-    # Replaces /bin/sh with sh, see patch file for reasoning
-    ./0001-No-impure-bin-sh.patch
-    # Purity: don't look for library dependencies (of the form `-lfoo') in /lib
-    # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
-    # included Makefiles, don't look in /usr/include and friends.
-    ./0002-remove-impure-dirs.patch
-  ];
+  # To update patches:
+  #  $ version=4.4.1
+  #  $ git clone https://git.savannah.gnu.org/git/make.git
+  #  $ cd make && git checkout -b nixpkgs $version
+  #  $ git am --directory=../patches
+  #  $ # make changes, resolve conflicts, etc.
+  #  $ git format-patch --output-directory ../patches --diff-algorithm=histogram $version
+  #
+  # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very
+  # convenient to keep them in a separate directory but we can defer listing the
+  # directory until derivation realization to avoid unnecessary Nix evaluations.
+  patches = lib.filesystem.listFilesRecursive ./patches;
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = lib.optionals guileEnabled [ guile ];
diff --git a/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch b/pkgs/development/tools/build-managers/gnumake/patches/0001-No-impure-bin-sh.patch
similarity index 82%
rename from pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch
rename to pkgs/development/tools/build-managers/gnumake/patches/0001-No-impure-bin-sh.patch
index 58ee2d6fe09b..778cb4c20c9d 100644
--- a/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch
+++ b/pkgs/development/tools/build-managers/gnumake/patches/0001-No-impure-bin-sh.patch
@@ -1,7 +1,7 @@
-From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001
+From b69e3740e68afaec97b9957d40b9c135db87eaab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Sat, 24 Apr 2021 10:11:40 +0200
-Subject: [PATCH 1/2] No impure bin sh
+Subject: [PATCH 1/3] No impure bin sh
 
 default_shell is used to populuate default shell used to execute jobs.
 Unless SHELL is set to a different value this would be /bin/sh.
@@ -18,10 +18,10 @@ hard-coded has some advantages:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/job.c b/src/job.c
-index ae1f18b..6b4ddb3 100644
+index ea885614..8a9bd8e0 100644
 --- a/src/job.c
 +++ b/src/job.c
-@@ -77,7 +77,7 @@ char * vms_strsignal (int status);
+@@ -76,7 +76,7 @@ char * vms_strsignal (int status);
  
  #else
  
@@ -31,5 +31,5 @@ index ae1f18b..6b4ddb3 100644
  
  #endif
 -- 
-2.31.1
+2.44.1
 
diff --git a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch
similarity index 55%
rename from pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch
rename to pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch
index e62aee7d9993..8ba6b743176f 100644
--- a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch
+++ b/pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch
@@ -1,20 +1,24 @@
-From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001
+From 2db52008be2e2d504889f4f19318c2ba5a2a4797 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Sat, 24 Apr 2021 10:20:16 +0200
-Subject: [PATCH 2/2] remove impure dirs
+Subject: [PATCH 2/3] Remove impure dirs
 
+Purity: don't look for library dependencies (of the form `-lfoo') in
+/lib and /usr/lib. It's a stupid feature anyway. Likewise, when
+searching for included Makefiles, don't look in /usr/include and
+friends.
 ---
  src/read.c   | 3 ---
  src/remake.c | 2 --
  2 files changed, 5 deletions(-)
 
 diff --git a/src/read.c b/src/read.c
-index fa197fb..defacfb 100644
+index b0fc1e1f..d6b41c17 100644
 --- a/src/read.c
 +++ b/src/read.c
-@@ -109,9 +109,6 @@ static const char *default_include_directories[] =
- #endif
+@@ -111,9 +111,6 @@ static const char *default_include_directories[] =
      INCLUDEDIR,
+ #endif
  #ifndef _AMIGA
 -    "/usr/gnu/include",
 -    "/usr/local/include",
@@ -23,10 +27,10 @@ index fa197fb..defacfb 100644
      0
    };
 diff --git a/src/remake.c b/src/remake.c
-index fb237c5..94bff7d 100644
+index fe67ab28..1b76560c 100644
 --- a/src/remake.c
 +++ b/src/remake.c
-@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
+@@ -1690,8 +1690,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
    static const char *dirs[] =
      {
  #ifndef _AMIGA
@@ -36,5 +40,5 @@ index fb237c5..94bff7d 100644
  #if defined(WINDOWS32) && !defined(LIBDIR)
  /*
 -- 
-2.31.1
+2.44.1
 
diff --git a/pkgs/development/tools/build-managers/gnumake/make-cxx.patch b/pkgs/development/tools/build-managers/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
similarity index 68%
rename from pkgs/development/tools/build-managers/gnumake/make-cxx.patch
rename to pkgs/development/tools/build-managers/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
index ccb63aab93d4..cb0ce4defb45 100644
--- a/pkgs/development/tools/build-managers/gnumake/make-cxx.patch
+++ b/pkgs/development/tools/build-managers/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
@@ -1,4 +1,10 @@
-Do not search for a C++ compiler and set MAKE_CXX.
+From 3317b3a78666e6073c63f62a322176e3dc680461 Mon Sep 17 00:00:00 2001
+From: Ivan Trubach <mr.trubach@icloud.com>
+Date: Sat, 17 Aug 2024 22:35:03 +0300
+Subject: [PATCH 3/3] Do not search for a C++ compiler and set MAKE_CXX
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Removes unnecessary reference to C++ compiler if CXX is set to an
 absolute path. If CXX is not an absolute path, we avoid defaulting CXX
@@ -19,18 +25,28 @@ In stdenv, CXX environment variable is always defined and overrides the
 default value.
 
 References:
-• https://savannah.gnu.org/bugs/?63668
-• https://git.savannah.gnu.org/cgit/make.git/commit/?id=ffa28f3914ff402b3915f75e4fed86ac6fb1449d
+ • https://savannah.gnu.org/bugs/?63668
+ • https://git.savannah.gnu.org/cgit/make.git/commit/?id=ffa28f3914ff402b3915f75e4fed86ac6fb1449d
+---
+ configure.ac  |  2 --
+ src/default.c | 19 ++++++-------------
+ 2 files changed, 6 insertions(+), 15 deletions(-)
 
+diff --git a/configure.ac b/configure.ac
+index cd785754..41a65307 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -37,6 +37,4 @@ AM_INIT_AUTOMAKE([1.16.1 foreign -Werror -Wall])
+@@ -37,8 +37,6 @@ AM_INIT_AUTOMAKE([1.16.1 foreign -Werror -Wall])
  # Checks for programs.
  AC_USE_SYSTEM_EXTENSIONS
  AC_PROG_CC
 -AC_PROG_CXX
 -AC_DEFINE_UNQUOTED(MAKE_CXX, ["$CXX"], [Default C++ compiler.])
-
+ 
+ # Configure gnulib
+ gl_EARLY
+diff --git a/src/default.c b/src/default.c
+index e396269b..78ba402f 100644
 --- a/src/default.c
 +++ b/src/default.c
 @@ -528,22 +528,15 @@ static const char *default_variables[] =
@@ -45,8 +61,7 @@ References:
  #else
      "CC", "cc",
      "OBJC", "cc",
-+    "CXX", "c++",
- #endif
+-#endif
 -#ifdef MAKE_CXX
 -    "CXX", MAKE_CXX,
 -#else
@@ -59,6 +74,10 @@ References:
 -# else
 -    "CXX", "g++",
 -# endif
--#endif
++    "CXX", "c++",
+ #endif
      /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist,
         and to the empty string if $@ does exist.  */
+-- 
+2.44.1
+

From 6f4426f80fc454cc7454d6b395562f787b9bda83 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 15 Aug 2024 19:34:28 +0200
Subject: [PATCH 209/235] neovim-unwrapped: use outputChecks

`disallowedRequisites` and friends will be ignored if `__structuredAttrs`
is used. In Nix versions <2.24 and Lix <2.91 this happens silently, in
newer versions a warning is printed.

The solution is to use outputChecks.
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index b40ffac4a3a6..1b57a31ae15f 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -147,7 +147,12 @@ in {
       find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
     '';
     # check that the above patching actually works
-    disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
+    outputChecks = let
+      disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
+    in {
+      out = { inherit disallowedRequisites; };
+      debug = { inherit disallowedRequisites; };
+    };
 
     cmakeFlagsArray = [
       # Don't use downloaded dependencies. At the end of the configurePhase one

From 468cfccb0cd92f9a48dac88cfea5c0168664a7fa Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 1 Apr 2024 02:51:04 +0800
Subject: [PATCH 210/235] cmake: setup-hook.sh: unify indentation

---
 pkgs/by-name/cm/cmake/setup-hook.sh | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 7ceb24227857..0bb0426bca82 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -150,38 +150,38 @@ fi
 
 addEnvHooks "$targetOffset" addCMakeParams
 
-makeCmakeFindLibs(){
-  isystem_seen=
-  iframework_seen=
-  for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; do
-    if test -n "$isystem_seen" && test -d "$flag"; then
-      isystem_seen=
-      addToSearchPath CMAKE_INCLUDE_PATH "${flag}"
-    elif test -n "$iframework_seen" && test -d "$flag"; then
-      iframework_seen=
-      addToSearchPath CMAKE_FRAMEWORK_PATH "${flag}"
-    else
-      isystem_seen=
-      iframework_seen=
-      case $flag in
-        -I*)
-          addToSearchPath CMAKE_INCLUDE_PATH "${flag:2}"
-          ;;
-        -L*)
-          addToSearchPath CMAKE_LIBRARY_PATH "${flag:2}"
-          ;;
-        -F*)
-          addToSearchPath CMAKE_FRAMEWORK_PATH "${flag:2}"
-          ;;
-        -isystem)
-          isystem_seen=1
-          ;;
-        -iframework)
-          iframework_seen=1
-          ;;
-      esac
-    fi
-  done
+makeCmakeFindLibs() {
+    isystem_seen=
+    iframework_seen=
+    for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; do
+        if test -n "$isystem_seen" && test -d "$flag"; then
+            isystem_seen=
+            addToSearchPath CMAKE_INCLUDE_PATH "${flag}"
+        elif test -n "$iframework_seen" && test -d "$flag"; then
+            iframework_seen=
+            addToSearchPath CMAKE_FRAMEWORK_PATH "${flag}"
+        else
+            isystem_seen=
+            iframework_seen=
+            case $flag in
+            -I*)
+                addToSearchPath CMAKE_INCLUDE_PATH "${flag:2}"
+                ;;
+            -L*)
+                addToSearchPath CMAKE_LIBRARY_PATH "${flag:2}"
+                ;;
+            -F*)
+                addToSearchPath CMAKE_FRAMEWORK_PATH "${flag:2}"
+                ;;
+            -isystem)
+                isystem_seen=1
+                ;;
+            -iframework)
+                iframework_seen=1
+                ;;
+            esac
+        fi
+    done
 }
 
 # not using setupHook, because it could be a setupHook adding additional

From 3f255f7f288f0105a993edd778c0f8d5a7e406ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Aug 2024 00:19:26 +0000
Subject: [PATCH 211/235] catch2_3: 3.5.2 -> 3.7.0

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

diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index cf0a0bf70fc1..5985ec519ae4 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.5.2";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    hash = "sha256-xGPfXjk+oOnR7JqTrZd2pKJxalrlS8CMs7HWDClXaS8=";
+    hash = "sha256-U9hv6DaqN5eCMcAQdfFPqWpsbqDFxRQixELSGbNlc0g=";
   };
 
   nativeBuildInputs = [

From 65e73f4d7aedaf94189f6eba4f43f5f7be2a1d39 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 14 Aug 2024 02:06:49 +0000
Subject: [PATCH 212/235] python312Packages.gunicorn: 22.0.0 -> 23.0.0

Fixes CVE-2024-1135

Changelog: https://github.com/benoitc/gunicorn/releases/tag/23.0.0
Diff: https://github.com/benoitc/gunicorn/compare/22.0.0...23.0.0
---
 pkgs/development/python-modules/gunicorn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 909fff5b5aaa..45a7b6862421 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -22,16 +22,16 @@
 
 buildPythonPackage rec {
   pname = "gunicorn";
-  version = "22.0.0";
+  version = "23.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "benoitc";
     repo = "gunicorn";
     rev = "refs/tags/${version}";
-    hash = "sha256-xIXQMAdTZEBORu6789tLpT1OpBL+aveL/MfDj4f4bes=";
+    hash = "sha256-Dq/mrQwo3II6DBvYfD1FHsKHaIlyHlJCZ+ZyrM4Efe0=";
   };
 
   build-system = [ setuptools ];

From 0b136159899e31b0eb9598f5965447ff45f23b04 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 17 Aug 2024 17:03:39 -0400
Subject: [PATCH 213/235] python312Packages.mlflow: relax gunicorn dependency

Upstream wants <23.0.0
---
 pkgs/development/python-modules/mlflow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 35490069b5ec..7032d0e91d51 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -56,6 +56,7 @@ buildPythonPackage rec {
   # but not mlflow has a 'skinny' install option which does not require `shap`.
   pythonRemoveDeps = [ "shap" ];
   pythonRelaxDeps = [
+    "gunicorn"
     "packaging"
     "pytz"
     "pyarrow"

From 6b25e1888763d7a5ef6414f26961ca2988ffd19a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 19 Aug 2024 14:23:47 +0300
Subject: [PATCH 214/235] aquamarine: fix build

This tries to load wayland.xml from wayland-client.pc, but it's
installed alongside wayland-scanner.
---
 ...nd.xml-is-in-wayland-scanner-pkgdata.patch | 37 +++++++++++++++++++
 pkgs/by-name/aq/aquamarine/package.nix        |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch

diff --git a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
new file mode 100644
index 000000000000..dbce9fe936f1
--- /dev/null
+++ b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
@@ -0,0 +1,37 @@
+From 735130758ee6fca74115ca4ec89c6d0dd26777eb Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Mon, 19 Aug 2024 14:17:37 +0300
+Subject: [PATCH] CMakeLists: wayland.xml is in wayland-scanner pkgdatadir
+
+See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc4db31..a61e375 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,8 +71,8 @@ endif()
+ # Protocols
+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+ message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
+-pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir)
+-message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}")
++pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir)
++message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}")
+ 
+ function(protocolNew protoPath protoName external)
+   if(external)
+@@ -94,7 +94,7 @@ function(protocolWayland)
+     OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
+            ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
+     COMMAND hyprwayland-scanner --wayland-enums --client
+-            ${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
++            ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+   target_sources(aquamarine PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
+ endfunction()
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index da7bb52a9dd6..6c8290f4d721 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -19,6 +19,7 @@
   udev,
   wayland,
   wayland-protocols,
+  wayland-scanner,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "aquamarine";
@@ -31,6 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1RYuBS/CQhtyIeXrLDvGWJhuVG1kiQMG+aYaBkoGnEU=";
   };
 
+  # https://github.com/hyprwm/aquamarine/pull/55
+  patches = [ ./CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch ];
+
   nativeBuildInputs = [
     cmake
     hyprwayland-scanner
@@ -51,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     wayland
     wayland-protocols
+    wayland-scanner
   ];
 
   strictDeps = true;

From 51930e034347bb25bff50346086c65cc089fb2f0 Mon Sep 17 00:00:00 2001
From: Michael Lohmann <mi.al.lohmann@gmail.com>
Date: Fri, 15 Dec 2023 02:12:54 +0100
Subject: [PATCH 215/235] git: re-enable a few tests that are fixed upstream

- t5150: now has the proper perl prerequisite check:
  https://git.kernel.org/pub/scm/git/git.git/tree/t/t5150-request-pull.sh?h=v2.43.0#n10
- t5319: flake was fixed:
  https://git.kernel.org/pub/scm/git/git.git/commit/?id=152923b132d57e1dbd693a8cb9a8bc1827405674
- t1700: no idea what did the fix, but it is working again
---
 .../version-management/git/default.nix            | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 0257cdb00122..dd1b96c29a8c 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -325,8 +325,11 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace t/test-lib.sh \
       --replace "test_set_prereq POSIXPERM" ""
     # TODO: Investigate while these still fail (without POSIXPERM):
+    # Tested to fail: 2.46.0
     disable_test t0001-init 'shared overrides system'
+    # Tested to fail: 2.46.0
     disable_test t0001-init 'init honors global core.sharedRepository'
+    # Tested to fail: 2.46.0
     disable_test t1301-shared-repo
     # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
     disable_test t9902-completion
@@ -337,24 +340,12 @@ stdenv.mkDerivation (finalAttrs: {
     # Disable sendmail tests
     disable_test t9001-send-email
   '' + ''
-    # XXX: I failed to understand why this one fails.
-    # Could someone try to re-enable it on the next release ?
-    # Tested to fail: 2.18.0 and 2.19.0
-    disable_test t1700-split-index "null sha1"
-
     # Flaky tests:
-    disable_test t5319-multi-pack-index
     disable_test t6421-merge-partial-clone
 
     # Fails reproducibly on ZFS on Linux with formD normalization
     disable_test t0021-conversion
     disable_test t3910-mac-os-precompose
-
-  '' + lib.optionalString (!perlSupport) ''
-    # request-pull is a Bash script that invokes Perl, so it is not available
-    # when NO_PERL=1, and the test should be skipped, but the test suite does
-    # not check for the Perl prerequisite.
-    disable_test t5150-request-pull
   '' + lib.optionalString stdenv.isDarwin ''
     # XXX: Some tests added in 2.24.0 fail.
     # Please try to re-enable on the next release.

From e3244e9ff008312235d213cc1066eaa8d2602ce1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 18 Aug 2024 12:52:34 +0200
Subject: [PATCH 216/235] treewide: replace xxxFlagsArray with non-Array
 variant in nix code

The xxxFlagsArray variants were never meant to be used in nix code, at
least they can't be used properly without __structuredAttrs turned on.

If no spaces are passed in the argument the xxxFlagsArray can be
replaced as-is with the non-Array variant. When whitespace needs to be
passed, the derivation is additionally changed to enable
__structuredAttrs.
---
 pkgs/applications/graphics/oculante/default.nix  |  3 +--
 .../element/keytar/default.nix                   |  8 ++++----
 pkgs/applications/video/uvccapture/default.nix   |  2 +-
 pkgs/by-name/ne/neovim-unwrapped/package.nix     | 16 +++++++---------
 pkgs/by-name/xm/xmoji/package.nix                |  2 +-
 pkgs/by-name/xr/xr-hardware/package.nix          |  2 +-
 pkgs/development/cuda-modules/nccl/default.nix   |  2 +-
 pkgs/development/cuda-modules/saxpy/default.nix  |  2 +-
 .../libraries/appindicator-sharp/default.nix     |  2 +-
 .../libraries/science/math/bonmin/default.nix    |  4 +++-
 .../libraries/science/math/scalapack/default.nix |  4 +++-
 .../libraries/webkit2-sharp/default.nix          |  2 +-
 .../tools/build-managers/fac/default.nix         |  2 +-
 .../tools/rust/cargo-cache/default.nix           |  2 +-
 pkgs/games/warmux/default.nix                    |  4 +++-
 pkgs/servers/janus-gateway/default.nix           |  2 +-
 pkgs/tools/backup/monolith/default.nix           |  2 +-
 pkgs/tools/cd-dvd/sacd/default.nix               |  2 +-
 pkgs/tools/misc/intermodal/default.nix           |  2 +-
 pkgs/tools/security/sudo/default.nix             |  5 +----
 20 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix
index 3f3d39769f81..eafa515da340 100644
--- a/pkgs/applications/graphics/oculante/default.nix
+++ b/pkgs/applications/graphics/oculante/default.nix
@@ -41,8 +41,6 @@ rustPlatform.buildRustPackage rec {
     wrapGAppsHook3
   ];
 
-  checkFlagsArray = [ "--skip=tests::net" ]; # requires network access
-
   buildInputs = [
     openssl
     fontconfig
@@ -62,6 +60,7 @@ rustPlatform.buildRustPackage rec {
 
   checkFlags = [
     "--skip=bench"
+    "--skip=tests::net" # requires network access
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
index d43894e08239..7d17d582762a 100644
--- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
+++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
@@ -37,10 +37,10 @@ in stdenv.mkDerivation rec {
   '';
 
   # https://nodejs.org/api/os.html#osarch
-  npmFlagsArray = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32"
-                             else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64"
-                             else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64"
-                             else stdenv.hostPlatform.parsed.cpu.name}" ];
+  npmFlags = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32"
+                        else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64"
+                        else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64"
+                        else stdenv.hostPlatform.parsed.cpu.name}" ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix
index 96e42b1a7f95..f7067c8dd71a 100644
--- a/pkgs/applications/video/uvccapture/default.nix
+++ b/pkgs/applications/video/uvccapture/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  makeFlagsArray = [ "PREFIX=$(out)/bin/" ];
+  makeFlags = [ "PREFIX=$(out)/bin/" ];
 
   preInstall = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index b40ffac4a3a6..3eeee33d068b 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -149,7 +149,7 @@ in {
     # check that the above patching actually works
     disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
 
-    cmakeFlagsArray = [
+    cmakeFlags = [
       # Don't use downloaded dependencies. At the end of the configurePhase one
       # can spot that cmake says this option was "not used by the project".
       # That's because all dependencies were found and
@@ -157,15 +157,13 @@ in {
       "-DUSE_BUNDLED=OFF"
     ]
     ++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
-    ;
+    ++ lib.optionals lua.pkgs.isLuaJIT [
+      "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -"
+      "-DLUA_GEN_PRG=${codegenLua}/bin/luajit"
+      "-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit"
+    ];
 
-    preConfigure = lib.optionalString lua.pkgs.isLuaJIT ''
-      cmakeFlagsArray+=(
-        "-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -"
-        "-DLUA_GEN_PRG=${codegenLua}/bin/luajit"
-        "-DLUA_PRG=${neovimLuaEnvOnBuild}/bin/luajit"
-      )
-    '' + lib.optionalString stdenv.isDarwin ''
+    preConfigure = lib.optionalString stdenv.isDarwin ''
       substituteInPlace src/nvim/CMakeLists.txt --replace "    util" ""
     '' + ''
       mkdir -p $out/lib/nvim/parser
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index f8558cb8146a..de0b48feaf04 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilimage
   ];
 
-  makeFlagsArray = [ "prefix=${placeholder "out"}" ];
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
   meta = {
     description = "Plain X11 emoji keyboard";
diff --git a/pkgs/by-name/xr/xr-hardware/package.nix b/pkgs/by-name/xr/xr-hardware/package.nix
index 0f9b9360d3c0..aa7bd7596a68 100644
--- a/pkgs/by-name/xr/xr-hardware/package.nix
+++ b/pkgs/by-name/xr/xr-hardware/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontBuild = true;
 
   installTargets = "install_package";
-  installFlagsArray = "DESTDIR=${placeholder "out"}";
+  installFlags = "DESTDIR=${placeholder "out"}";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix
index 3dd36e17f0a4..00026d97e69f 100644
--- a/pkgs/development/cuda-modules/nccl/default.nix
+++ b/pkgs/development/cuda-modules/nccl/default.nix
@@ -69,7 +69,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     patchShebangs ./src/device/generate.py
   '';
 
-  makeFlagsArray =
+  makeFlags =
     [
       "PREFIX=$(out)"
       "NVCC_GENCODE=${cudaFlags.gencodeString}"
diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix
index 5eb0a235ace8..57b6120ccea9 100644
--- a/pkgs/development/cuda-modules/saxpy/default.nix
+++ b/pkgs/development/cuda-modules/saxpy/default.nix
@@ -53,7 +53,7 @@ backendStdenv.mkDerivation {
     ]
     ++ lib.optionals (cudaAtLeast "12.0") [ cuda_cccl ];
 
-  cmakeFlagsArray = [
+  cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
   ];
diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/development/libraries/appindicator-sharp/default.nix
index 9eff4e3895ba..3062074f4cd7 100644
--- a/pkgs/development/libraries/appindicator-sharp/default.nix
+++ b/pkgs/development/libraries/appindicator-sharp/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   ac_cv_path_MDOC = "no";
-  installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
+  installFlags = ["GAPIXMLDIR=/tmp/gapixml"];
 
   meta = {
     description = "Bindings for appindicator using gobject-introspection";
diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix
index 9fca78df7c63..a389c602b1b6 100644
--- a/pkgs/development/libraries/science/math/bonmin/default.nix
+++ b/pkgs/development/libraries/science/math/bonmin/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     doxygen
     gfortran
@@ -50,7 +52,7 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  configureFlagsArray = lib.optionals stdenv.isDarwin [
+  configureFlags = lib.optionals stdenv.isDarwin [
     "--with-asl-lib=-lipoptamplinterface -lamplsolver"
   ];
 
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index f1e0f6cf5a12..b36f48647819 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit (blas) isILP64; };
 
+  __structuredAttrs = true;
+
   # upstream patch, remove with next release
   patches = [ (fetchpatch {
     name = "gcc-10";
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
 
   # Increase individual test timeout from 1500s to 10000s because hydra's builds
   # sometimes fail due to this
-  checkFlagsArray = [ "ARGS=--timeout 10000" ];
+  checkFlags = [ "ARGS=--timeout 10000" ];
 
   postFixup = ''
     # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated
diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix
index de10fff43da0..6407a8709f6e 100644
--- a/pkgs/development/libraries/webkit2-sharp/default.nix
+++ b/pkgs/development/libraries/webkit2-sharp/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   ac_cv_path_MONODOCER = "no";
-  installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"];
+  installFlags = ["GAPIXMLDIR=/tmp/gapixml"];
 
   passthru = {
     inherit webkitgtk;
diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix
index d4748ecf98a0..b44cefe6a953 100644
--- a/pkgs/development/tools/build-managers/fac/default.nix
+++ b/pkgs/development/tools/build-managers/fac/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   # fac includes a unit test called ls_files_works which assumes it's
   # running in a git repo. Nix's sandbox runs cargo build outside git,
   # so this test won't work.
-  checkFlagsArray = [ "--skip=ls_files_works" ];
+  checkFlags = [ "--skip=ls_files_works" ];
 
   # fac calls git at runtime, expecting it to be in the PATH,
   # so we need to patch it to call git by absolute path instead.
diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index 8c8a4ea29a34..1c19b61bf8b4 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
-  checkFlagsArray = [ "offline_tests" ];
+  checkFlags = [ "offline_tests" ];
 
   meta = with lib; {
     description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively";
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix
index 2e3a96a08651..368f0d39e9c2 100644
--- a/pkgs/games/warmux/default.nix
+++ b/pkgs/games/warmux/default.nix
@@ -15,8 +15,10 @@ stdenv.mkDerivation {
     sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
   };
 
+  __structuredAttrs = true;
+
   preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
-  configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
+  configureFlags = ["CFLAGS=-include ${zlib.dev}/include/zlib.h"];
 
   nativeBuildInputs = [
     autoconf automake gettext intltool libtool pkg-config
diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix
index 8a08962f646b..9a0ecad23dd4 100644
--- a/pkgs/servers/janus-gateway/default.nix
+++ b/pkgs/servers/janus-gateway/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "--enable-post-processing"
   ];
 
-  makeFlagsArray = [
+  makeFlags = [
     "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib"
   ];
 
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index b43e97e1ba95..b95ada9574ed 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.isLinux [ openssl ]
     ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ];
 
-  checkFlagsArray = [ "--skip=tests::cli" ];
+  checkFlags = [ "--skip=tests::cli" ];
 
   meta = with lib; {
     description = "Bundle any web page into a single HTML file";
diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix
index 67c70ebc76a0..ddd2c2dcd8c8 100644
--- a/pkgs/tools/cd-dvd/sacd/default.nix
+++ b/pkgs/tools/cd-dvd/sacd/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  makeFlagsArray = [
+  makeFlags = [
     "PREFIX=$(out)"
   ];
 
diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix
index c15d529279da..a12008408723 100644
--- a/pkgs/tools/misc/intermodal/default.nix
+++ b/pkgs/tools/misc/intermodal/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-7vtUMG6mxAHKnbouyTsaUf1myJssxYoqAIOjc6m86Fo=";
 
   # include_hidden test tries to use `chflags` on darwin
-  checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
+  checkFlags = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 885fcc51aa48..508cfafc69de 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-iologdir=/var/log/sudo-io"
     "--with-sendmail=${sendmailPath}"
     "--enable-tmpfiles.d=no"
+    "--with-passprompt=[sudo] password for %p: " # intentional trailing space
   ] ++ lib.optionals withInsults [
     "--with-insults"
     "--with-all-insults"
@@ -47,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-sssd-lib=${sssd}/lib"
   ];
 
-  configureFlagsArray = [
-    "--with-passprompt=[sudo] password for %p: " # intentional trailing space
-  ];
-
   postConfigure =
     ''
       cat >> pathnames.h <<'EOF'

From 755c316f384eb6da4e95c24472dd7466b74112ee Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 19 Aug 2024 22:53:10 +0200
Subject: [PATCH 217/235] php-packages: remove unused checkXXX options from
 buildPecl derivations

buildPecl overwrites the checkPhase like this:

  checkPhase = "NO_INTERACTON=yes make test";

Thus none of the checkXXX options set in nix are actually used.
---
 pkgs/development/php-packages/apcu/default.nix   | 5 -----
 pkgs/development/php-packages/xdebug/default.nix | 1 -
 2 files changed, 6 deletions(-)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 2e8294d0345b..8a94ed44f098 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -38,11 +38,6 @@ buildPecl {
 
   buildInputs = [ pcre2 ];
   doCheck = true;
-  checkTarget = "test";
-  checkFlagsArray = [
-    "REPORT_EXIT_STATUS=1"
-    "NO_INTERACTION=1"
-  ];
   makeFlags = [ "phpincludedir=$(dev)/include" ];
   outputs = [
     "out"
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 83e6950b0fe7..84ac38f6c4b8 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -20,7 +20,6 @@ buildPecl {
   };
 
   doCheck = true;
-  checkTarget = "test";
 
   zendExtension = true;
 

From 124392093c923021bde48c2ac54938ba87a2eb0f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 20 Aug 2024 06:58:25 +0100
Subject: [PATCH 218/235] wine64Packages.wayland: add missing `wayland-scanner`
 build input

Without the change the build fails on `staging` as:

    wine64-wayland> checking for wayland-scanner... Package wayland-scanner was not found in the pkg-config search path.
    wine64-wayland> Perhaps you should add the directory containing `wayland-scanner.pc'
    wine64-wayland> to the PKG_CONFIG_PATH environment variable
    wine64-wayland> No package 'wayland-scanner' found
    wine64-wayland> no
    ...
    wine64-wayland> configure: error: Wayland 64-bit development files not found or not new enough, the Wayland driver won't be supported.
    wine64-wayland> This is an error since --with-wayland was requested.
---
 pkgs/applications/emulators/wine/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 54fea4cc901e..dccf67a7a9bb 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -106,7 +106,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
     libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm
   ])
   ++ lib.optionals waylandSupport (with pkgs; [
-     wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
+     wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
      mesa # for libgbm
   ])));
 

From 425ff51abc39a7e9d47b50f0245307d5ee50e228 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 20 Aug 2024 07:11:00 +0100
Subject: [PATCH 219/235] gtk4: 4.14.4 -> 4.14.5

Changes: https://gitlab.gnome.org/GNOME/gtk/-/blob/4.14.5/NEWS
---
 pkgs/development/libraries/gtk/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index 57ef21ed595f..3a144b2de3ac 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -69,7 +69,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4";
-  version = "4.14.4";
+  version = "4.14.5";
 
   outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
   outputBin = "dev";
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-    hash = "sha256-RDUYuX6DSPn2QwrENbEBD5psUgf03Gp81dJOOCDO5jM=";
+    hash = "sha256-VUfyufAGsTOZPgcLh8F4BOBR79o5E/6soRCPor5B4k0=";
   };
 
   depsBuildBuild = [

From 198af78cb6bf6fb4e195e390bb79fa05926a85ce Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 20 Aug 2024 06:49:36 -0700
Subject: [PATCH 220/235] nixpkgs-manual: fix build

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

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index e40b92f952b1..3100124e0ce5 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -91,7 +91,7 @@ To obtain the hash without external tools, set `vendorHash = lib.fakeHash;` and
 }
 ```
 
-### Overriding `goModules` (#buildGoModule-goModules-override)
+### Overriding `goModules` {#buildGoModule-goModules-override}
 
 Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation. Alternatively, the primary derivation provides an overridable `passthru.overrideModAttrs` function to store the attribute overlay implicitly taken by `goModules.overrideAttrs`. Here's an example usage of `overrideModAttrs`:
 

From f5b3a9cd32d98a3cbcd318592fa468052dfb0c87 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 20 Aug 2024 23:19:14 +0800
Subject: [PATCH 221/235] elpa-packages: updated 2024-08-20 (from overlay)

---
 .../emacs/elisp-packages/elpa-generated.nix   | 1458 ++++++-----------
 1 file changed, 480 insertions(+), 978 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 9610c4070262..d9839c4d46e5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -46,7 +46,6 @@
   activities = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -54,15 +53,12 @@
     elpaBuild {
       pname = "activities";
       ename = "activities";
-      version = "0.7";
+      version = "0.7.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/activities-0.7.tar";
-        sha256 = "1775cdk9hv257m6l7icg247fc36g7lwgjg8iivj52m6qg7p7cz9g";
+        url = "https://elpa.gnu.org/packages/activities-0.7.1.tar";
+        sha256 = "1khhkfyy251mag5zqybsvfg3sak0aac1qlsdl1wyiin7f6sq9563";
       };
-      packageRequires = [
-        emacs
-        persist
-      ];
+      packageRequires = [ persist ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/activities.html";
         license = lib.licenses.free;
@@ -72,7 +68,6 @@
   ada-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -88,7 +83,6 @@
         sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         uniquify-files
         wisi
@@ -144,7 +138,6 @@
   adjust-parens = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -156,7 +149,7 @@
         url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar";
         sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
         license = lib.licenses.free;
@@ -166,7 +159,6 @@
   advice-patch = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -178,7 +170,7 @@
         url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar";
         sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/advice-patch.html";
         license = lib.licenses.free;
@@ -188,7 +180,6 @@
   aggressive-completion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -200,7 +191,7 @@
         url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar";
         sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
         license = lib.licenses.free;
@@ -210,7 +201,6 @@
   aggressive-indent = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -222,7 +212,7 @@
         url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar";
         sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
         license = lib.licenses.free;
@@ -232,7 +222,6 @@
   ahungry-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -244,7 +233,7 @@
         url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
         sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
         license = lib.licenses.free;
@@ -254,7 +243,6 @@
   aircon-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -266,7 +254,7 @@
         url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar";
         sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
         license = lib.licenses.free;
@@ -276,7 +264,6 @@
   all = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -288,7 +275,7 @@
         url = "https://elpa.gnu.org/packages/all-1.1.tar";
         sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/all.html";
         license = lib.licenses.free;
@@ -298,7 +285,6 @@
   altcaps = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -310,7 +296,7 @@
         url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar";
         sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/altcaps.html";
         license = lib.licenses.free;
@@ -384,7 +370,6 @@
   assess = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       m-buffer,
@@ -397,10 +382,7 @@
         url = "https://elpa.gnu.org/packages/assess-0.7.tar";
         sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp";
       };
-      packageRequires = [
-        emacs
-        m-buffer
-      ];
+      packageRequires = [ m-buffer ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/assess.html";
         license = lib.licenses.free;
@@ -410,7 +392,6 @@
   async = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -422,7 +403,7 @@
         url = "https://elpa.gnu.org/packages/async-1.9.8.tar";
         sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/async.html";
         license = lib.licenses.free;
@@ -432,7 +413,6 @@
   auctex = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -444,7 +424,7 @@
         url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
         sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/auctex.html";
         license = lib.licenses.free;
@@ -455,7 +435,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -467,10 +446,7 @@
         url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
         sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
         license = lib.licenses.free;
@@ -481,7 +457,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -493,10 +468,7 @@
         url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
         sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
         license = lib.licenses.free;
@@ -591,7 +563,6 @@
   autocrypt = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -603,7 +574,7 @@
         url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar";
         sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/autocrypt.html";
         license = lib.licenses.free;
@@ -614,7 +585,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -626,10 +596,7 @@
         url = "https://elpa.gnu.org/packages/avy-0.5.0.tar";
         sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/avy.html";
         license = lib.licenses.free;
@@ -640,7 +607,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -652,10 +618,7 @@
         url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar";
         sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/bbdb.html";
         license = lib.licenses.free;
@@ -665,7 +628,6 @@
   beacon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -677,7 +639,7 @@
         url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar";
         sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/beacon.html";
         license = lib.licenses.free;
@@ -687,7 +649,6 @@
   beframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -699,7 +660,7 @@
         url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar";
         sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/beframe.html";
         license = lib.licenses.free;
@@ -751,7 +712,6 @@
   blist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ilist,
       lib,
@@ -759,15 +719,12 @@
     elpaBuild {
       pname = "blist";
       ename = "blist";
-      version = "0.3";
+      version = "0.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/blist-0.3.tar";
-        sha256 = "1p10d9q14px19m3vajqmm71lmnbxxsc7qczgq11vhg485c20y3va";
+        url = "https://elpa.gnu.org/packages/blist-0.4.tar";
+        sha256 = "0k1h6rmyphqsgznk53hc1xbbnj2h2n2jknlb8vjxlv01z83s32wy";
       };
-      packageRequires = [
-        emacs
-        ilist
-      ];
+      packageRequires = [ ilist ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/blist.html";
         license = lib.licenses.free;
@@ -778,7 +735,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -790,10 +746,7 @@
         url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar";
         sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/bluetooth.html";
         license = lib.licenses.free;
@@ -804,7 +757,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -816,10 +768,7 @@
         url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
         sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
         license = lib.licenses.free;
@@ -829,7 +778,6 @@
   boxy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -841,7 +789,7 @@
         url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar";
         sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/boxy.html";
         license = lib.licenses.free;
@@ -852,7 +800,6 @@
     {
       boxy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -867,7 +814,6 @@
       };
       packageRequires = [
         boxy
-        emacs
         org
       ];
       meta = {
@@ -879,7 +825,6 @@
   breadcrumb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -892,10 +837,7 @@
         url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar";
         sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
         license = lib.licenses.free;
@@ -932,7 +874,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -944,10 +885,7 @@
         url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar";
         sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/buffer-env.html";
         license = lib.licenses.free;
@@ -958,7 +896,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -970,10 +907,7 @@
         url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar";
         sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
         license = lib.licenses.free;
@@ -983,7 +917,6 @@
   bufferlo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -995,7 +928,7 @@
         url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar";
         sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/bufferlo.html";
         license = lib.licenses.free;
@@ -1031,7 +964,6 @@
   buildbot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1043,7 +975,7 @@
         url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar";
         sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/buildbot.html";
         license = lib.licenses.free;
@@ -1054,7 +986,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1066,10 +997,7 @@
         url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar";
         sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/calibre.html";
         license = lib.licenses.free;
@@ -1080,22 +1008,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "1.5";
+      version = "1.6";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/cape-1.5.tar";
-        sha256 = "1kg5a2x23gmdcv8kwzmz8qjfr05r9rfzwb7cj38ambpqpppxl7ij";
+        url = "https://elpa.gnu.org/packages/cape-1.6.tar";
+        sha256 = "1pqkdajl7nd510hxq4lph5cqj3j84mi01nl0ka2k4j8wrvb9zagn";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/cape.html";
         license = lib.licenses.free;
@@ -1105,7 +1029,6 @@
   capf-autosuggest = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1117,7 +1040,7 @@
         url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar";
         sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
         license = lib.licenses.free;
@@ -1233,7 +1156,6 @@
   clipboard-collector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1245,7 +1167,7 @@
         url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
         sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
         license = lib.licenses.free;
@@ -1277,7 +1199,6 @@
   code-cells = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1289,7 +1210,7 @@
         url = "https://elpa.gnu.org/packages/code-cells-0.4.tar";
         sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/code-cells.html";
         license = lib.licenses.free;
@@ -1300,7 +1221,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1312,10 +1232,7 @@
         url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar";
         sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
         license = lib.licenses.free;
@@ -1325,7 +1242,6 @@
   comint-mime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1337,7 +1253,7 @@
         url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar";
         sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/comint-mime.html";
         license = lib.licenses.free;
@@ -1368,7 +1284,6 @@
   company = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1380,7 +1295,7 @@
         url = "https://elpa.gnu.org/packages/company-0.10.2.tar";
         sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/company.html";
         license = lib.licenses.free;
@@ -1443,7 +1358,6 @@
     {
       company,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1455,10 +1369,7 @@
         url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar";
         sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14";
       };
-      packageRequires = [
-        company
-        emacs
-      ];
+      packageRequires = [ company ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/company-statistics.html";
         license = lib.licenses.free;
@@ -1468,7 +1379,6 @@
   compat = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -1481,10 +1391,7 @@
         url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar";
         sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/compat.html";
         license = lib.licenses.free;
@@ -1495,22 +1402,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "1.7";
+      version = "1.8";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/consult-1.7.tar";
-        sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c";
+        url = "https://elpa.gnu.org/packages/consult-1.8.tar";
+        sha256 = "0k3k1jmwdw4w8rr5z2030ba37mcia2zghh6p4c36ck51hwvfkb8w";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/consult.html";
         license = lib.licenses.free;
@@ -1522,7 +1425,6 @@
       consult,
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1537,7 +1439,6 @@
       packageRequires = [
         consult
         denote
-        emacs
       ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/consult-denote.html";
@@ -1548,7 +1449,6 @@
   consult-hoogle = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       haskell-mode,
       lib,
@@ -1561,10 +1461,7 @@
         url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar";
         sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr";
       };
-      packageRequires = [
-        emacs
-        haskell-mode
-      ];
+      packageRequires = [ haskell-mode ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
         license = lib.licenses.free;
@@ -1575,7 +1472,6 @@
     {
       consult,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1587,10 +1483,7 @@
         url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar";
         sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v";
       };
-      packageRequires = [
-        consult
-        emacs
-      ];
+      packageRequires = [ consult ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
         license = lib.licenses.free;
@@ -1600,7 +1493,6 @@
   context-coloring = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1612,7 +1504,7 @@
         url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
         sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/context-coloring.html";
         license = lib.licenses.free;
@@ -1623,22 +1515,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "1.4";
+      version = "1.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/corfu-1.4.tar";
-        sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85";
+        url = "https://elpa.gnu.org/packages/corfu-1.5.tar";
+        sha256 = "0m80slhpr9xd57b3nvrqgfxm44851v9gfcy8ky3d3v2g5i2mrm6x";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/corfu.html";
         license = lib.licenses.free;
@@ -1649,7 +1537,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1661,10 +1548,7 @@
         url = "https://elpa.gnu.org/packages/coterm-1.6.tar";
         sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/coterm.html";
         license = lib.licenses.free;
@@ -1674,7 +1558,6 @@
   counsel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -1689,7 +1572,6 @@
         sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3";
       };
       packageRequires = [
-        emacs
         ivy
         swiper
       ];
@@ -1786,7 +1668,6 @@
   csharp-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1798,7 +1679,7 @@
         url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar";
         sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
         license = lib.licenses.free;
@@ -1809,32 +1690,48 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "csv-mode";
       ename = "csv-mode";
-      version = "1.25";
+      version = "1.27";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar";
-        sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984";
+        url = "https://elpa.gnu.org/packages/csv-mode-1.27.tar";
+        sha256 = "0jxf4id5c9696nh666x0xbzqx3vskyv810km61y9nkg7sp4ln2qf";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/csv-mode.html";
         license = lib.licenses.free;
       };
     }
   ) { };
+  cursor-undo = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cursor-undo";
+      ename = "cursor-undo";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cursor-undo-1.1.5.tar";
+        sha256 = "1zbn4wfirnwjhy4q0lz8s0zffp84v6zs1x6wjxlcr0la7xn2sx4v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cursor-undo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   cursory = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1846,7 +1743,7 @@
         url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar";
         sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/cursory.html";
         license = lib.licenses.free;
@@ -1877,7 +1774,6 @@
   dape = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       jsonrpc,
       lib,
@@ -1885,15 +1781,12 @@
     elpaBuild {
       pname = "dape";
       ename = "dape";
-      version = "0.13.0";
+      version = "0.14.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/dape-0.13.0.tar";
-        sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a";
+        url = "https://elpa.gnu.org/packages/dape-0.14.0.tar";
+        sha256 = "1aakk2v3nw1pl4ai9bb4h748z6bkfkilw283ndfah7jz61j90van";
       };
-      packageRequires = [
-        emacs
-        jsonrpc
-      ];
+      packageRequires = [ jsonrpc ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dape.html";
         license = lib.licenses.free;
@@ -1925,7 +1818,6 @@
   dash = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1937,7 +1829,7 @@
         url = "https://elpa.gnu.org/packages/dash-2.19.1.tar";
         sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dash.html";
         license = lib.licenses.free;
@@ -1969,7 +1861,6 @@
   debbugs = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       soap-client,
@@ -1982,10 +1873,7 @@
         url = "https://elpa.gnu.org/packages/debbugs-0.40.tar";
         sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl";
       };
-      packageRequires = [
-        emacs
-        soap-client
-      ];
+      packageRequires = [ soap-client ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/debbugs.html";
         license = lib.licenses.free;
@@ -2021,19 +1909,18 @@
   denote = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "3.0.6";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-3.0.6.tar";
-        sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv";
+        url = "https://elpa.gnu.org/packages/denote-3.0.8.tar";
+        sha256 = "0hqv0lbjjs3df2vjwx3mnyj98kl3shh9aahl2y9mnmfq4fingdi8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/denote.html";
         license = lib.licenses.free;
@@ -2044,22 +1931,18 @@
     {
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "denote-menu";
       ename = "denote-menu";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar";
-        sha256 = "042avabc97wgkz85x40dq7rmv4h9n5kmq935lrg9s20klbs9axs1";
+        url = "https://elpa.gnu.org/packages/denote-menu-1.3.0.tar";
+        sha256 = "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02";
       };
-      packageRequires = [
-        denote
-        emacs
-      ];
+      packageRequires = [ denote ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/denote-menu.html";
         license = lib.licenses.free;
@@ -2069,7 +1952,6 @@
   detached = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2081,7 +1963,7 @@
         url = "https://elpa.gnu.org/packages/detached-0.10.1.tar";
         sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/detached.html";
         license = lib.licenses.free;
@@ -2091,7 +1973,6 @@
   devdocs = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2103,7 +1984,7 @@
         url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar";
         sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/devdocs.html";
         license = lib.licenses.free;
@@ -2113,7 +1994,6 @@
   devicetree-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2125,7 +2005,7 @@
         url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar";
         sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
         license = lib.licenses.free;
@@ -2135,7 +2015,6 @@
   dict-tree = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       heap,
       lib,
@@ -2151,7 +2030,6 @@
         sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp";
       };
       packageRequires = [
-        emacs
         heap
         tNFA
         trie
@@ -2166,22 +2044,18 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "diff-hl";
       ename = "diff-hl";
-      version = "1.9.2";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar";
-        sha256 = "0skla012qw55qhzykgrk3zk5x76dfsj11kq8q2msyrq3jxcbyq6p";
+        url = "https://elpa.gnu.org/packages/diff-hl-1.10.0.tar";
+        sha256 = "0v8nm2sx3v405fj6i5v7nnar47j6na0q5cm5za9y33n6xaw3v2yh";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/diff-hl.html";
         license = lib.licenses.free;
@@ -2212,7 +2086,6 @@
   diminish = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2224,7 +2097,7 @@
         url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
         sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/diminish.html";
         license = lib.licenses.free;
@@ -2235,7 +2108,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2247,10 +2119,7 @@
         url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar";
         sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dired-du.html";
         license = lib.licenses.free;
@@ -2260,7 +2129,6 @@
   dired-duplicates = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2272,7 +2140,7 @@
         url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar";
         sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
         license = lib.licenses.free;
@@ -2282,7 +2150,6 @@
   dired-git-info = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2294,7 +2161,7 @@
         url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar";
         sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
         license = lib.licenses.free;
@@ -2304,7 +2171,6 @@
   dired-preview = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2316,7 +2182,7 @@
         url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar";
         sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dired-preview.html";
         license = lib.licenses.free;
@@ -2326,7 +2192,6 @@
   disk-usage = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2338,7 +2203,7 @@
         url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar";
         sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/disk-usage.html";
         license = lib.licenses.free;
@@ -2391,7 +2256,6 @@
   do-at-point = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2403,7 +2267,7 @@
         url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar";
         sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/do-at-point.html";
         license = lib.licenses.free;
@@ -2413,7 +2277,6 @@
   doc-toc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2425,7 +2288,7 @@
         url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar";
         sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/doc-toc.html";
         license = lib.licenses.free;
@@ -2457,7 +2320,6 @@
     {
       comint-mime,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2469,10 +2331,7 @@
         url = "https://elpa.gnu.org/packages/drepl-0.3.tar";
         sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds";
       };
-      packageRequires = [
-        comint-mime
-        emacs
-      ];
+      packageRequires = [ comint-mime ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/drepl.html";
         license = lib.licenses.free;
@@ -2482,7 +2341,6 @@
   dts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2494,7 +2352,7 @@
         url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar";
         sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/dts-mode.html";
         license = lib.licenses.free;
@@ -2526,7 +2384,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2538,10 +2395,7 @@
         url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar";
         sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/easy-kill.html";
         license = lib.licenses.free;
@@ -2551,7 +2405,6 @@
   ebdb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -2564,10 +2417,7 @@
         url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar";
         sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ebdb.html";
         license = lib.licenses.free;
@@ -2650,19 +2500,18 @@
   eev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "eev";
       ename = "eev";
-      version = "20240710";
+      version = "20240811";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/eev-20240710.tar";
-        sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02";
+        url = "https://elpa.gnu.org/packages/eev-20240811.tar";
+        sha256 = "1m5d0jr408fc42kk5vdkdb2kk3x4k1q7k32hwbjb7fkmp8nkv7ll";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/eev.html";
         license = lib.licenses.free;
@@ -2672,7 +2521,6 @@
   ef-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2684,7 +2532,7 @@
         url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar";
         sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ef-themes.html";
         license = lib.licenses.free;
@@ -2695,7 +2543,6 @@
     {
       eldoc,
       elpaBuild,
-      emacs,
       external-completion,
       fetchurl,
       flymake ? null,
@@ -2715,7 +2562,6 @@
       };
       packageRequires = [
         eldoc
-        emacs
         external-completion
         flymake
         jsonrpc
@@ -2733,7 +2579,6 @@
     {
       cl-print ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       stream,
@@ -2748,7 +2593,6 @@
       };
       packageRequires = [
         cl-print
-        emacs
         stream
       ];
       meta = {
@@ -2760,7 +2604,6 @@
   eldoc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2772,7 +2615,7 @@
         url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar";
         sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/eldoc.html";
         license = lib.licenses.free;
@@ -2800,6 +2643,36 @@
       };
     }
   ) { };
+  elisa = callPackage (
+    {
+      async,
+      ellama,
+      elpaBuild,
+      fetchurl,
+      lib,
+      llm,
+      plz,
+    }:
+    elpaBuild {
+      pname = "elisa";
+      ename = "elisa";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/elisa-1.0.4.tar";
+        sha256 = "07f9micfp3p8r58kdnqv0pa7i8nyqaz35llahwp2jl16c63pl9wn";
+      };
+      packageRequires = [
+        async
+        ellama
+        llm
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/elisa.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   elisp-benchmarks = callPackage (
     {
       elpaBuild,
@@ -2825,7 +2698,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       llm,
@@ -2834,14 +2706,13 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "0.11.9";
+      version = "0.11.13";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar";
-        sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j";
+        url = "https://elpa.gnu.org/packages/ellama-0.11.13.tar";
+        sha256 = "1i5pn976a8y3b6927wq51cy9adjipn7xqlmdxy9gnhfnjsma2446";
       };
       packageRequires = [
         compat
-        emacs
         llm
         spinner
       ];
@@ -2854,7 +2725,6 @@
   emacs-gc-stats = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2866,7 +2736,7 @@
         url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar";
         sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
         license = lib.licenses.free;
@@ -2877,7 +2747,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2889,10 +2758,7 @@
         url = "https://elpa.gnu.org/packages/embark-1.1.tar";
         sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/embark.html";
         license = lib.licenses.free;
@@ -2904,7 +2770,6 @@
       compat,
       consult,
       elpaBuild,
-      emacs,
       embark,
       fetchurl,
       lib,
@@ -2920,7 +2785,6 @@
       packageRequires = [
         compat
         consult
-        emacs
         embark
       ];
       meta = {
@@ -2932,7 +2796,6 @@
   ement = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -2952,7 +2815,6 @@
         sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
       };
       packageRequires = [
-        emacs
         map
         persist
         plz
@@ -2998,7 +2860,6 @@
   engrave-faces = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3010,7 +2871,7 @@
         url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar";
         sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
         license = lib.licenses.free;
@@ -3020,7 +2881,6 @@
   enwc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3032,7 +2892,7 @@
         url = "https://elpa.gnu.org/packages/enwc-2.0.tar";
         sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/enwc.html";
         license = lib.licenses.free;
@@ -3064,7 +2924,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3076,10 +2935,7 @@
         url = "https://elpa.gnu.org/packages/erc-5.6.tar";
         sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/erc.html";
         license = lib.licenses.free;
@@ -3090,7 +2946,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       undo-tree,
@@ -3105,7 +2960,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         undo-tree
       ];
       meta = {
@@ -3117,7 +2971,6 @@
   ess = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3129,7 +2982,7 @@
         url = "https://elpa.gnu.org/packages/ess-24.1.1.tar";
         sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ess.html";
         license = lib.licenses.free;
@@ -3140,7 +2993,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       fsm,
       lib,
@@ -3159,7 +3011,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         fsm
         nadvice
         soap-client
@@ -3175,7 +3026,6 @@
   expand-region = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3187,7 +3037,7 @@
         url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar";
         sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/expand-region.html";
         license = lib.licenses.free;
@@ -3197,7 +3047,6 @@
   expreg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3209,7 +3058,7 @@
         url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar";
         sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/expreg.html";
         license = lib.licenses.free;
@@ -3241,7 +3090,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xelb,
@@ -3256,7 +3104,6 @@
       };
       packageRequires = [
         compat
-        emacs
         xelb
       ];
       meta = {
@@ -3289,7 +3136,6 @@
   face-shift = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3301,7 +3147,7 @@
         url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar";
         sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/face-shift.html";
         license = lib.licenses.free;
@@ -3312,7 +3158,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3324,10 +3169,7 @@
         url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar";
         sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/filechooser.html";
         license = lib.licenses.free;
@@ -3337,7 +3179,6 @@
   filladapt = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3349,7 +3190,7 @@
         url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar";
         sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/filladapt.html";
         license = lib.licenses.free;
@@ -3359,7 +3200,6 @@
   firefox-javascript-repl = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3371,7 +3211,7 @@
         url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar";
         sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
         license = lib.licenses.free;
@@ -3403,7 +3243,6 @@
     {
       eldoc,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -3418,7 +3257,6 @@
       };
       packageRequires = [
         eldoc
-        emacs
         project
       ];
       meta = {
@@ -3431,7 +3269,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3443,10 +3280,7 @@
         url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar";
         sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
         license = lib.licenses.free;
@@ -3456,7 +3290,6 @@
   flymake-proselint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3468,7 +3301,7 @@
         url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";
         sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
         license = lib.licenses.free;
@@ -3478,7 +3311,6 @@
   fontaine = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3490,7 +3322,7 @@
         url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar";
         sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/fontaine.html";
         license = lib.licenses.free;
@@ -3522,7 +3354,6 @@
     {
       avy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       posframe,
@@ -3537,7 +3368,6 @@
       };
       packageRequires = [
         avy
-        emacs
         posframe
       ];
       meta = {
@@ -3550,7 +3380,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3562,10 +3391,7 @@
         url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar";
         sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/fsm.html";
         license = lib.licenses.free;
@@ -3575,7 +3401,6 @@
   ftable = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3587,7 +3412,7 @@
         url = "https://elpa.gnu.org/packages/ftable-1.1.tar";
         sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ftable.html";
         license = lib.licenses.free;
@@ -3597,7 +3422,6 @@
   gcmh = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3609,7 +3433,7 @@
         url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar";
         sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/gcmh.html";
         license = lib.licenses.free;
@@ -3619,7 +3443,6 @@
   ggtags = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3631,7 +3454,7 @@
         url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar";
         sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ggtags.html";
         license = lib.licenses.free;
@@ -3642,7 +3465,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3654,10 +3476,7 @@
         url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
         sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/gited.html";
         license = lib.licenses.free;
@@ -3689,7 +3508,6 @@
   gnat-compiler = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       wisi,
@@ -3702,10 +3520,7 @@
         url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar";
         sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs";
       };
-      packageRequires = [
-        emacs
-        wisi
-      ];
+      packageRequires = [ wisi ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
         license = lib.licenses.free;
@@ -3849,7 +3664,6 @@
   gpastel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3861,7 +3675,7 @@
         url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar";
         sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/gpastel.html";
         license = lib.licenses.free;
@@ -3871,7 +3685,6 @@
   gpr-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -3886,7 +3699,6 @@
         sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         wisi
       ];
@@ -3899,7 +3711,6 @@
   gpr-query = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -3914,7 +3725,6 @@
         sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         wisi
       ];
@@ -3927,7 +3737,6 @@
   graphql = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3939,7 +3748,7 @@
         url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar";
         sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/graphql.html";
         license = lib.licenses.free;
@@ -3950,7 +3759,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -3958,14 +3766,13 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.11.13";
+      version = "0.11.15";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/greader-0.11.13.tar";
-        sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn";
+        url = "https://elpa.gnu.org/packages/greader-0.11.15.tar";
+        sha256 = "0052gsjdqnlxgwd8l3h3x2zh2lzw76cwfdxvgxdk6x1g4cvhmjbx";
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
@@ -3998,19 +3805,18 @@
   gtags-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.8";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar";
-        sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll";
+        url = "https://elpa.gnu.org/packages/gtags-mode-1.8.1.tar";
+        sha256 = "1n4mc33hz12p0fljrs4big317148272vz2zn16n98sakpv7jk4b6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
         license = lib.licenses.free;
@@ -4021,7 +3827,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -4036,7 +3841,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         nadvice
       ];
       meta = {
@@ -4048,7 +3852,6 @@
   hcel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4060,7 +3863,7 @@
         url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar";
         sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/hcel.html";
         license = lib.licenses.free;
@@ -4091,7 +3894,6 @@
   hiddenquote = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4103,7 +3905,7 @@
         url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar";
         sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
         license = lib.licenses.free;
@@ -4134,7 +3936,6 @@
   hook-helpers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4146,7 +3947,7 @@
         url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
         sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
         license = lib.licenses.free;
@@ -4203,7 +4004,6 @@
   hyperbole = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4215,7 +4015,7 @@
         url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar";
         sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/hyperbole.html";
         license = lib.licenses.free;
@@ -4252,10 +4052,10 @@
     elpaBuild {
       pname = "ilist";
       ename = "ilist";
-      version = "0.3";
+      version = "0.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/ilist-0.3.tar";
-        sha256 = "01a522sqx7j5m6b1k8xn71963igm93cd7ms1aawh1v2wmb09vbhm";
+        url = "https://elpa.gnu.org/packages/ilist-0.4.tar";
+        sha256 = "1hsja208yaszviv8p3mzi04j0jz8ij02nbl1y6shk3b965sflhyp";
       };
       packageRequires = [ ];
       meta = {
@@ -4267,19 +4067,18 @@
   inspector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "inspector";
       ename = "inspector";
-      version = "0.36";
+      version = "0.37";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/inspector-0.36.tar";
-        sha256 = "0hbh4a71w4yxicn7v7v492i7iv0ncv5sxwwsbwknbl9ixm482h2z";
+        url = "https://elpa.gnu.org/packages/inspector-0.37.tar";
+        sha256 = "0825qd5ldx63li3vf89dsizn6w2gj87jn16yrfw0bxxn5jg255a0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/inspector.html";
         license = lib.licenses.free;
@@ -4290,7 +4089,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4302,10 +4100,7 @@
         url = "https://elpa.gnu.org/packages/ioccur-2.6.tar";
         sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ioccur.html";
         license = lib.licenses.free;
@@ -4315,7 +4110,6 @@
   isearch-mb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4327,7 +4121,7 @@
         url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar";
         sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
         license = lib.licenses.free;
@@ -4337,7 +4131,6 @@
   iterators = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4349,7 +4142,7 @@
         url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar";
         sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/iterators.html";
         license = lib.licenses.free;
@@ -4359,7 +4152,6 @@
   ivy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4371,7 +4163,7 @@
         url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar";
         sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ivy.html";
         license = lib.licenses.free;
@@ -4382,7 +4174,6 @@
     {
       avy,
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4397,7 +4188,6 @@
       };
       packageRequires = [
         avy
-        emacs
         ivy
       ];
       meta = {
@@ -4409,7 +4199,6 @@
   ivy-explorer = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4422,10 +4211,7 @@
         url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar";
         sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a";
       };
-      packageRequires = [
-        emacs
-        ivy
-      ];
+      packageRequires = [ ivy ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
         license = lib.licenses.free;
@@ -4435,7 +4221,6 @@
   ivy-hydra = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       hydra,
       ivy,
@@ -4450,7 +4235,6 @@
         sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx";
       };
       packageRequires = [
-        emacs
         hydra
         ivy
       ];
@@ -4463,7 +4247,6 @@
   ivy-posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4478,7 +4261,6 @@
         sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9";
       };
       packageRequires = [
-        emacs
         ivy
         posframe
       ];
@@ -4491,7 +4273,6 @@
   jami-bot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4503,7 +4284,7 @@
         url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar";
         sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/jami-bot.html";
         license = lib.licenses.free;
@@ -4513,7 +4294,6 @@
   jarchive = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4525,7 +4305,7 @@
         url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
         sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/jarchive.html";
         license = lib.licenses.free;
@@ -4579,22 +4359,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "jinx";
       ename = "jinx";
-      version = "1.9";
+      version = "1.10";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jinx-1.9.tar";
-        sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1";
+        url = "https://elpa.gnu.org/packages/jinx-1.10.tar";
+        sha256 = "19l1wcrv610l6alb9xzyfmdkmnzgcf60z3557q4dkgvz35959p4y";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/jinx.html";
         license = lib.licenses.free;
@@ -4605,7 +4381,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4617,10 +4392,7 @@
         url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar";
         sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/jit-spell.html";
         license = lib.licenses.free;
@@ -4631,7 +4403,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4643,10 +4414,7 @@
         url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar";
         sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/js2-mode.html";
         license = lib.licenses.free;
@@ -4656,7 +4424,6 @@
   json-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4668,7 +4435,7 @@
         url = "https://elpa.gnu.org/packages/json-mode-0.2.tar";
         sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/json-mode.html";
         license = lib.licenses.free;
@@ -4678,7 +4445,6 @@
   jsonrpc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4690,7 +4456,7 @@
         url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar";
         sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
         license = lib.licenses.free;
@@ -4721,7 +4487,6 @@
   kind-icon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg-lib,
@@ -4734,10 +4499,7 @@
         url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar";
         sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69";
       };
-      packageRequires = [
-        emacs
-        svg-lib
-      ];
+      packageRequires = [ svg-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/kind-icon.html";
         license = lib.licenses.free;
@@ -4747,7 +4509,6 @@
   kiwix = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       request,
@@ -4760,10 +4521,7 @@
         url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar";
         sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s";
       };
-      packageRequires = [
-        emacs
-        request
-      ];
+      packageRequires = [ request ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/kiwix.html";
         license = lib.licenses.free;
@@ -4773,7 +4531,6 @@
   kmb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4785,13 +4542,34 @@
         url = "https://elpa.gnu.org/packages/kmb-0.1.tar";
         sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/kmb.html";
         license = lib.licenses.free;
       };
     }
   ) { };
+  kubed = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kubed";
+      ename = "kubed";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/kubed-0.3.2.tar";
+        sha256 = "1adr74gdfvg9djd8hr457jgx2p08drc235l3p4ni76fnjngki1z2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kubed.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   landmark = callPackage (
     {
       elpaBuild,
@@ -4817,7 +4595,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       transient,
@@ -4832,7 +4609,6 @@
       };
       packageRequires = [
         auctex
-        emacs
         transient
       ];
       meta = {
@@ -4844,7 +4620,6 @@
   leaf = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4856,7 +4631,7 @@
         url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar";
         sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/leaf.html";
         license = lib.licenses.free;
@@ -4867,7 +4642,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       m-buffer,
@@ -4882,7 +4656,6 @@
       };
       packageRequires = [
         dash
-        emacs
         m-buffer
       ];
       meta = {
@@ -4920,7 +4693,6 @@
   let-alist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4932,7 +4704,7 @@
         url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar";
         sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/let-alist.html";
         license = lib.licenses.free;
@@ -4963,19 +4735,18 @@
   lin = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "lin";
       ename = "lin";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/lin-1.0.0.tar";
-        sha256 = "1yxvpgh3sbw0d0zkjfgbhjc2bziqvkyj7fgwcl3814q7hh8m4146";
+        url = "https://elpa.gnu.org/packages/lin-1.1.0.tar";
+        sha256 = "1rf81r8ylq2cccx4svdkiy2rvz1rq6cw0dakrcd4jrrscww52d7c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/lin.html";
         license = lib.licenses.free;
@@ -4985,7 +4756,6 @@
   listen = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -5002,7 +4772,6 @@
         sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp";
       };
       packageRequires = [
-        emacs
         persist
         taxy
         taxy-magit-section
@@ -5017,7 +4786,6 @@
   literate-scratch = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5029,7 +4797,7 @@
         url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar";
         sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
         license = lib.licenses.free;
@@ -5039,7 +4807,6 @@
   llm = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -5047,15 +4814,12 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.16.1";
+      version = "0.17.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/llm-0.16.1.tar";
-        sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s";
+        url = "https://elpa.gnu.org/packages/llm-0.17.1.tar";
+        sha256 = "15raqqychsag53q4pnlh6iwzb81z9zmi7nd0x5zkfpf4q71llsxc";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/llm.html";
         license = lib.licenses.free;
@@ -5149,7 +4913,6 @@
   loccur = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5161,7 +4924,7 @@
         url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar";
         sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/loccur.html";
         license = lib.licenses.free;
@@ -5171,7 +4934,6 @@
   logos = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5183,7 +4945,7 @@
         url = "https://elpa.gnu.org/packages/logos-1.1.1.tar";
         sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/logos.html";
         license = lib.licenses.free;
@@ -5193,7 +4955,6 @@
   luwak = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5205,7 +4966,7 @@
         url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar";
         sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/luwak.html";
         license = lib.licenses.free;
@@ -5258,7 +5019,6 @@
   map = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5270,7 +5030,7 @@
         url = "https://elpa.gnu.org/packages/map-3.3.1.tar";
         sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/map.html";
         license = lib.licenses.free;
@@ -5281,22 +5041,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "marginalia";
       ename = "marginalia";
-      version = "1.6";
+      version = "1.7";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/marginalia-1.6.tar";
-        sha256 = "0an3ayka1f7n511bjfwz42h9g5b1vhb6x47jy0k9psscr7pbhszg";
+        url = "https://elpa.gnu.org/packages/marginalia-1.7.tar";
+        sha256 = "1bwbkz71w81zcqsydvqic2xri52pm1h9nac8i7i04nl5b98pszkk";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/marginalia.html";
         license = lib.licenses.free;
@@ -5348,7 +5104,6 @@
   mct = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5360,7 +5115,7 @@
         url = "https://elpa.gnu.org/packages/mct-1.0.0.tar";
         sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/mct.html";
         license = lib.licenses.free;
@@ -5413,7 +5168,6 @@
   midi-kbd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5425,7 +5179,7 @@
         url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar";
         sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
         license = lib.licenses.free;
@@ -5436,7 +5190,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5448,10 +5201,7 @@
         url = "https://elpa.gnu.org/packages/mines-1.6.tar";
         sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/mines.html";
         license = lib.licenses.free;
@@ -5461,7 +5211,6 @@
   minibuffer-header = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5473,7 +5222,7 @@
         url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar";
         sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
         license = lib.licenses.free;
@@ -5526,7 +5275,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5538,10 +5286,7 @@
         url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar";
         sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
         license = lib.licenses.free;
@@ -5551,7 +5296,6 @@
   modus-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5563,7 +5307,7 @@
         url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar";
         sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/modus-themes.html";
         license = lib.licenses.free;
@@ -5573,7 +5317,6 @@
   mpdired = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5585,7 +5328,7 @@
         url = "https://elpa.gnu.org/packages/mpdired-2.tar";
         sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/mpdired.html";
         license = lib.licenses.free;
@@ -5659,7 +5402,6 @@
   myers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5671,7 +5413,7 @@
         url = "https://elpa.gnu.org/packages/myers-0.1.tar";
         sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/myers.html";
         license = lib.licenses.free;
@@ -5702,7 +5444,6 @@
   nameless = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5714,7 +5455,7 @@
         url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar";
         sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nameless.html";
         license = lib.licenses.free;
@@ -5725,7 +5466,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5737,10 +5477,7 @@
         url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
         sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/names.html";
         license = lib.licenses.free;
@@ -5750,7 +5487,6 @@
   nano-agenda = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5762,7 +5498,7 @@
         url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar";
         sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
         license = lib.licenses.free;
@@ -5772,7 +5508,6 @@
   nano-modeline = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5784,7 +5519,7 @@
         url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar";
         sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
         license = lib.licenses.free;
@@ -5794,7 +5529,6 @@
   nano-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5806,7 +5540,7 @@
         url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar";
         sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nano-theme.html";
         license = lib.licenses.free;
@@ -5816,7 +5550,6 @@
   nftables-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5828,7 +5561,7 @@
         url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar";
         sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
         license = lib.licenses.free;
@@ -5839,7 +5572,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5851,10 +5583,7 @@
         url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar";
         sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
         license = lib.licenses.free;
@@ -5906,7 +5635,6 @@
   notmuch-indicator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5918,7 +5646,7 @@
         url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar";
         sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
         license = lib.licenses.free;
@@ -6039,7 +5767,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6051,10 +5778,7 @@
         url = "https://elpa.gnu.org/packages/objed-0.8.3.tar";
         sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/objed.html";
         license = lib.licenses.free;
@@ -6107,19 +5831,18 @@
   openpgp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "openpgp";
       ename = "openpgp";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar";
-        sha256 = "052wh38q6r09avxa0bgc5gn4769763zmgijza76mb0b3lzj66syv";
+        url = "https://elpa.gnu.org/packages/openpgp-1.0.2.tar";
+        sha256 = "1gaq6hf9mwk52zjqw3d0wrj9l8mgzrbrk7nzywap4psnriq0vs0j";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/openpgp.html";
         license = lib.licenses.free;
@@ -6129,7 +5852,6 @@
   orderless = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6141,7 +5863,7 @@
         url = "https://elpa.gnu.org/packages/orderless-1.1.tar";
         sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/orderless.html";
         license = lib.licenses.free;
@@ -6151,19 +5873,18 @@
   org = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.7.6";
+      version = "9.7.10";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.7.6.tar";
-        sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng";
+        url = "https://elpa.gnu.org/packages/org-9.7.10.tar";
+        sha256 = "0rabxq2diikdwifybril1b9cxkwry7agyw8gsdyf1n800f8vq5ka";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org.html";
         license = lib.licenses.free;
@@ -6173,7 +5894,6 @@
   org-contacts = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6186,10 +5906,7 @@
         url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";
         sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-contacts.html";
         license = lib.licenses.free;
@@ -6199,7 +5916,6 @@
   org-edna = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6214,7 +5930,6 @@
         sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl";
       };
       packageRequires = [
-        emacs
         org
         seq
       ];
@@ -6227,7 +5942,6 @@
   org-jami-bot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       jami-bot,
       lib,
@@ -6240,10 +5954,7 @@
         url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar";
         sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y";
       };
-      packageRequires = [
-        emacs
-        jami-bot
-      ];
+      packageRequires = [ jami-bot ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
         license = lib.licenses.free;
@@ -6254,22 +5965,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org-modern";
       ename = "org-modern";
-      version = "1.3";
+      version = "1.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-modern-1.3.tar";
-        sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj";
+        url = "https://elpa.gnu.org/packages/org-modern-1.5.tar";
+        sha256 = "08s253r3z5r37swlsgrp97ls7p3bdr4hr2xvyb1pm57j7livv74b";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-modern.html";
         license = lib.licenses.free;
@@ -6279,7 +5986,6 @@
   org-notify = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6291,7 +5997,7 @@
         url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar";
         sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-notify.html";
         license = lib.licenses.free;
@@ -6302,7 +6008,6 @@
     {
       boxy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6317,7 +6022,6 @@
       };
       packageRequires = [
         boxy
-        emacs
         org
       ];
       meta = {
@@ -6329,7 +6033,6 @@
   org-remark = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6342,10 +6045,7 @@
         url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar";
         sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-remark.html";
         license = lib.licenses.free;
@@ -6355,7 +6055,6 @@
   org-transclusion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6368,10 +6067,7 @@
         url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar";
         sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
         license = lib.licenses.free;
@@ -6381,7 +6077,6 @@
   org-translate = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6394,10 +6089,7 @@
         url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar";
         sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/org-translate.html";
         license = lib.licenses.free;
@@ -6407,7 +6099,6 @@
   orgalist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6419,7 +6110,7 @@
         url = "https://elpa.gnu.org/packages/orgalist-1.16.tar";
         sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/orgalist.html";
         license = lib.licenses.free;
@@ -6451,22 +6142,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "osm";
       ename = "osm";
-      version = "1.3";
+      version = "1.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/osm-1.3.tar";
-        sha256 = "0s5k6akdvbm9gsgzjlz795vgfy3pkl4qdk45p16p40f59dr49g4r";
+        url = "https://elpa.gnu.org/packages/osm-1.4.tar";
+        sha256 = "0cix4jn3919xnlsj85l4m83znkqf4m2988zzqwcsvvvjrmgccanh";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/osm.html";
         license = lib.licenses.free;
@@ -6476,7 +6163,6 @@
   other-frame-window = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6488,7 +6174,7 @@
         url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar";
         sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
         license = lib.licenses.free;
@@ -6498,7 +6184,6 @@
   pabbrev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6510,7 +6195,7 @@
         url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar";
         sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/pabbrev.html";
         license = lib.licenses.free;
@@ -6521,7 +6206,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6533,10 +6217,7 @@
         url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
         sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/paced.html";
         license = lib.licenses.free;
@@ -6547,7 +6228,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6559,10 +6239,7 @@
         url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
         sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/parsec.html";
         license = lib.licenses.free;
@@ -6572,7 +6249,6 @@
   parser-generator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6584,7 +6260,7 @@
         url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar";
         sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/parser-generator.html";
         license = lib.licenses.free;
@@ -6594,7 +6270,6 @@
   path-iterator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6606,7 +6281,7 @@
         url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar";
         sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/path-iterator.html";
         license = lib.licenses.free;
@@ -6616,7 +6291,6 @@
   peg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6628,7 +6302,7 @@
         url = "https://elpa.gnu.org/packages/peg-1.0.1.tar";
         sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/peg.html";
         license = lib.licenses.free;
@@ -6638,7 +6312,6 @@
   perl-doc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6650,7 +6323,7 @@
         url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar";
         sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/perl-doc.html";
         license = lib.licenses.free;
@@ -6660,7 +6333,6 @@
   persist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6672,7 +6344,7 @@
         url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
         sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/persist.html";
         license = lib.licenses.free;
@@ -6682,7 +6354,6 @@
   phps-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6694,7 +6365,7 @@
         url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar";
         sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/phps-mode.html";
         license = lib.licenses.free;
@@ -6725,29 +6396,71 @@
   plz = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "plz";
       ename = "plz";
-      version = "0.9";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/plz-0.9.tar";
-        sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8";
+        url = "https://elpa.gnu.org/packages/plz-0.9.1.tar";
+        sha256 = "0kx8zjqczsqhxd95bdy9b0kkpgkva4zq549d2hcfrkqhrqivm6qd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/plz.html";
         license = lib.licenses.free;
       };
     }
   ) { };
+  plz-event-source = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      plz-media-type,
+    }:
+    elpaBuild {
+      pname = "plz-event-source";
+      ename = "plz-event-source";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/plz-event-source-0.1.1.tar";
+        sha256 = "0mraza6r8p6rwmsmgz7kkllhwi6spz8jzkk458jlgqxilm0jajib";
+      };
+      packageRequires = [ plz-media-type ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-event-source.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz-media-type = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "plz-media-type";
+      ename = "plz-media-type";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/plz-media-type-0.2.1.tar";
+        sha256 = "05hr78iw9s34vf2lpyh79xfnd4gs4q07rha1ahdrmxvkk9mnmk90";
+      };
+      packageRequires = [ plz ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-media-type.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   plz-see = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -6760,10 +6473,7 @@
         url = "https://elpa.gnu.org/packages/plz-see-0.1.tar";
         sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/plz-see.html";
         license = lib.licenses.free;
@@ -6773,7 +6483,6 @@
   poke = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6785,7 +6494,7 @@
         url = "https://elpa.gnu.org/packages/poke-3.2.tar";
         sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/poke.html";
         license = lib.licenses.free;
@@ -6837,7 +6546,6 @@
   popper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6849,7 +6557,7 @@
         url = "https://elpa.gnu.org/packages/popper-0.4.6.tar";
         sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/popper.html";
         license = lib.licenses.free;
@@ -6859,7 +6567,6 @@
   posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6871,7 +6578,7 @@
         url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar";
         sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/posframe.html";
         license = lib.licenses.free;
@@ -6881,7 +6588,6 @@
   pq = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6893,7 +6599,7 @@
         url = "https://elpa.gnu.org/packages/pq-0.2.tar";
         sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/pq.html";
         license = lib.licenses.free;
@@ -6904,7 +6610,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6916,10 +6621,7 @@
         url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
         sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/preview-auto.html";
         license = lib.licenses.free;
@@ -6930,7 +6632,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6942,10 +6643,7 @@
         url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar";
         sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
         license = lib.licenses.free;
@@ -6955,7 +6653,6 @@
   project = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xref,
@@ -6968,10 +6665,7 @@
         url = "https://elpa.gnu.org/packages/project-0.11.1.tar";
         sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0";
       };
-      packageRequires = [
-        emacs
-        xref
-      ];
+      packageRequires = [ xref ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/project.html";
         license = lib.licenses.free;
@@ -7023,7 +6717,6 @@
   pulsar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7035,7 +6728,7 @@
         url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar";
         sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/pulsar.html";
         license = lib.licenses.free;
@@ -7046,7 +6739,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xr,
@@ -7061,7 +6753,6 @@
       };
       packageRequires = [
         async
-        emacs
         xr
       ];
       meta = {
@@ -7095,7 +6786,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7107,10 +6797,7 @@
         url = "https://elpa.gnu.org/packages/python-0.28.tar";
         sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/python.html";
         license = lib.licenses.free;
@@ -7204,7 +6891,6 @@
   rcirc-color = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7216,7 +6902,7 @@
         url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar";
         sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
         license = lib.licenses.free;
@@ -7247,7 +6933,6 @@
   rcirc-sqlite = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7259,7 +6944,7 @@
         url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
         sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
         license = lib.licenses.free;
@@ -7269,7 +6954,6 @@
   realgud = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7285,7 +6969,6 @@
         sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35";
       };
       packageRequires = [
-        emacs
         load-relative
         loc-changes
         test-simple
@@ -7299,7 +6982,6 @@
   realgud-ipdb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       realgud,
@@ -7312,10 +6994,7 @@
         url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar";
         sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr";
       };
-      packageRequires = [
-        emacs
-        realgud
-      ];
+      packageRequires = [ realgud ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
         license = lib.licenses.free;
@@ -7326,7 +7005,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7342,7 +7020,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
@@ -7355,7 +7032,6 @@
   realgud-lldb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7370,7 +7046,6 @@
         sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
@@ -7384,7 +7059,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7400,7 +7074,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
@@ -7414,7 +7087,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7430,7 +7102,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
@@ -7444,7 +7115,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7460,7 +7130,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
@@ -7473,7 +7142,6 @@
   realgud-trepan-xpy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7488,7 +7156,6 @@
         sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
@@ -7501,7 +7168,6 @@
   rec-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7513,7 +7179,7 @@
         url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar";
         sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/rec-mode.html";
         license = lib.licenses.free;
@@ -7544,7 +7210,6 @@
   relint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xr,
@@ -7552,15 +7217,12 @@
     elpaBuild {
       pname = "relint";
       ename = "relint";
-      version = "1.24";
+      version = "2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/relint-1.24.tar";
-        sha256 = "0pnv2pkx5jq30049zplrmspkm1cc7p6vy9xfv215d27v8nas0374";
+        url = "https://elpa.gnu.org/packages/relint-2.0.tar";
+        sha256 = "0r89b5yk5lp92k4gnr0sx6ccilqzpv6kd5csqhxydk0xmqh8rsff";
       };
-      packageRequires = [
-        emacs
-        xr
-      ];
+      packageRequires = [ xr ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/relint.html";
         license = lib.licenses.free;
@@ -7570,7 +7232,6 @@
   repology = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7582,7 +7243,7 @@
         url = "https://elpa.gnu.org/packages/repology-1.2.4.tar";
         sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/repology.html";
         license = lib.licenses.free;
@@ -7680,7 +7341,6 @@
       cl-lib ? null,
       cl-print ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7696,7 +7356,6 @@
         cl-generic
         cl-lib
         cl-print
-        emacs
       ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/rudel.html";
@@ -7707,7 +7366,6 @@
   satchel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -7720,10 +7378,7 @@
         url = "https://elpa.gnu.org/packages/satchel-0.2.tar";
         sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/satchel.html";
         license = lib.licenses.free;
@@ -7734,7 +7389,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7746,10 +7400,7 @@
         url = "https://elpa.gnu.org/packages/scanner-0.2.tar";
         sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/scanner.html";
         license = lib.licenses.free;
@@ -7822,7 +7473,6 @@
   setup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7834,7 +7484,7 @@
         url = "https://elpa.gnu.org/packages/setup-1.4.0.tar";
         sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/setup.html";
         license = lib.licenses.free;
@@ -7865,7 +7515,6 @@
   shell-command-plus = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7877,7 +7526,7 @@
         url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
         sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/shell-command+.html";
         license = lib.licenses.free;
@@ -7929,7 +7578,6 @@
   site-lisp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7941,7 +7589,7 @@
         url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar";
         sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/site-lisp.html";
         license = lib.licenses.free;
@@ -8036,7 +7684,6 @@
   smart-yank = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8048,7 +7695,7 @@
         url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar";
         sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/smart-yank.html";
         license = lib.licenses.free;
@@ -8059,7 +7706,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8071,10 +7717,7 @@
         url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar";
         sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/sml-mode.html";
         license = lib.licenses.free;
@@ -8084,7 +7727,6 @@
   so-long = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8096,7 +7738,7 @@
         url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar";
         sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/so-long.html";
         license = lib.licenses.free;
@@ -8107,7 +7749,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8119,10 +7760,7 @@
         url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar";
         sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/soap-client.html";
         license = lib.licenses.free;
@@ -8133,7 +7771,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8145,10 +7782,7 @@
         url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar";
         sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/sokoban.html";
         license = lib.licenses.free;
@@ -8158,7 +7792,6 @@
   sotlisp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8170,7 +7803,7 @@
         url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar";
         sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/sotlisp.html";
         license = lib.licenses.free;
@@ -8180,7 +7813,6 @@
   spacious-padding = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8192,7 +7824,7 @@
         url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar";
         sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
         license = lib.licenses.free;
@@ -8202,7 +7834,6 @@
   spinner = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8214,7 +7845,7 @@
         url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar";
         sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/spinner.html";
         license = lib.licenses.free;
@@ -8245,7 +7876,6 @@
   sql-cassandra = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8257,7 +7887,7 @@
         url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar";
         sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
         license = lib.licenses.free;
@@ -8289,7 +7919,6 @@
   srht = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -8304,7 +7933,6 @@
         sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n";
       };
       packageRequires = [
-        emacs
         plz
         transient
       ];
@@ -8317,7 +7945,6 @@
   ssh-deploy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8329,7 +7956,7 @@
         url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar";
         sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
         license = lib.licenses.free;
@@ -8339,19 +7966,18 @@
   standard-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "standard-themes";
       ename = "standard-themes";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar";
-        sha256 = "0cyr3n9w359sa8ylcgzsvhxrk9f1rl1scb5339ci2la7zpg5vxwr";
+        url = "https://elpa.gnu.org/packages/standard-themes-2.1.0.tar";
+        sha256 = "0x7fphd36kwg4vfwix5rq7260xl6x6cjfwsq11rj4af30sm4hlfn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/standard-themes.html";
         license = lib.licenses.free;
@@ -8361,7 +7987,6 @@
   stream = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8373,7 +7998,7 @@
         url = "https://elpa.gnu.org/packages/stream-2.3.0.tar";
         sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/stream.html";
         license = lib.licenses.free;
@@ -8383,7 +8008,6 @@
   substitute = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8395,7 +8019,7 @@
         url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar";
         sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/substitute.html";
         license = lib.licenses.free;
@@ -8405,7 +8029,6 @@
   svg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8417,7 +8040,7 @@
         url = "https://elpa.gnu.org/packages/svg-1.1.tar";
         sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/svg.html";
         license = lib.licenses.free;
@@ -8427,7 +8050,6 @@
   svg-clock = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg,
@@ -8440,10 +8062,7 @@
         url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar";
         sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8";
       };
-      packageRequires = [
-        emacs
-        svg
-      ];
+      packageRequires = [ svg ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/svg-clock.html";
         license = lib.licenses.free;
@@ -8453,7 +8072,6 @@
   svg-lib = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8465,7 +8083,7 @@
         url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar";
         sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/svg-lib.html";
         license = lib.licenses.free;
@@ -8475,7 +8093,6 @@
   svg-tag-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg-lib,
@@ -8488,10 +8105,7 @@
         url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar";
         sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr";
       };
-      packageRequires = [
-        emacs
-        svg-lib
-      ];
+      packageRequires = [ svg-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
         license = lib.licenses.free;
@@ -8501,7 +8115,6 @@
   swiper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -8514,10 +8127,7 @@
         url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar";
         sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds";
       };
-      packageRequires = [
-        emacs
-        ivy
-      ];
+      packageRequires = [ ivy ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/swiper.html";
         license = lib.licenses.free;
@@ -8528,7 +8138,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8540,10 +8149,7 @@
         url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar";
         sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/switchy-window.html";
         license = lib.licenses.free;
@@ -8553,7 +8159,6 @@
   sxhkdrc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8565,7 +8170,7 @@
         url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar";
         sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
         license = lib.licenses.free;
@@ -8575,7 +8180,6 @@
   system-packages = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8587,7 +8191,7 @@
         url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar";
         sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/system-packages.html";
         license = lib.licenses.free;
@@ -8619,7 +8223,6 @@
   tam = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       queue,
@@ -8632,10 +8235,7 @@
         url = "https://elpa.gnu.org/packages/tam-0.1.tar";
         sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8";
       };
-      packageRequires = [
-        emacs
-        queue
-      ];
+      packageRequires = [ queue ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tam.html";
         license = lib.licenses.free;
@@ -8645,19 +8245,18 @@
   taxy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "taxy";
       ename = "taxy";
-      version = "0.10.1";
+      version = "0.10.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";
-        sha256 = "0r4kv0lqjk720p8kfah256370miqg68598jp5466sc6v9qax4wd9";
+        url = "https://elpa.gnu.org/packages/taxy-0.10.2.tar";
+        sha256 = "1nmlx2rvlgzvmz1h3s5yn3qnad12pn2a83gjzxf3ln79p8rv1mj6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/taxy.html";
         license = lib.licenses.free;
@@ -8667,7 +8266,6 @@
   taxy-magit-section = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit-section,
@@ -8676,13 +8274,12 @@
     elpaBuild {
       pname = "taxy-magit-section";
       ename = "taxy-magit-section";
-      version = "0.13";
+      version = "0.14";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar";
-        sha256 = "06sivl4rc06qr67qw2gqpw7lsaqf3j78llkrljwby7a77yzlhbrj";
+        url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.tar";
+        sha256 = "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi";
       };
       packageRequires = [
-        emacs
         magit-section
         taxy
       ];
@@ -8695,7 +8292,6 @@
   temp-buffer-browse = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8707,7 +8303,7 @@
         url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar";
         sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
         license = lib.licenses.free;
@@ -8718,22 +8314,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.1";
+      version = "1.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tempel-1.1.tar";
-        sha256 = "01zrp3wi4nvp67wda1b5fyjfxd0akhk7aqc2nqh1sk4mjp5zpnsq";
+        url = "https://elpa.gnu.org/packages/tempel-1.2.tar";
+        sha256 = "0lvdd7lvdx4yf0zhrv380y5q3zvvk7gsxjgxj2c40np86c4q2q7m";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tempel.html";
         license = lib.licenses.free;
@@ -8765,7 +8357,6 @@
   tex-item = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8777,7 +8368,7 @@
         url = "https://elpa.gnu.org/packages/tex-item-0.1.tar";
         sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tex-item.html";
         license = lib.licenses.free;
@@ -8788,7 +8379,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8800,10 +8390,7 @@
         url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
         sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tex-parens.html";
         license = lib.licenses.free;
@@ -8813,7 +8400,6 @@
   theme-buffet = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8825,7 +8411,7 @@
         url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar";
         sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
         license = lib.licenses.free;
@@ -8836,7 +8422,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8848,10 +8433,7 @@
         url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
         sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
         license = lib.licenses.free;
@@ -8882,7 +8464,6 @@
   tmr = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8894,7 +8475,7 @@
         url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar";
         sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tmr.html";
         license = lib.licenses.free;
@@ -8904,7 +8485,6 @@
   tomelr = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -8919,7 +8499,6 @@
         sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh";
       };
       packageRequires = [
-        emacs
         map
         seq
       ];
@@ -8932,7 +8511,6 @@
   topspace = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8944,7 +8522,7 @@
         url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar";
         sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/topspace.html";
         license = lib.licenses.free;
@@ -8954,7 +8532,6 @@
   track-changes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8966,7 +8543,7 @@
         url = "https://elpa.gnu.org/packages/track-changes-1.2.tar";
         sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/track-changes.html";
         license = lib.licenses.free;
@@ -8976,19 +8553,18 @@
   tramp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "tramp";
       ename = "tramp";
-      version = "2.7.1";
+      version = "2.7.1.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar";
-        sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8";
+        url = "https://elpa.gnu.org/packages/tramp-2.7.1.1.tar";
+        sha256 = "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tramp.html";
         license = lib.licenses.free;
@@ -8998,7 +8574,6 @@
   tramp-nspawn = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9010,7 +8585,7 @@
         url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar";
         sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
         license = lib.licenses.free;
@@ -9020,7 +8595,6 @@
   tramp-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9032,7 +8606,7 @@
         url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar";
         sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
         license = lib.licenses.free;
@@ -9064,7 +8638,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9072,14 +8645,13 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.7.2";
+      version = "0.7.4";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.7.2.tar";
-        sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby";
+        url = "https://elpa.gnu.org/packages/transient-0.7.4.tar";
+        sha256 = "00fcrbdk7gxaa25n5j1g688mlislnyj6w4743870liavvg982z9w";
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
@@ -9091,7 +8663,6 @@
   transient-cycles = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9103,7 +8674,7 @@
         url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar";
         sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
         license = lib.licenses.free;
@@ -9113,7 +8684,6 @@
   tree-inspector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       treeview,
@@ -9126,10 +8696,7 @@
         url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar";
         sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz";
       };
-      packageRequires = [
-        emacs
-        treeview
-      ];
+      packageRequires = [ treeview ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
         license = lib.licenses.free;
@@ -9165,7 +8732,6 @@
   triples = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9178,10 +8744,7 @@
         url = "https://elpa.gnu.org/packages/triples-0.3.5.tar";
         sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/triples.html";
         license = lib.licenses.free;
@@ -9191,7 +8754,6 @@
   typo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9203,7 +8765,7 @@
         url = "https://elpa.gnu.org/packages/typo-1.0.1.tar";
         sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/typo.html";
         license = lib.licenses.free;
@@ -9213,7 +8775,6 @@
   ulisp-repl = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9225,7 +8786,7 @@
         url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar";
         sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
         license = lib.licenses.free;
@@ -9278,7 +8839,6 @@
   uniquify-files = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9290,7 +8850,7 @@
         url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar";
         sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
         license = lib.licenses.free;
@@ -9301,7 +8861,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -9316,7 +8875,6 @@
       };
       packageRequires = [
         compat
-        emacs
         project
       ];
       meta = {
@@ -9377,7 +8935,6 @@
   url-scgi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9389,7 +8946,7 @@
         url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar";
         sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/url-scgi.html";
         license = lib.licenses.free;
@@ -9400,7 +8957,6 @@
     {
       bind-key,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9412,10 +8968,7 @@
         url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar";
         sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp";
       };
-      packageRequires = [
-        bind-key
-        emacs
-      ];
+      packageRequires = [ bind-key ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/use-package.html";
         license = lib.licenses.free;
@@ -9426,7 +8979,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9441,7 +8993,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         seq
       ];
       meta = {
@@ -9453,7 +9004,6 @@
   valign = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9465,7 +9015,7 @@
         url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
         sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/valign.html";
         license = lib.licenses.free;
@@ -9496,7 +9046,6 @@
   vc-got = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9508,7 +9057,7 @@
         url = "https://elpa.gnu.org/packages/vc-got-1.2.tar";
         sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vc-got.html";
         license = lib.licenses.free;
@@ -9518,7 +9067,6 @@
   vc-hgcmd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9530,7 +9078,7 @@
         url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar";
         sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
         license = lib.licenses.free;
@@ -9540,7 +9088,6 @@
   vcard = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9552,7 +9099,7 @@
         url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar";
         sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vcard.html";
         license = lib.licenses.free;
@@ -9583,7 +9130,6 @@
   vdiff = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       hydra,
       lib,
@@ -9596,10 +9142,7 @@
         url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar";
         sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m";
       };
-      packageRequires = [
-        emacs
-        hydra
-      ];
+      packageRequires = [ hydra ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vdiff.html";
         license = lib.licenses.free;
@@ -9631,22 +9174,18 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "1.8";
+      version = "1.9";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/vertico-1.8.tar";
-        sha256 = "0k6sfla0183vyjf2yd9sycck9nxz0x659kygxgiaip3zq7f9zkg8";
+        url = "https://elpa.gnu.org/packages/vertico-1.9.tar";
+        sha256 = "12aiqxsar86xlmsfzvilza10wf184nwhg218bv6bip7v51ikh37y";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vertico.html";
         license = lib.licenses.free;
@@ -9656,7 +9195,6 @@
   vertico-posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       posframe,
@@ -9671,7 +9209,6 @@
         sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy";
       };
       packageRequires = [
-        emacs
         posframe
         vertico
       ];
@@ -9684,7 +9221,6 @@
   vigenere = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9696,7 +9232,7 @@
         url = "https://elpa.gnu.org/packages/vigenere-1.0.tar";
         sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vigenere.html";
         license = lib.licenses.free;
@@ -9706,19 +9242,18 @@
   visual-filename-abbrev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "visual-filename-abbrev";
       ename = "visual-filename-abbrev";
-      version = "1.2";
+      version = "1.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar";
-        sha256 = "0vy4ar10wbdykzl47xnrfcwszjxyq2f1vhdbynfcmkcyrr40v4wm";
+        url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.3.tar";
+        sha256 = "0aly8lkiykcxq3yyyd3lwyc7fmjpcxjdgny0iw0mzl8nhshrqrs0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
         license = lib.licenses.free;
@@ -9770,7 +9305,6 @@
   vundo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9782,7 +9316,7 @@
         url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar";
         sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/vundo.html";
         license = lib.licenses.free;
@@ -9813,7 +9347,6 @@
   wconf = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9825,7 +9358,7 @@
         url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar";
         sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/wconf.html";
         license = lib.licenses.free;
@@ -9835,7 +9368,6 @@
   web-server = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9847,7 +9379,7 @@
         url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar";
         sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/web-server.html";
         license = lib.licenses.free;
@@ -9857,7 +9389,6 @@
   webfeeder = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9869,7 +9400,7 @@
         url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar";
         sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/webfeeder.html";
         license = lib.licenses.free;
@@ -9901,19 +9432,18 @@
   which-key = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "which-key";
       ename = "which-key";
-      version = "3.6.0";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar";
-        sha256 = "1lf8q6sq0hnrspj6qy49i48az3js24ab4y0gksw4giiifiqlc5ba";
+        url = "https://elpa.gnu.org/packages/which-key-3.6.1.tar";
+        sha256 = "0p1vl7dnd7nsvzgsff19px9yzcw4w07qb5sb8g9r8a8slgvf3vqh";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/which-key.html";
         license = lib.licenses.free;
@@ -9923,7 +9453,6 @@
   window-commander = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9935,7 +9464,7 @@
         url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar";
         sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/window-commander.html";
         license = lib.licenses.free;
@@ -9946,7 +9475,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9958,10 +9486,7 @@
         url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar";
         sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
         license = lib.licenses.free;
@@ -9971,7 +9496,6 @@
   windower = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9983,7 +9507,7 @@
         url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
         sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/windower.html";
         license = lib.licenses.free;
@@ -10014,7 +9538,6 @@
   wisi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -10027,10 +9550,7 @@
         url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar";
         sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/wisi.html";
         license = lib.licenses.free;
@@ -10040,7 +9560,6 @@
   wisitoken-grammar-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       mmm-mode,
@@ -10055,7 +9574,6 @@
         sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20";
       };
       packageRequires = [
-        emacs
         mmm-mode
         wisi
       ];
@@ -10095,10 +9613,10 @@
     elpaBuild {
       pname = "wrap-search";
       ename = "wrap-search";
-      version = "4.16.13";
+      version = "4.16.19";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar";
-        sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi";
+        url = "https://elpa.gnu.org/packages/wrap-search-4.16.19.tar";
+        sha256 = "1qrvn5cxvd5sl18hyn979f9kany5vnypbflkhzmxas5q0n2miyfw";
       };
       packageRequires = [ ];
       meta = {
@@ -10131,7 +9649,6 @@
   xeft = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10143,7 +9660,7 @@
         url = "https://elpa.gnu.org/packages/xeft-3.3.tar";
         sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/xeft.html";
         license = lib.licenses.free;
@@ -10154,7 +9671,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10166,10 +9682,7 @@
         url = "https://elpa.gnu.org/packages/xelb-0.20.tar";
         sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/xelb.html";
         license = lib.licenses.free;
@@ -10205,19 +9718,18 @@
   xr = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "xr";
       ename = "xr";
-      version = "1.25";
+      version = "2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/xr-1.25.tar";
-        sha256 = "0jmhcrz6mj3fwm9acwv1jj6nlnqikprjgvglr3cgxysinqh6y3xi";
+        url = "https://elpa.gnu.org/packages/xr-2.0.tar";
+        sha256 = "1y5pcrph6v8q06mipv3l49qhw55yvvb1nnq0817bzm25k0s3z70v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/xr.html";
         license = lib.licenses.free;
@@ -10227,7 +9739,6 @@
   xref = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10239,7 +9750,7 @@
         url = "https://elpa.gnu.org/packages/xref-1.7.0.tar";
         sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/xref.html";
         license = lib.licenses.free;
@@ -10249,7 +9760,6 @@
   xref-union = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10261,7 +9771,7 @@
         url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar";
         sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/xref-union.html";
         license = lib.licenses.free;
@@ -10272,7 +9782,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10284,10 +9793,7 @@
         url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar";
         sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/yasnippet.html";
         license = lib.licenses.free;
@@ -10362,7 +9868,6 @@
   zuul = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -10375,10 +9880,7 @@
         url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar";
         sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/zuul.html";
         license = lib.licenses.free;

From d2e6659b0ebddcfc49513b7d0d2bc37f8d8b7a41 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 20 Aug 2024 23:19:16 +0800
Subject: [PATCH 222/235] elpa-devel-packages: updated 2024-08-20 (from
 overlay)

---
 .../elisp-packages/elpa-devel-generated.nix   | 2612 +++++++----------
 1 file changed, 1020 insertions(+), 1592 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index acfafcacbef8..f01f841edbe5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -17,7 +17,7 @@
       };
       packageRequires = [ avy ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ace-window.html";
+        homepage = "https://elpa.gnu.org/devel/ace-window.html";
         license = lib.licenses.free;
       };
     }
@@ -38,7 +38,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ack.html";
+        homepage = "https://elpa.gnu.org/devel/ack.html";
         license = lib.licenses.free;
       };
     }
@@ -46,7 +46,6 @@
   activities = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -54,17 +53,14 @@
     elpaBuild {
       pname = "activities";
       ename = "activities";
-      version = "0.8pre0.20240709.193836";
+      version = "0.8pre0.20240727.5721";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240709.193836.tar";
-        sha256 = "1spvk9z1gc522nq36mhyvn86cq9j64chd3mkizj21j93wkd5i3gy";
+        url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240727.5721.tar";
+        sha256 = "0f4p39vgi7fv3bh97267ys6rfy0ak0b4c15p57xfbybc47f8iwi1";
       };
-      packageRequires = [
-        emacs
-        persist
-      ];
+      packageRequires = [ persist ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/activities.html";
+        homepage = "https://elpa.gnu.org/devel/activities.html";
         license = lib.licenses.free;
       };
     }
@@ -72,7 +68,6 @@
   ada-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -88,13 +83,12 @@
         sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         uniquify-files
         wisi
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ada-mode.html";
+        homepage = "https://elpa.gnu.org/devel/ada-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -115,7 +109,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
+        homepage = "https://elpa.gnu.org/devel/ada-ref-man.html";
         license = lib.licenses.free;
       };
     }
@@ -123,7 +117,6 @@
   adaptive-wrap = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -135,9 +128,9 @@
         url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar";
         sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
+        homepage = "https://elpa.gnu.org/devel/adaptive-wrap.html";
         license = lib.licenses.free;
       };
     }
@@ -145,7 +138,6 @@
   adjust-parens = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -157,9 +149,9 @@
         url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar";
         sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
+        homepage = "https://elpa.gnu.org/devel/adjust-parens.html";
         license = lib.licenses.free;
       };
     }
@@ -167,7 +159,6 @@
   advice-patch = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -179,9 +170,9 @@
         url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar";
         sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/advice-patch.html";
+        homepage = "https://elpa.gnu.org/devel/advice-patch.html";
         license = lib.licenses.free;
       };
     }
@@ -189,7 +180,6 @@
   aggressive-completion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -201,9 +191,9 @@
         url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar";
         sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
+        homepage = "https://elpa.gnu.org/devel/aggressive-completion.html";
         license = lib.licenses.free;
       };
     }
@@ -211,7 +201,6 @@
   aggressive-indent = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -223,9 +212,9 @@
         url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar";
         sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
+        homepage = "https://elpa.gnu.org/devel/aggressive-indent.html";
         license = lib.licenses.free;
       };
     }
@@ -233,7 +222,6 @@
   agitate = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -245,9 +233,9 @@
         url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar";
         sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/agitate.html";
+        homepage = "https://elpa.gnu.org/devel/agitate.html";
         license = lib.licenses.free;
       };
     }
@@ -255,7 +243,6 @@
   ahungry-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -267,9 +254,9 @@
         url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar";
         sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
+        homepage = "https://elpa.gnu.org/devel/ahungry-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -277,7 +264,6 @@
   aircon-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -289,9 +275,9 @@
         url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar";
         sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
+        homepage = "https://elpa.gnu.org/devel/aircon-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -299,7 +285,6 @@
   all = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -311,9 +296,9 @@
         url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar";
         sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/all.html";
+        homepage = "https://elpa.gnu.org/devel/all.html";
         license = lib.licenses.free;
       };
     }
@@ -321,7 +306,6 @@
   altcaps = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -333,9 +317,9 @@
         url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar";
         sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/altcaps.html";
+        homepage = "https://elpa.gnu.org/devel/altcaps.html";
         license = lib.licenses.free;
       };
     }
@@ -343,7 +327,6 @@
   ampc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -355,9 +338,9 @@
         url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar";
         sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ampc.html";
+        homepage = "https://elpa.gnu.org/devel/ampc.html";
         license = lib.licenses.free;
       };
     }
@@ -379,7 +362,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/arbitools.html";
+        homepage = "https://elpa.gnu.org/devel/arbitools.html";
         license = lib.licenses.free;
       };
     }
@@ -400,7 +383,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+        homepage = "https://elpa.gnu.org/devel/ascii-art-to-unicode.html";
         license = lib.licenses.free;
       };
     }
@@ -408,7 +391,6 @@
   assess = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       m-buffer,
@@ -421,12 +403,9 @@
         url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar";
         sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12";
       };
-      packageRequires = [
-        emacs
-        m-buffer
-      ];
+      packageRequires = [ m-buffer ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/assess.html";
+        homepage = "https://elpa.gnu.org/devel/assess.html";
         license = lib.licenses.free;
       };
     }
@@ -434,21 +413,20 @@
   async = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "async";
       ename = "async";
-      version = "1.9.8.0.20240712.45742";
+      version = "1.9.8.0.20240811.143437";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240712.45742.tar";
-        sha256 = "0a4zbpb58mdcmfq7vfwbsqhcfghxx8c3fkvwsrlg5a3gdcjv4ymv";
+        url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240811.143437.tar";
+        sha256 = "0fybzmnw8gyz2c1zw1qbgk5j5sllgxnjjzj3jw5lqqa211ppy700";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/async.html";
+        homepage = "https://elpa.gnu.org/devel/async.html";
         license = lib.licenses.free;
       };
     }
@@ -456,21 +434,20 @@
   auctex = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "auctex";
       ename = "auctex";
-      version = "14.0.6.0.20240630.205810";
+      version = "14.0.6.0.20240819.102544";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240630.205810.tar";
-        sha256 = "0d1pkrqghyz2fqf7qs1yxnibjq0c7a0633j4kq7aqahcb9izpzj1";
+        url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240819.102544.tar";
+        sha256 = "1ca4h7d3shaykzay0cv48sfwkykjwc717557f1syy42xgnq1ghhd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auctex.html";
+        homepage = "https://elpa.gnu.org/devel/auctex.html";
         license = lib.licenses.free;
       };
     }
@@ -479,7 +456,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -491,12 +467,9 @@
         url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar";
         sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
+        homepage = "https://elpa.gnu.org/devel/auctex-cont-latexmk.html";
         license = lib.licenses.free;
       };
     }
@@ -505,7 +478,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -517,12 +489,9 @@
         url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar";
         sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
+        homepage = "https://elpa.gnu.org/devel/auctex-label-numbers.html";
         license = lib.licenses.free;
       };
     }
@@ -543,7 +512,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
+        homepage = "https://elpa.gnu.org/devel/aumix-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -564,7 +533,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auto-correct.html";
+        homepage = "https://elpa.gnu.org/devel/auto-correct.html";
         license = lib.licenses.free;
       };
     }
@@ -585,7 +554,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auto-header.html";
+        homepage = "https://elpa.gnu.org/devel/auto-header.html";
         license = lib.licenses.free;
       };
     }
@@ -607,7 +576,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
+        homepage = "https://elpa.gnu.org/devel/auto-overlays.html";
         license = lib.licenses.free;
       };
     }
@@ -615,7 +584,6 @@
   autocrypt = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -627,9 +595,9 @@
         url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar";
         sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/autocrypt.html";
+        homepage = "https://elpa.gnu.org/devel/autocrypt.html";
         license = lib.licenses.free;
       };
     }
@@ -638,7 +606,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -650,12 +617,9 @@
         url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar";
         sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/avy.html";
+        homepage = "https://elpa.gnu.org/devel/avy.html";
         license = lib.licenses.free;
       };
     }
@@ -664,7 +628,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -676,12 +639,9 @@
         url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar";
         sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bbdb.html";
+        homepage = "https://elpa.gnu.org/devel/bbdb.html";
         license = lib.licenses.free;
       };
     }
@@ -689,7 +649,6 @@
   beacon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -701,9 +660,9 @@
         url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar";
         sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/beacon.html";
+        homepage = "https://elpa.gnu.org/devel/beacon.html";
         license = lib.licenses.free;
       };
     }
@@ -711,21 +670,20 @@
   beframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "beframe";
       ename = "beframe";
-      version = "1.1.1.0.20240522.34215";
+      version = "1.1.1.0.20240815.175555";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar";
-        sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4";
+        url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240815.175555.tar";
+        sha256 = "1rzc4r9dfp0wnjlc1j662avpip1m8s00amv9sdshpbkz142c7paq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/beframe.html";
+        homepage = "https://elpa.gnu.org/devel/beframe.html";
         license = lib.licenses.free;
       };
     }
@@ -746,7 +704,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html";
+        homepage = "https://elpa.gnu.org/devel/bicep-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -754,7 +712,6 @@
   bind-key = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -766,9 +723,9 @@
         url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar";
         sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bind-key.html";
+        homepage = "https://elpa.gnu.org/devel/bind-key.html";
         license = lib.licenses.free;
       };
     }
@@ -776,7 +733,6 @@
   blist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ilist,
       lib,
@@ -784,17 +740,14 @@
     elpaBuild {
       pname = "blist";
       ename = "blist";
-      version = "0.3.0.20231213.61103";
+      version = "0.4.0.20240807.40202";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar";
-        sha256 = "01pqf794syngh6v4bym3qzg2rh2gp3z9h6hvpw74nadimfg5pz61";
+        url = "https://elpa.gnu.org/devel/blist-0.4.0.20240807.40202.tar";
+        sha256 = "1y1sfyvxca5g2rsh579lly1drr9qs1czb1z692fysir7l48p3y3w";
       };
-      packageRequires = [
-        emacs
-        ilist
-      ];
+      packageRequires = [ ilist ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/blist.html";
+        homepage = "https://elpa.gnu.org/devel/blist.html";
         license = lib.licenses.free;
       };
     }
@@ -803,7 +756,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -815,12 +767,9 @@
         url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar";
         sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bluetooth.html";
+        homepage = "https://elpa.gnu.org/devel/bluetooth.html";
         license = lib.licenses.free;
       };
     }
@@ -829,7 +778,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -841,12 +789,9 @@
         url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar";
         sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
+        homepage = "https://elpa.gnu.org/devel/bnf-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -854,7 +799,6 @@
   boxy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -866,9 +810,9 @@
         url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar";
         sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/boxy.html";
+        homepage = "https://elpa.gnu.org/devel/boxy.html";
         license = lib.licenses.free;
       };
     }
@@ -877,7 +821,6 @@
     {
       boxy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -892,11 +835,10 @@
       };
       packageRequires = [
         boxy
-        emacs
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
+        homepage = "https://elpa.gnu.org/devel/boxy-headings.html";
         license = lib.licenses.free;
       };
     }
@@ -904,7 +846,6 @@
   breadcrumb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -917,12 +858,9 @@
         url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar";
         sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
+        homepage = "https://elpa.gnu.org/devel/breadcrumb.html";
         license = lib.licenses.free;
       };
     }
@@ -948,7 +886,7 @@
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/brief.html";
+        homepage = "https://elpa.gnu.org/devel/brief.html";
         license = lib.licenses.free;
       };
     }
@@ -957,7 +895,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -969,12 +906,9 @@
         url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar";
         sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/buffer-env.html";
+        homepage = "https://elpa.gnu.org/devel/buffer-env.html";
         license = lib.licenses.free;
       };
     }
@@ -983,7 +917,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -995,12 +928,9 @@
         url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar";
         sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
+        homepage = "https://elpa.gnu.org/devel/buffer-expose.html";
         license = lib.licenses.free;
       };
     }
@@ -1008,7 +938,6 @@
   bufferlo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1020,9 +949,9 @@
         url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar";
         sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bufferlo.html";
+        homepage = "https://elpa.gnu.org/devel/bufferlo.html";
         license = lib.licenses.free;
       };
     }
@@ -1048,7 +977,7 @@
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
+        homepage = "https://elpa.gnu.org/devel/bug-hunter.html";
         license = lib.licenses.free;
       };
     }
@@ -1056,7 +985,6 @@
   buildbot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1068,9 +996,9 @@
         url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar";
         sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/buildbot.html";
+        homepage = "https://elpa.gnu.org/devel/buildbot.html";
         license = lib.licenses.free;
       };
     }
@@ -1079,7 +1007,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1091,12 +1018,9 @@
         url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar";
         sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/calibre.html";
+        homepage = "https://elpa.gnu.org/devel/calibre.html";
         license = lib.licenses.free;
       };
     }
@@ -1105,24 +1029,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "1.5.0.20240710.192144";
+      version = "1.6.0.20240818.141447";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-1.5.0.20240710.192144.tar";
-        sha256 = "0kg9qv8qkcs2v3x1dkyg3j1zxqql000bhbdh7awfk42dfq181lcj";
+        url = "https://elpa.gnu.org/devel/cape-1.6.0.20240818.141447.tar";
+        sha256 = "0gs6xqmv3qv6b1d373n42g6qhb5v4g5x0g6ra2z58bjggz1qz30h";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cape.html";
+        homepage = "https://elpa.gnu.org/devel/cape.html";
         license = lib.licenses.free;
       };
     }
@@ -1130,7 +1050,6 @@
   capf-autosuggest = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1142,9 +1061,9 @@
         url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar";
         sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
+        homepage = "https://elpa.gnu.org/devel/capf-autosuggest.html";
         license = lib.licenses.free;
       };
     }
@@ -1165,7 +1084,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/caps-lock.html";
+        homepage = "https://elpa.gnu.org/devel/caps-lock.html";
         license = lib.licenses.free;
       };
     }
@@ -1186,7 +1105,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/captain.html";
+        homepage = "https://elpa.gnu.org/devel/captain.html";
         license = lib.licenses.free;
       };
     }
@@ -1208,7 +1127,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/chess.html";
+        homepage = "https://elpa.gnu.org/devel/chess.html";
         license = lib.licenses.free;
       };
     }
@@ -1229,7 +1148,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cl-generic.html";
+        homepage = "https://elpa.gnu.org/devel/cl-generic.html";
         license = lib.licenses.free;
       };
     }
@@ -1250,7 +1169,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cl-lib.html";
+        homepage = "https://elpa.gnu.org/devel/cl-lib.html";
         license = lib.licenses.free;
       };
     }
@@ -1258,7 +1177,6 @@
   clipboard-collector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1270,9 +1188,9 @@
         url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar";
         sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
+        homepage = "https://elpa.gnu.org/devel/clipboard-collector.html";
         license = lib.licenses.free;
       };
     }
@@ -1294,7 +1212,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
+        homepage = "https://elpa.gnu.org/devel/cobol-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1302,21 +1220,20 @@
   code-cells = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "code-cells";
       ename = "code-cells";
-      version = "0.4.0.20231119.213845";
+      version = "0.4.0.20240809.93222";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar";
-        sha256 = "1i66d234fb9g4aqnpzjz9dn6hs37bq5l1vrk076hib1rb1vm36ir";
+        url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20240809.93222.tar";
+        sha256 = "19mibw99y13fmbngbg1x1zv02j50pcbrifl62slrx4aj3v796839";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/code-cells.html";
+        homepage = "https://elpa.gnu.org/devel/code-cells.html";
         license = lib.licenses.free;
       };
     }
@@ -1325,7 +1242,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1337,12 +1253,9 @@
         url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar";
         sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
+        homepage = "https://elpa.gnu.org/devel/colorful-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1350,21 +1263,20 @@
   comint-mime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "comint-mime";
       ename = "comint-mime";
-      version = "0.4.0.20240426.193136";
+      version = "0.4.0.20240810.184048";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240426.193136.tar";
-        sha256 = "1znk6anr6yxb9jfh3z7702msl011k54z37vbixbdk2bvd7hihcx3";
+        url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240810.184048.tar";
+        sha256 = "0gaz8f730d6z8y1f8yckklgimm85c7qm96ascdj8yw0mh483xcg6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/comint-mime.html";
+        homepage = "https://elpa.gnu.org/devel/comint-mime.html";
         license = lib.licenses.free;
       };
     }
@@ -1385,7 +1297,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
+        homepage = "https://elpa.gnu.org/devel/compact-docstrings.html";
         license = lib.licenses.free;
       };
     }
@@ -1393,21 +1305,20 @@
   company = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "company";
       ename = "company";
-      version = "0.10.2.0.20240713.30311";
+      version = "0.10.2.0.20240729.84605";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240713.30311.tar";
-        sha256 = "166sgcwvwysvnlwm91bz2c4k85y846qflpg80ywyhnjklskldjh9";
+        url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240729.84605.tar";
+        sha256 = "09r7jjz0hqks08syxg889d1qbwwla6kwp29n5h660np4ymx38gbq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/company.html";
+        homepage = "https://elpa.gnu.org/devel/company.html";
         license = lib.licenses.free;
       };
     }
@@ -1433,7 +1344,7 @@
         ebdb
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+        homepage = "https://elpa.gnu.org/devel/company-ebdb.html";
         license = lib.licenses.free;
       };
     }
@@ -1459,7 +1370,7 @@
         math-symbol-lists
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/company-math.html";
+        homepage = "https://elpa.gnu.org/devel/company-math.html";
         license = lib.licenses.free;
       };
     }
@@ -1468,7 +1379,6 @@
     {
       company,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1480,12 +1390,9 @@
         url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar";
         sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3";
       };
-      packageRequires = [
-        company
-        emacs
-      ];
+      packageRequires = [ company ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/company-statistics.html";
+        homepage = "https://elpa.gnu.org/devel/company-statistics.html";
         license = lib.licenses.free;
       };
     }
@@ -1493,7 +1400,6 @@
   compat = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -1501,17 +1407,14 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "30.0.0.0.0.20240708.182228";
+      version = "30.0.0.0.0.20240803.181300";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240708.182228.tar";
-        sha256 = "0qgr35606hqz5x6161lwq8zv15z08pm1xbfv32qgzpszmyj8855d";
+        url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240803.181300.tar";
+        sha256 = "15an93nh3l0njb9vl1bmg59r8z7mcp3zpjp27vwg0rmvldqg72r3";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/compat.html";
+        homepage = "https://elpa.gnu.org/devel/compat.html";
         license = lib.licenses.free;
       };
     }
@@ -1520,24 +1423,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "1.7.0.20240710.202854";
+      version = "1.8.0.20240818.112757";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-1.7.0.20240710.202854.tar";
-        sha256 = "0l4w88530qh65m5wkh8i5z2sv3zfm1jylr3885s550ix0dq45503";
+        url = "https://elpa.gnu.org/devel/consult-1.8.0.20240818.112757.tar";
+        sha256 = "1f5likm0mv41by193dc714lvcjz9604k31pswr2nnfknia164x5k";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult.html";
+        homepage = "https://elpa.gnu.org/devel/consult.html";
         license = lib.licenses.free;
       };
     }
@@ -1547,7 +1446,6 @@
       consult,
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1562,10 +1460,9 @@
       packageRequires = [
         consult
         denote
-        emacs
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult-denote.html";
+        homepage = "https://elpa.gnu.org/devel/consult-denote.html";
         license = lib.licenses.free;
       };
     }
@@ -1573,7 +1470,6 @@
   consult-hoogle = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       haskell-mode,
       lib,
@@ -1586,12 +1482,9 @@
         url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar";
         sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m";
       };
-      packageRequires = [
-        emacs
-        haskell-mode
-      ];
+      packageRequires = [ haskell-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
+        homepage = "https://elpa.gnu.org/devel/consult-hoogle.html";
         license = lib.licenses.free;
       };
     }
@@ -1600,7 +1493,6 @@
     {
       consult,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1612,12 +1504,9 @@
         url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar";
         sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1";
       };
-      packageRequires = [
-        consult
-        emacs
-      ];
+      packageRequires = [ consult ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
+        homepage = "https://elpa.gnu.org/devel/consult-recoll.html";
         license = lib.licenses.free;
       };
     }
@@ -1625,7 +1514,6 @@
   context-coloring = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1637,9 +1525,9 @@
         url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar";
         sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/context-coloring.html";
+        homepage = "https://elpa.gnu.org/devel/context-coloring.html";
         license = lib.licenses.free;
       };
     }
@@ -1648,24 +1536,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "1.4.0.20240711.184800";
+      version = "1.5.0.20240818.102943";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-1.4.0.20240711.184800.tar";
-        sha256 = "0fvpsblz8750vlnv4mbwh0zz90xn35svbii2hyz2ngzb0yjrygch";
+        url = "https://elpa.gnu.org/devel/corfu-1.5.0.20240818.102943.tar";
+        sha256 = "0arfkrnls7gj6z1k764p6vgfmb915fa61hwbflfgsnhms3x0vpmv";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/corfu.html";
+        homepage = "https://elpa.gnu.org/devel/corfu.html";
         license = lib.licenses.free;
       };
     }
@@ -1674,7 +1558,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1686,12 +1569,9 @@
         url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar";
         sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/coterm.html";
+        homepage = "https://elpa.gnu.org/devel/coterm.html";
         license = lib.licenses.free;
       };
     }
@@ -1699,7 +1579,6 @@
   counsel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -1714,12 +1593,11 @@
         sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr";
       };
       packageRequires = [
-        emacs
         ivy
         swiper
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/counsel.html";
+        homepage = "https://elpa.gnu.org/devel/counsel.html";
         license = lib.licenses.free;
       };
     }
@@ -1727,7 +1605,6 @@
   cpio-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1739,9 +1616,9 @@
         url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar";
         sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
+        homepage = "https://elpa.gnu.org/devel/cpio-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1762,7 +1639,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cpupower.html";
+        homepage = "https://elpa.gnu.org/devel/cpupower.html";
         license = lib.licenses.free;
       };
     }
@@ -1783,7 +1660,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/crdt.html";
+        homepage = "https://elpa.gnu.org/devel/crdt.html";
         license = lib.licenses.free;
       };
     }
@@ -1804,7 +1681,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/crisp.html";
+        homepage = "https://elpa.gnu.org/devel/crisp.html";
         license = lib.licenses.free;
       };
     }
@@ -1812,7 +1689,6 @@
   csharp-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1824,9 +1700,9 @@
         url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar";
         sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
+        homepage = "https://elpa.gnu.org/devel/csharp-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1835,24 +1711,41 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "csv-mode";
       ename = "csv-mode";
-      version = "1.25.0.20240529.65338";
+      version = "1.27.0.20240816.74202";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/csv-mode-1.25.0.20240529.65338.tar";
-        sha256 = "0rr4gz38y1gyzg8mwyl62macjq31rs6fvx3pngamyq1y3ghpivsb";
+        url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20240816.74202.tar";
+        sha256 = "1j6iqjp9k14i3d9n9dnk3m4wpixkflq8dlr6mapbgvd2kksmgigp";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/csv-mode.html";
+        homepage = "https://elpa.gnu.org/devel/csv-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cursor-undo = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cursor-undo";
+      ename = "cursor-undo";
+      version = "1.1.5.0.20240818.152228";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cursor-undo-1.1.5.0.20240818.152228.tar";
+        sha256 = "0hz6na9izpzbf50sq0bsy0q265g66ic67kc9zzhw0hqsfpym6b7f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/cursor-undo.html";
         license = lib.licenses.free;
       };
     }
@@ -1860,7 +1753,6 @@
   cursory = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1872,9 +1764,9 @@
         url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar";
         sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cursory.html";
+        homepage = "https://elpa.gnu.org/devel/cursory.html";
         license = lib.licenses.free;
       };
     }
@@ -1895,7 +1787,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
+        homepage = "https://elpa.gnu.org/devel/cycle-quotes.html";
         license = lib.licenses.free;
       };
     }
@@ -1903,7 +1795,6 @@
   dape = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       jsonrpc,
       lib,
@@ -1911,17 +1802,14 @@
     elpaBuild {
       pname = "dape";
       ename = "dape";
-      version = "0.13.0.0.20240711.211516";
+      version = "0.14.0.0.20240818.195258";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dape-0.13.0.0.20240711.211516.tar";
-        sha256 = "13wzg3z8pfd0gydld2np2bih7bpmpvm98m6z5cwmc2bfh20p8xpa";
+        url = "https://elpa.gnu.org/devel/dape-0.14.0.0.20240818.195258.tar";
+        sha256 = "0bl8a05vrf7z7pc5gj947cir7cg3rzzljn2ck11l5801w5zq5yr5";
       };
-      packageRequires = [
-        emacs
-        jsonrpc
-      ];
+      packageRequires = [ jsonrpc ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dape.html";
+        homepage = "https://elpa.gnu.org/devel/dape.html";
         license = lib.licenses.free;
       };
     }
@@ -1943,7 +1831,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/darkroom.html";
+        homepage = "https://elpa.gnu.org/devel/darkroom.html";
         license = lib.licenses.free;
       };
     }
@@ -1951,7 +1839,6 @@
   dash = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1963,9 +1850,9 @@
         url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar";
         sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dash.html";
+        homepage = "https://elpa.gnu.org/devel/dash.html";
         license = lib.licenses.free;
       };
     }
@@ -1987,7 +1874,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
+        homepage = "https://elpa.gnu.org/devel/dbus-codegen.html";
         license = lib.licenses.free;
       };
     }
@@ -1995,7 +1882,6 @@
   debbugs = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       soap-client,
@@ -2003,17 +1889,14 @@
     elpaBuild {
       pname = "debbugs";
       ename = "debbugs";
-      version = "0.40.0.20240318.175047";
+      version = "0.40.0.20240812.95045";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar";
-        sha256 = "02kb6klsixyxn4a65mgr9m8n1cx68n7zqyym8m14381k0mi8pq0h";
+        url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240812.95045.tar";
+        sha256 = "0lylhjg1a6iwb7w08xnblv9890c3din8w7hgja8bf4qq8j6w8xwq";
       };
-      packageRequires = [
-        emacs
-        soap-client
-      ];
+      packageRequires = [ soap-client ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/debbugs.html";
+        homepage = "https://elpa.gnu.org/devel/debbugs.html";
         license = lib.licenses.free;
       };
     }
@@ -2039,7 +1922,7 @@
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/delight.html";
+        homepage = "https://elpa.gnu.org/devel/delight.html";
         license = lib.licenses.free;
       };
     }
@@ -2047,21 +1930,20 @@
   denote = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "3.0.6.0.20240712.154245";
+      version = "3.0.8.0.20240804.85702";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-3.0.6.0.20240712.154245.tar";
-        sha256 = "134s5mgkrsi65skvhqic89ch9806ln6s9glhh8dz552yb46pwbdd";
+        url = "https://elpa.gnu.org/devel/denote-3.0.8.0.20240804.85702.tar";
+        sha256 = "01kvkcdl60xdfrdxj02llbdxnp5dbkkmyabw9188hd58kvvxkwdn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/denote.html";
+        homepage = "https://elpa.gnu.org/devel/denote.html";
         license = lib.licenses.free;
       };
     }
@@ -2070,24 +1952,20 @@
     {
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "denote-menu";
       ename = "denote-menu";
-      version = "1.2.0.0.20240712.110155";
+      version = "1.3.0.0.20240813.204446";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20240712.110155.tar";
-        sha256 = "182dbr5hay13nca52qyymmrsmfcwd62ncayjh76ii0jn3khbcqzf";
+        url = "https://elpa.gnu.org/devel/denote-menu-1.3.0.0.20240813.204446.tar";
+        sha256 = "0ifs4f1x9cgz324cj57f86qifwx0pnzvq12ma0b55s3din0xsvcc";
       };
-      packageRequires = [
-        denote
-        emacs
-      ];
+      packageRequires = [ denote ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/denote-menu.html";
+        homepage = "https://elpa.gnu.org/devel/denote-menu.html";
         license = lib.licenses.free;
       };
     }
@@ -2095,7 +1973,6 @@
   detached = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2107,9 +1984,9 @@
         url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar";
         sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/detached.html";
+        homepage = "https://elpa.gnu.org/devel/detached.html";
         license = lib.licenses.free;
       };
     }
@@ -2117,7 +1994,6 @@
   devdocs = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2129,9 +2005,9 @@
         url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar";
         sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devdocs.html";
+        homepage = "https://elpa.gnu.org/devel/devdocs.html";
         license = lib.licenses.free;
       };
     }
@@ -2139,7 +2015,6 @@
   devicetree-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2151,9 +2026,9 @@
         url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar";
         sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
+        homepage = "https://elpa.gnu.org/devel/devicetree-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2161,7 +2036,6 @@
   dict-tree = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       heap,
       lib,
@@ -2177,13 +2051,12 @@
         sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj";
       };
       packageRequires = [
-        emacs
         heap
         tNFA
         trie
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dict-tree.html";
+        homepage = "https://elpa.gnu.org/devel/dict-tree.html";
         license = lib.licenses.free;
       };
     }
@@ -2192,24 +2065,20 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "diff-hl";
       ename = "diff-hl";
-      version = "1.9.2.0.20240702.202011";
+      version = "1.10.0.0.20240802.231611";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240702.202011.tar";
-        sha256 = "12i8vl4jiv3v952h7amlmzkvvdpdfmfj77xz3hyjyrr6zvdhygls";
+        url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20240802.231611.tar";
+        sha256 = "11zp0h0n1myj1d9x5bi8b0kdrgs4wf0nc3zc2zkz8zh7fz5rhc9p";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/diff-hl.html";
+        homepage = "https://elpa.gnu.org/devel/diff-hl.html";
         license = lib.licenses.free;
       };
     }
@@ -2230,7 +2099,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/diffview.html";
+        homepage = "https://elpa.gnu.org/devel/diffview.html";
         license = lib.licenses.free;
       };
     }
@@ -2238,7 +2107,6 @@
   diminish = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2250,9 +2118,9 @@
         url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar";
         sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/diminish.html";
+        homepage = "https://elpa.gnu.org/devel/diminish.html";
         license = lib.licenses.free;
       };
     }
@@ -2261,7 +2129,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2273,12 +2140,9 @@
         url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar";
         sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dired-du.html";
+        homepage = "https://elpa.gnu.org/devel/dired-du.html";
         license = lib.licenses.free;
       };
     }
@@ -2286,7 +2150,6 @@
   dired-duplicates = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2298,9 +2161,9 @@
         url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar";
         sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
+        homepage = "https://elpa.gnu.org/devel/dired-duplicates.html";
         license = lib.licenses.free;
       };
     }
@@ -2308,7 +2171,6 @@
   dired-git-info = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2320,9 +2182,9 @@
         url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar";
         sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
+        homepage = "https://elpa.gnu.org/devel/dired-git-info.html";
         license = lib.licenses.free;
       };
     }
@@ -2330,21 +2192,20 @@
   dired-preview = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "dired-preview";
       ename = "dired-preview";
-      version = "0.2.0.0.20240507.55800";
+      version = "0.2.0.0.20240805.90710";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar";
-        sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04";
+        url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240805.90710.tar";
+        sha256 = "0n606w117y7swf95hxycxdf7nrzyxz8lsa6723p7bbrjnbal5863";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dired-preview.html";
+        homepage = "https://elpa.gnu.org/devel/dired-preview.html";
         license = lib.licenses.free;
       };
     }
@@ -2352,7 +2213,6 @@
   disk-usage = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2364,9 +2224,9 @@
         url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar";
         sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/disk-usage.html";
+        homepage = "https://elpa.gnu.org/devel/disk-usage.html";
         license = lib.licenses.free;
       };
     }
@@ -2375,7 +2235,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2387,12 +2246,9 @@
         url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar";
         sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dismal.html";
+        homepage = "https://elpa.gnu.org/devel/dismal.html";
         license = lib.licenses.free;
       };
     }
@@ -2413,7 +2269,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/djvu.html";
+        homepage = "https://elpa.gnu.org/devel/djvu.html";
         license = lib.licenses.free;
       };
     }
@@ -2421,7 +2277,6 @@
   do-at-point = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2433,9 +2288,9 @@
         url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar";
         sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/do-at-point.html";
+        homepage = "https://elpa.gnu.org/devel/do-at-point.html";
         license = lib.licenses.free;
       };
     }
@@ -2443,7 +2298,6 @@
   doc-toc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2455,9 +2309,9 @@
         url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar";
         sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/doc-toc.html";
+        homepage = "https://elpa.gnu.org/devel/doc-toc.html";
         license = lib.licenses.free;
       };
     }
@@ -2478,7 +2332,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/docbook.html";
+        homepage = "https://elpa.gnu.org/devel/docbook.html";
         license = lib.licenses.free;
       };
     }
@@ -2487,24 +2341,20 @@
     {
       comint-mime,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "drepl";
       ename = "drepl";
-      version = "0.3.0.20240603.71909";
+      version = "0.3.0.20240810.74103";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240603.71909.tar";
-        sha256 = "0fjs0k36xm2sy3p0yi2km7pcrjv3f0gsc6qbrh47qimn7x5b9bkh";
+        url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240810.74103.tar";
+        sha256 = "0l1xgw6wh1j6xmiqhf7h5h9wg010dhclpxn6xxb372mqxlnylvld";
       };
-      packageRequires = [
-        comint-mime
-        emacs
-      ];
+      packageRequires = [ comint-mime ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/drepl.html";
+        homepage = "https://elpa.gnu.org/devel/drepl.html";
         license = lib.licenses.free;
       };
     }
@@ -2512,7 +2362,6 @@
   dts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2524,9 +2373,9 @@
         url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar";
         sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dts-mode.html";
+        homepage = "https://elpa.gnu.org/devel/dts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2547,7 +2396,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/easy-escape.html";
+        homepage = "https://elpa.gnu.org/devel/easy-escape.html";
         license = lib.licenses.free;
       };
     }
@@ -2556,7 +2405,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2568,12 +2416,9 @@
         url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar";
         sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/easy-kill.html";
+        homepage = "https://elpa.gnu.org/devel/easy-kill.html";
         license = lib.licenses.free;
       };
     }
@@ -2581,7 +2426,6 @@
   ebdb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -2594,12 +2438,9 @@
         url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar";
         sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ebdb.html";
+        homepage = "https://elpa.gnu.org/devel/ebdb.html";
         license = lib.licenses.free;
       };
     }
@@ -2625,7 +2466,7 @@
         gnorb
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+        homepage = "https://elpa.gnu.org/devel/ebdb-gnorb.html";
         license = lib.licenses.free;
       };
     }
@@ -2651,7 +2492,7 @@
         pyim
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+        homepage = "https://elpa.gnu.org/devel/ebdb-i18n-chn.html";
         license = lib.licenses.free;
       };
     }
@@ -2672,7 +2513,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ediprolog.html";
+        homepage = "https://elpa.gnu.org/devel/ediprolog.html";
         license = lib.licenses.free;
       };
     }
@@ -2680,21 +2521,20 @@
   eev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "eev";
       ename = "eev";
-      version = "20240710.0.20240710.214351";
+      version = "20240811.0.20240811.220128";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eev-20240710.0.20240710.214351.tar";
-        sha256 = "120yka4xv6zqcd7gi6c4qlgydyqv86s15p444jsjiz57zvc5p991";
+        url = "https://elpa.gnu.org/devel/eev-20240811.0.20240811.220128.tar";
+        sha256 = "0smywkzygmbmzv4zj95y6cjj9gjj5ggh4cknscgsrbva2nffrp7v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/eev.html";
+        homepage = "https://elpa.gnu.org/devel/eev.html";
         license = lib.licenses.free;
       };
     }
@@ -2702,21 +2542,20 @@
   ef-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "ef-themes";
       ename = "ef-themes";
-      version = "1.7.0.0.20240605.183445";
+      version = "1.7.0.0.20240819.163406";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240605.183445.tar";
-        sha256 = "09zmi2rsykdjkmj7hdylsqhqfd87i1g2g4v6sizm94s0hmvxa148";
+        url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240819.163406.tar";
+        sha256 = "1shapc9zjw3ca1x4gxwy7pz7ajm0h07nk8xrf4bypc629gzsg107";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ef-themes.html";
+        homepage = "https://elpa.gnu.org/devel/ef-themes.html";
         license = lib.licenses.free;
       };
     }
@@ -2726,7 +2565,6 @@
       compat,
       eldoc,
       elpaBuild,
-      emacs,
       external-completion,
       fetchurl,
       flymake ? null,
@@ -2740,15 +2578,14 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.17.0.20240707.154630";
+      version = "1.17.0.20240817.135350";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240707.154630.tar";
-        sha256 = "0f7lbbsh5y4945j8115ph5i2k9c3r0ipcxhmig9kvba6knrshgin";
+        url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240817.135350.tar";
+        sha256 = "1sk1xgliar7c5glhx8k9r6di7f5xpxx6m0myh8kdsmrsh67198gh";
       };
       packageRequires = [
         compat
         eldoc
-        emacs
         external-completion
         flymake
         jsonrpc
@@ -2758,7 +2595,7 @@
         xref
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/eglot.html";
+        homepage = "https://elpa.gnu.org/devel/eglot.html";
         license = lib.licenses.free;
       };
     }
@@ -2767,7 +2604,6 @@
     {
       cl-print ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       stream,
@@ -2782,11 +2618,10 @@
       };
       packageRequires = [
         cl-print
-        emacs
         stream
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/el-search.html";
+        homepage = "https://elpa.gnu.org/devel/el-search.html";
         license = lib.licenses.free;
       };
     }
@@ -2794,7 +2629,6 @@
   eldoc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2806,9 +2640,9 @@
         url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar";
         sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/eldoc.html";
+        homepage = "https://elpa.gnu.org/devel/eldoc.html";
         license = lib.licenses.free;
       };
     }
@@ -2829,7 +2663,37 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
+        homepage = "https://elpa.gnu.org/devel/electric-spacing.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elisa = callPackage (
+    {
+      async,
+      ellama,
+      elpaBuild,
+      fetchurl,
+      lib,
+      llm,
+      plz,
+    }:
+    elpaBuild {
+      pname = "elisa";
+      ename = "elisa";
+      version = "1.0.4.0.20240721.124701";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/elisa-1.0.4.0.20240721.124701.tar";
+        sha256 = "0p903ljagaza0n2kw2hicvara903mwwjia4587wqwvydrfvhal7a";
+      };
+      packageRequires = [
+        async
+        ellama
+        llm
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/elisa.html";
         license = lib.licenses.free;
       };
     }
@@ -2850,7 +2714,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
+        homepage = "https://elpa.gnu.org/devel/elisp-benchmarks.html";
         license = lib.licenses.free;
       };
     }
@@ -2859,7 +2723,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       llm,
@@ -2868,19 +2731,18 @@
     elpaBuild {
       pname = "ellama";
       ename = "ellama";
-      version = "0.11.9.0.20240710.202758";
+      version = "0.11.13.0.20240721.113845";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ellama-0.11.9.0.20240710.202758.tar";
-        sha256 = "01qfp01lgs84xzzkkky4539bvmakf3xbgr1h57asfsy3j50nsblf";
+        url = "https://elpa.gnu.org/devel/ellama-0.11.13.0.20240721.113845.tar";
+        sha256 = "123gzcxmszx25464d7as8w9c2pv94kpr1br2njf03474vj7fa91m";
       };
       packageRequires = [
         compat
-        emacs
         llm
         spinner
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ellama.html";
+        homepage = "https://elpa.gnu.org/devel/ellama.html";
         license = lib.licenses.free;
       };
     }
@@ -2888,7 +2750,6 @@
   emacs-gc-stats = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2900,9 +2761,9 @@
         url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar";
         sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
+        homepage = "https://elpa.gnu.org/devel/emacs-gc-stats.html";
         license = lib.licenses.free;
       };
     }
@@ -2911,24 +2772,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "embark";
       ename = "embark";
-      version = "1.1.0.20240607.161338";
+      version = "1.1.0.20240724.120153";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-1.1.0.20240607.161338.tar";
-        sha256 = "14ar8sfjrk1q6f2dis2w8qa8nsqla8cz91l4nsssr1mfgs7x517b";
+        url = "https://elpa.gnu.org/devel/embark-1.1.0.20240724.120153.tar";
+        sha256 = "15qbmcx86yb8qk1k89gdrdj09bdaganzd82w23710z5qblmkpn44";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/embark.html";
+        homepage = "https://elpa.gnu.org/devel/embark.html";
         license = lib.licenses.free;
       };
     }
@@ -2938,7 +2795,6 @@
       compat,
       consult,
       elpaBuild,
-      emacs,
       embark,
       fetchurl,
       lib,
@@ -2946,19 +2802,18 @@
     elpaBuild {
       pname = "embark-consult";
       ename = "embark-consult";
-      version = "1.1.0.20240607.161338";
+      version = "1.1.0.20240724.120153";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240607.161338.tar";
-        sha256 = "1m48pddbyxpi7ji9cl0pd4npkl6xj7fdak4raacglbgayg4z9qdb";
+        url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240724.120153.tar";
+        sha256 = "1i17xwlnmimnqzgnm2chghv1jnd026iiz6n94nfgwvw0avs7h5g2";
       };
       packageRequires = [
         compat
         consult
-        emacs
         embark
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/embark-consult.html";
+        homepage = "https://elpa.gnu.org/devel/embark-consult.html";
         license = lib.licenses.free;
       };
     }
@@ -2966,7 +2821,6 @@
   ement = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -2986,7 +2840,6 @@
         sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2";
       };
       packageRequires = [
-        emacs
         map
         persist
         plz
@@ -2996,7 +2849,7 @@
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ement.html";
+        homepage = "https://elpa.gnu.org/devel/ement.html";
         license = lib.licenses.free;
       };
     }
@@ -3024,7 +2877,7 @@
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/emms.html";
+        homepage = "https://elpa.gnu.org/devel/emms.html";
         license = lib.licenses.free;
       };
     }
@@ -3032,7 +2885,6 @@
   engrave-faces = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3044,9 +2896,9 @@
         url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar";
         sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
+        homepage = "https://elpa.gnu.org/devel/engrave-faces.html";
         license = lib.licenses.free;
       };
     }
@@ -3054,7 +2906,6 @@
   enwc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3066,9 +2917,9 @@
         url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar";
         sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/enwc.html";
+        homepage = "https://elpa.gnu.org/devel/enwc.html";
         license = lib.licenses.free;
       };
     }
@@ -3089,7 +2940,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/epoch-view.html";
+        homepage = "https://elpa.gnu.org/devel/epoch-view.html";
         license = lib.licenses.free;
       };
     }
@@ -3098,24 +2949,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "erc";
       ename = "erc";
-      version = "5.6.1snapshot0.20240709.13309";
+      version = "5.6.1snapshot0.20240813.11230";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240709.13309.tar";
-        sha256 = "1ijn2rwl2lpqckps4xxqxsn6385y84xmid83a2cj4fkkgjks7jnv";
+        url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240813.11230.tar";
+        sha256 = "1r2a3n4lfsjmlg7vg816hmxvdzmapp89vym2jh4vwkng1v5bfzq1";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/erc.html";
+        homepage = "https://elpa.gnu.org/devel/erc.html";
         license = lib.licenses.free;
       };
     }
@@ -3124,7 +2971,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -3132,18 +2978,17 @@
     elpaBuild {
       pname = "ergoemacs-mode";
       ename = "ergoemacs-mode";
-      version = "5.16.10.12.0.20240129.80712";
+      version = "5.16.10.12.0.20240809.174605";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar";
-        sha256 = "0jsl7yyhbcg1y20lp50r3i3rcxmxq035mks1kwbsnyqmdikby9s3";
+        url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240809.174605.tar";
+        sha256 = "1pq78fyr26rmg1vg4xhl095yhaxi8pdnhx0hjcwv5gvxxd462ggq";
       };
       packageRequires = [
         cl-lib
-        emacs
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
+        homepage = "https://elpa.gnu.org/devel/ergoemacs-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3151,21 +2996,20 @@
   ess = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "ess";
       ename = "ess";
-      version = "24.1.1.0.20240516.81354";
+      version = "24.1.1.0.20240819.131103";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar";
-        sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj";
+        url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240819.131103.tar";
+        sha256 = "0kh6xbnw3w21dxz7d32cfckfrii104bjh05gi94agqqb2npkhgkm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ess.html";
+        homepage = "https://elpa.gnu.org/devel/ess.html";
         license = lib.licenses.free;
       };
     }
@@ -3174,7 +3018,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       fsm,
       lib,
@@ -3193,7 +3036,6 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         fsm
         nadvice
         soap-client
@@ -3201,7 +3043,7 @@
         url-http-oauth
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/excorporate.html";
+        homepage = "https://elpa.gnu.org/devel/excorporate.html";
         license = lib.licenses.free;
       };
     }
@@ -3209,7 +3051,6 @@
   expand-region = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3221,9 +3062,9 @@
         url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar";
         sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/expand-region.html";
+        homepage = "https://elpa.gnu.org/devel/expand-region.html";
         license = lib.licenses.free;
       };
     }
@@ -3231,7 +3072,6 @@
   expreg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3243,9 +3083,9 @@
         url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar";
         sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/expreg.html";
+        homepage = "https://elpa.gnu.org/devel/expreg.html";
         license = lib.licenses.free;
       };
     }
@@ -3259,14 +3099,14 @@
     elpaBuild {
       pname = "external-completion";
       ename = "external-completion";
-      version = "0.1.0.20240616.203826";
+      version = "0.1.0.20240725.13518";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240616.203826.tar";
-        sha256 = "1zg7v08wbk8ma5k2zj0jrchf2wz483bklgi0rshjividniy99877";
+        url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240725.13518.tar";
+        sha256 = "0xhpmayv23iiysi5smk0sq9r8rp3vr5sq12p6584128pss75viqh";
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/external-completion.html";
+        homepage = "https://elpa.gnu.org/devel/external-completion.html";
         license = lib.licenses.free;
       };
     }
@@ -3275,7 +3115,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xelb,
@@ -3283,18 +3122,17 @@
     elpaBuild {
       pname = "exwm";
       ename = "exwm";
-      version = "0.31.0.20240708.212458";
+      version = "0.31.0.20240818.191337";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240708.212458.tar";
-        sha256 = "0cb9y753d7gj40wfwg4my339kiffdydch1bmhdqw1haf3a21srar";
+        url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240818.191337.tar";
+        sha256 = "1mx4a3pvymja31g0b97h90qgqj11w5gddldyk4xragxq71avnf18";
       };
       packageRequires = [
         compat
-        emacs
         xelb
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/exwm.html";
+        homepage = "https://elpa.gnu.org/devel/exwm.html";
         license = lib.licenses.free;
       };
     }
@@ -3316,7 +3154,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
+        homepage = "https://elpa.gnu.org/devel/f90-interface-browser.html";
         license = lib.licenses.free;
       };
     }
@@ -3324,7 +3162,6 @@
   face-shift = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3336,9 +3173,9 @@
         url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar";
         sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/face-shift.html";
+        homepage = "https://elpa.gnu.org/devel/face-shift.html";
         license = lib.licenses.free;
       };
     }
@@ -3347,7 +3184,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3359,12 +3195,9 @@
         url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar";
         sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/filechooser.html";
+        homepage = "https://elpa.gnu.org/devel/filechooser.html";
         license = lib.licenses.free;
       };
     }
@@ -3372,7 +3205,6 @@
   filladapt = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3384,9 +3216,9 @@
         url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar";
         sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/filladapt.html";
+        homepage = "https://elpa.gnu.org/devel/filladapt.html";
         license = lib.licenses.free;
       };
     }
@@ -3394,7 +3226,6 @@
   firefox-javascript-repl = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3406,9 +3237,9 @@
         url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar";
         sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
+        homepage = "https://elpa.gnu.org/devel/firefox-javascript-repl.html";
         license = lib.licenses.free;
       };
     }
@@ -3417,7 +3248,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3429,12 +3259,9 @@
         url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar";
         sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flylisp.html";
+        homepage = "https://elpa.gnu.org/devel/flylisp.html";
         license = lib.licenses.free;
       };
     }
@@ -3443,7 +3270,6 @@
     {
       eldoc,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -3458,11 +3284,10 @@
       };
       packageRequires = [
         eldoc
-        emacs
         project
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake.html";
+        homepage = "https://elpa.gnu.org/devel/flymake.html";
         license = lib.licenses.free;
       };
     }
@@ -3471,7 +3296,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3483,12 +3307,9 @@
         url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar";
         sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
+        homepage = "https://elpa.gnu.org/devel/flymake-codespell.html";
         license = lib.licenses.free;
       };
     }
@@ -3496,7 +3317,6 @@
   flymake-proselint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3508,9 +3328,9 @@
         url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar";
         sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
+        homepage = "https://elpa.gnu.org/devel/flymake-proselint.html";
         license = lib.licenses.free;
       };
     }
@@ -3518,21 +3338,20 @@
   fontaine = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "fontaine";
       ename = "fontaine";
-      version = "2.0.0.0.20240426.105847";
+      version = "2.0.0.0.20240819.122228";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240426.105847.tar";
-        sha256 = "0h7l5agnzpq8k14c3lr6dkpsh2id9akiqa9z3x88xn440rjbld51";
+        url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240819.122228.tar";
+        sha256 = "17l62k153g6qd79kmpy4rw2y05dd442vm6cyslxw3n8bkgfma6xi";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/fontaine.html";
+        homepage = "https://elpa.gnu.org/devel/fontaine.html";
         license = lib.licenses.free;
       };
     }
@@ -3553,7 +3372,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
+        homepage = "https://elpa.gnu.org/devel/frame-tabs.html";
         license = lib.licenses.free;
       };
     }
@@ -3562,7 +3381,6 @@
     {
       avy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       posframe,
@@ -3577,11 +3395,10 @@
       };
       packageRequires = [
         avy
-        emacs
         posframe
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/frog-menu.html";
+        homepage = "https://elpa.gnu.org/devel/frog-menu.html";
         license = lib.licenses.free;
       };
     }
@@ -3590,7 +3407,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3602,12 +3418,9 @@
         url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar";
         sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/fsm.html";
+        homepage = "https://elpa.gnu.org/devel/fsm.html";
         license = lib.licenses.free;
       };
     }
@@ -3615,7 +3428,6 @@
   ftable = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3627,9 +3439,9 @@
         url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar";
         sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ftable.html";
+        homepage = "https://elpa.gnu.org/devel/ftable.html";
         license = lib.licenses.free;
       };
     }
@@ -3637,7 +3449,6 @@
   gcmh = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3649,9 +3460,9 @@
         url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar";
         sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gcmh.html";
+        homepage = "https://elpa.gnu.org/devel/gcmh.html";
         license = lib.licenses.free;
       };
     }
@@ -3659,7 +3470,6 @@
   ggtags = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3671,9 +3481,9 @@
         url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar";
         sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ggtags.html";
+        homepage = "https://elpa.gnu.org/devel/ggtags.html";
         license = lib.licenses.free;
       };
     }
@@ -3682,7 +3492,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3694,12 +3503,9 @@
         url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar";
         sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gited.html";
+        homepage = "https://elpa.gnu.org/devel/gited.html";
         license = lib.licenses.free;
       };
     }
@@ -3721,7 +3527,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gle-mode.html";
+        homepage = "https://elpa.gnu.org/devel/gle-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3729,7 +3535,6 @@
   gnat-compiler = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       wisi,
@@ -3742,12 +3547,9 @@
         url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar";
         sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0";
       };
-      packageRequires = [
-        emacs
-        wisi
-      ];
+      packageRequires = [ wisi ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
+        homepage = "https://elpa.gnu.org/devel/gnat-compiler.html";
         license = lib.licenses.free;
       };
     }
@@ -3768,7 +3570,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
+        homepage = "https://elpa.gnu.org/devel/gnome-c-style.html";
         license = lib.licenses.free;
       };
     }
@@ -3790,7 +3592,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnorb.html";
+        homepage = "https://elpa.gnu.org/devel/gnorb.html";
         license = lib.licenses.free;
       };
     }
@@ -3798,7 +3600,6 @@
   gnu-elpa = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3810,9 +3611,9 @@
         url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar";
         sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
+        homepage = "https://elpa.gnu.org/devel/gnu-elpa.html";
         license = lib.licenses.free;
       };
     }
@@ -3833,7 +3634,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
+        homepage = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update.html";
         license = lib.licenses.free;
       };
     }
@@ -3861,7 +3662,7 @@
         xpm
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnugo.html";
+        homepage = "https://elpa.gnu.org/devel/gnugo.html";
         license = lib.licenses.free;
       };
     }
@@ -3882,7 +3683,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
+        homepage = "https://elpa.gnu.org/devel/gnus-mock.html";
         license = lib.licenses.free;
       };
     }
@@ -3890,7 +3691,6 @@
   gpastel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3902,9 +3702,9 @@
         url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar";
         sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gpastel.html";
+        homepage = "https://elpa.gnu.org/devel/gpastel.html";
         license = lib.licenses.free;
       };
     }
@@ -3912,7 +3712,6 @@
   gpr-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -3927,12 +3726,11 @@
         sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         wisi
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
+        homepage = "https://elpa.gnu.org/devel/gpr-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3940,7 +3738,6 @@
   gpr-query = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       gnat-compiler,
       lib,
@@ -3955,12 +3752,11 @@
         sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai";
       };
       packageRequires = [
-        emacs
         gnat-compiler
         wisi
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gpr-query.html";
+        homepage = "https://elpa.gnu.org/devel/gpr-query.html";
         license = lib.licenses.free;
       };
     }
@@ -3968,7 +3764,6 @@
   graphql = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3980,9 +3775,9 @@
         url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar";
         sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/graphql.html";
+        homepage = "https://elpa.gnu.org/devel/graphql.html";
         license = lib.licenses.free;
       };
     }
@@ -3991,7 +3786,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -3999,18 +3793,17 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.11.13.0.20240712.232251";
+      version = "0.11.15.0.20240806.162404";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/greader-0.11.13.0.20240712.232251.tar";
-        sha256 = "08gajcssq4h84r61sh1hpg86dklrh86slvd3q5b65nlwps5mslh6";
+        url = "https://elpa.gnu.org/devel/greader-0.11.15.0.20240806.162404.tar";
+        sha256 = "11mh3cii9713bdl00kcxf2jhk04k9yi4x2bpazymz1iwfg4pk1hq";
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/greader.html";
+        homepage = "https://elpa.gnu.org/devel/greader.html";
         license = lib.licenses.free;
       };
     }
@@ -4031,7 +3824,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/greenbar.html";
+        homepage = "https://elpa.gnu.org/devel/greenbar.html";
         license = lib.licenses.free;
       };
     }
@@ -4039,21 +3832,20 @@
   gtags-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.8.0.20240712.131914";
+      version = "1.8.1.0.20240808.153728";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gtags-mode-1.8.0.20240712.131914.tar";
-        sha256 = "1rzmgzirxxrhm8f3vbwf76nrrzd1svf4ddy20h0khp7ycldhd3hp";
+        url = "https://elpa.gnu.org/devel/gtags-mode-1.8.1.0.20240808.153728.tar";
+        sha256 = "1bfblsay8qsglhh4iqhv9wl8s445piwykyx4lz7cbn74wpn2prin";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
+        homepage = "https://elpa.gnu.org/devel/gtags-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4062,7 +3854,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -4077,11 +3868,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/guess-language.html";
+        homepage = "https://elpa.gnu.org/devel/guess-language.html";
         license = lib.licenses.free;
       };
     }
@@ -4089,7 +3879,6 @@
   hcel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4101,9 +3890,9 @@
         url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar";
         sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hcel.html";
+        homepage = "https://elpa.gnu.org/devel/hcel.html";
         license = lib.licenses.free;
       };
     }
@@ -4124,7 +3913,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/heap.html";
+        homepage = "https://elpa.gnu.org/devel/heap.html";
         license = lib.licenses.free;
       };
     }
@@ -4132,7 +3921,6 @@
   hiddenquote = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4144,9 +3932,9 @@
         url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar";
         sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
+        homepage = "https://elpa.gnu.org/devel/hiddenquote.html";
         license = lib.licenses.free;
       };
     }
@@ -4167,7 +3955,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
+        homepage = "https://elpa.gnu.org/devel/highlight-escape-sequences.html";
         license = lib.licenses.free;
       };
     }
@@ -4175,7 +3963,6 @@
   hook-helpers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4187,9 +3974,9 @@
         url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar";
         sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
+        homepage = "https://elpa.gnu.org/devel/hook-helpers.html";
         license = lib.licenses.free;
       };
     }
@@ -4210,7 +3997,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/html5-schema.html";
+        homepage = "https://elpa.gnu.org/devel/html5-schema.html";
         license = lib.licenses.free;
       };
     }
@@ -4218,7 +4005,6 @@
   hydra = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       lv,
@@ -4231,12 +4017,9 @@
         url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar";
         sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn";
       };
-      packageRequires = [
-        emacs
-        lv
-      ];
+      packageRequires = [ lv ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hydra.html";
+        homepage = "https://elpa.gnu.org/devel/hydra.html";
         license = lib.licenses.free;
       };
     }
@@ -4244,21 +4027,20 @@
   hyperbole = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "hyperbole";
       ename = "hyperbole";
-      version = "9.0.2pre0.20240707.235928";
+      version = "9.0.2pre0.20240819.10443";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240707.235928.tar";
-        sha256 = "1rrj0zmc5wfrdzzwpihpxrw6xawswnkszb1753p5sg3sxmj5h2kw";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240819.10443.tar";
+        sha256 = "0j3rz9hpqbv8757y3cbg5yx1kf56f5wkdvncch5pmg774v4lk5cl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hyperbole.html";
+        homepage = "https://elpa.gnu.org/devel/hyperbole.html";
         license = lib.licenses.free;
       };
     }
@@ -4279,7 +4061,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/idlwave.html";
+        homepage = "https://elpa.gnu.org/devel/idlwave.html";
         license = lib.licenses.free;
       };
     }
@@ -4293,14 +4075,14 @@
     elpaBuild {
       pname = "ilist";
       ename = "ilist";
-      version = "0.3.0.20240219.40214";
+      version = "0.4.0.20240807.41050";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ilist-0.3.0.20240219.40214.tar";
-        sha256 = "0nxwvnpnyccx384f8ik0z8a74fksvwrmpdzk4wia1x6wdwwvblvs";
+        url = "https://elpa.gnu.org/devel/ilist-0.4.0.20240807.41050.tar";
+        sha256 = "1j9ihvkbribvach3z23qw1fcf03gm9ijhmh6mrcvagcy7gllz02n";
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ilist.html";
+        homepage = "https://elpa.gnu.org/devel/ilist.html";
         license = lib.licenses.free;
       };
     }
@@ -4308,21 +4090,20 @@
   inspector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "inspector";
       ename = "inspector";
-      version = "0.36.0.20230925.194622";
+      version = "0.37.0.20240731.203714";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar";
-        sha256 = "1g989zgbhila0f4yca70iwgnqr0zcainji9mps0ywrmlmn270gdv";
+        url = "https://elpa.gnu.org/devel/inspector-0.37.0.20240731.203714.tar";
+        sha256 = "0w6hqi2hv7vps8l5mgzvgxn53wxnyc24fhrmvxldajw8q8isi122";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inspector.html";
+        homepage = "https://elpa.gnu.org/devel/inspector.html";
         license = lib.licenses.free;
       };
     }
@@ -4331,7 +4112,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4343,12 +4123,9 @@
         url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar";
         sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ioccur.html";
+        homepage = "https://elpa.gnu.org/devel/ioccur.html";
         license = lib.licenses.free;
       };
     }
@@ -4356,7 +4133,6 @@
   isearch-mb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4368,9 +4144,9 @@
         url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar";
         sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
+        homepage = "https://elpa.gnu.org/devel/isearch-mb.html";
         license = lib.licenses.free;
       };
     }
@@ -4378,7 +4154,6 @@
   iterators = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4390,9 +4165,9 @@
         url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar";
         sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/iterators.html";
+        homepage = "https://elpa.gnu.org/devel/iterators.html";
         license = lib.licenses.free;
       };
     }
@@ -4400,7 +4175,6 @@
   ivy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4412,9 +4186,9 @@
         url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar";
         sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ivy.html";
+        homepage = "https://elpa.gnu.org/devel/ivy.html";
         license = lib.licenses.free;
       };
     }
@@ -4423,7 +4197,6 @@
     {
       avy,
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4438,11 +4211,10 @@
       };
       packageRequires = [
         avy
-        emacs
         ivy
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
+        homepage = "https://elpa.gnu.org/devel/ivy-avy.html";
         license = lib.licenses.free;
       };
     }
@@ -4450,7 +4222,6 @@
   ivy-explorer = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4463,12 +4234,9 @@
         url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar";
         sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z";
       };
-      packageRequires = [
-        emacs
-        ivy
-      ];
+      packageRequires = [ ivy ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
+        homepage = "https://elpa.gnu.org/devel/ivy-explorer.html";
         license = lib.licenses.free;
       };
     }
@@ -4476,7 +4244,6 @@
   ivy-hydra = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       hydra,
       ivy,
@@ -4491,12 +4258,11 @@
         sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x";
       };
       packageRequires = [
-        emacs
         hydra
         ivy
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
+        homepage = "https://elpa.gnu.org/devel/ivy-hydra.html";
         license = lib.licenses.free;
       };
     }
@@ -4504,7 +4270,6 @@
   ivy-posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -4519,12 +4284,11 @@
         sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69";
       };
       packageRequires = [
-        emacs
         ivy
         posframe
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
+        homepage = "https://elpa.gnu.org/devel/ivy-posframe.html";
         license = lib.licenses.free;
       };
     }
@@ -4532,7 +4296,6 @@
   jami-bot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4544,9 +4307,9 @@
         url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar";
         sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jami-bot.html";
+        homepage = "https://elpa.gnu.org/devel/jami-bot.html";
         license = lib.licenses.free;
       };
     }
@@ -4554,7 +4317,6 @@
   jarchive = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4566,9 +4328,9 @@
         url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar";
         sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jarchive.html";
+        homepage = "https://elpa.gnu.org/devel/jarchive.html";
         license = lib.licenses.free;
       };
     }
@@ -4589,7 +4351,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/javaimp.html";
+        homepage = "https://elpa.gnu.org/devel/javaimp.html";
         license = lib.licenses.free;
       };
     }
@@ -4611,7 +4373,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
+        homepage = "https://elpa.gnu.org/devel/jgraph-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4620,24 +4382,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "jinx";
       ename = "jinx";
-      version = "1.9.0.20240708.212221";
+      version = "1.10.0.20240724.91709";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jinx-1.9.0.20240708.212221.tar";
-        sha256 = "10lp9pnlxaxr1rblkg3996m6bvhdkqhc4my8gxbswxsv9djaw621";
+        url = "https://elpa.gnu.org/devel/jinx-1.10.0.20240724.91709.tar";
+        sha256 = "1pfx68hcd0gfs78kq2xwr34cq6p1fm6ab4kmmhalld87jkq11ss1";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jinx.html";
+        homepage = "https://elpa.gnu.org/devel/jinx.html";
         license = lib.licenses.free;
       };
     }
@@ -4646,24 +4404,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "jit-spell";
       ename = "jit-spell";
-      version = "0.4.0.20240604.141707";
+      version = "0.4.0.20240810.110215";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240604.141707.tar";
-        sha256 = "0qz81zrqhdymir9kbmkyavb591abv2j5iz1in2y0v96hpilxfdw6";
+        url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240810.110215.tar";
+        sha256 = "0k4icsk8wdshdza9mgdlfyg5ybnhkzdwjjkjq4s2g6d5h0ai1xzl";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jit-spell.html";
+        homepage = "https://elpa.gnu.org/devel/jit-spell.html";
         license = lib.licenses.free;
       };
     }
@@ -4672,7 +4426,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4684,12 +4437,9 @@
         url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar";
         sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/js2-mode.html";
+        homepage = "https://elpa.gnu.org/devel/js2-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4697,7 +4447,6 @@
   json-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4709,9 +4458,9 @@
         url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar";
         sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/json-mode.html";
+        homepage = "https://elpa.gnu.org/devel/json-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4719,21 +4468,20 @@
   jsonrpc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "jsonrpc";
       ename = "jsonrpc";
-      version = "1.0.25.0.20240616.203826";
+      version = "1.0.25.0.20240720.4208";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240616.203826.tar";
-        sha256 = "0jkhhds21vw4i03ya8lflkkh0yaqxqhj49zdzb1l7wgsb499hhya";
+        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240720.4208.tar";
+        sha256 = "0r5aw8w5qxf2kqxh4x4q1lyhci2cbcxf31shshagf16zpcm71qz3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
+        homepage = "https://elpa.gnu.org/devel/jsonrpc.html";
         license = lib.licenses.free;
       };
     }
@@ -4754,7 +4502,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jumpc.html";
+        homepage = "https://elpa.gnu.org/devel/jumpc.html";
         license = lib.licenses.free;
       };
     }
@@ -4762,7 +4510,6 @@
   kind-icon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg-lib,
@@ -4770,17 +4517,14 @@
     elpaBuild {
       pname = "kind-icon";
       ename = "kind-icon";
-      version = "0.2.2.0.20240321.120430";
+      version = "0.2.2.0.20240717.130344";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar";
-        sha256 = "1cwp2cc2qy36s4zz6arfr760a9x77h0cj42q6a0s32l56sddh7ws";
+        url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240717.130344.tar";
+        sha256 = "1rp4fx1ygwaz4sd26xkp3iz008dwg430dx7xzdba0prycdc9kh7f";
       };
-      packageRequires = [
-        emacs
-        svg-lib
-      ];
+      packageRequires = [ svg-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/kind-icon.html";
+        homepage = "https://elpa.gnu.org/devel/kind-icon.html";
         license = lib.licenses.free;
       };
     }
@@ -4788,7 +4532,6 @@
   kiwix = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       request,
@@ -4801,12 +4544,9 @@
         url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar";
         sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna";
       };
-      packageRequires = [
-        emacs
-        request
-      ];
+      packageRequires = [ request ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/kiwix.html";
+        homepage = "https://elpa.gnu.org/devel/kiwix.html";
         license = lib.licenses.free;
       };
     }
@@ -4814,7 +4554,6 @@
   kmb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4826,9 +4565,30 @@
         url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar";
         sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/kmb.html";
+        homepage = "https://elpa.gnu.org/devel/kmb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kubed = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kubed";
+      ename = "kubed";
+      version = "0.3.2.0.20240815.172320";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/kubed-0.3.2.0.20240815.172320.tar";
+        sha256 = "0rzf1vyzmxm36w1ljxc09adqrp2w8bn0bn5gk5k0z4vy3r5yysj6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/kubed.html";
         license = lib.licenses.free;
       };
     }
@@ -4849,7 +4609,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/landmark.html";
+        homepage = "https://elpa.gnu.org/devel/landmark.html";
         license = lib.licenses.free;
       };
     }
@@ -4858,7 +4618,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       transient,
@@ -4873,11 +4632,10 @@
       };
       packageRequires = [
         auctex
-        emacs
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
+        homepage = "https://elpa.gnu.org/devel/latex-table-wizard.html";
         license = lib.licenses.free;
       };
     }
@@ -4885,7 +4643,6 @@
   leaf = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4897,9 +4654,9 @@
         url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar";
         sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/leaf.html";
+        homepage = "https://elpa.gnu.org/devel/leaf.html";
         license = lib.licenses.free;
       };
     }
@@ -4908,7 +4665,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       m-buffer,
@@ -4923,11 +4679,10 @@
       };
       packageRequires = [
         dash
-        emacs
         m-buffer
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lentic.html";
+        homepage = "https://elpa.gnu.org/devel/lentic.html";
         license = lib.licenses.free;
       };
     }
@@ -4953,7 +4708,7 @@
         web-server
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lentic-server.html";
+        homepage = "https://elpa.gnu.org/devel/lentic-server.html";
         license = lib.licenses.free;
       };
     }
@@ -4961,7 +4716,6 @@
   let-alist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4973,9 +4727,9 @@
         url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar";
         sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/let-alist.html";
+        homepage = "https://elpa.gnu.org/devel/let-alist.html";
         license = lib.licenses.free;
       };
     }
@@ -4996,7 +4750,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lex.html";
+        homepage = "https://elpa.gnu.org/devel/lex.html";
         license = lib.licenses.free;
       };
     }
@@ -5004,21 +4758,20 @@
   lin = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "lin";
       ename = "lin";
-      version = "1.0.0.0.20240117.24849";
+      version = "1.1.0.0.20240805.61912";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar";
-        sha256 = "1yjqq1zzv0a7ydhjjh7ycgwd8fzlkvza3m8dm9wa45lqljf5ysim";
+        url = "https://elpa.gnu.org/devel/lin-1.1.0.0.20240805.61912.tar";
+        sha256 = "1r7l28h60cv3ba361rq1r6ksf8401q147j4n76q6d51w4v0gvjfm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lin.html";
+        homepage = "https://elpa.gnu.org/devel/lin.html";
         license = lib.licenses.free;
       };
     }
@@ -5026,7 +4779,6 @@
   listen = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -5037,20 +4789,19 @@
     elpaBuild {
       pname = "listen";
       ename = "listen";
-      version = "0.10pre0.20240419.165028";
+      version = "0.10pre0.20240818.210429";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240419.165028.tar";
-        sha256 = "1bmjnigb4ly14i3n7wgd0jx4k0g06cf2n3dapfdwlv80bi57x20a";
+        url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240818.210429.tar";
+        sha256 = "1cww04hcna6biv9928xrfwh6vxhp8n66z3ws1xckg08wj18apnwv";
       };
       packageRequires = [
-        emacs
         persist
         taxy
         taxy-magit-section
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/listen.html";
+        homepage = "https://elpa.gnu.org/devel/listen.html";
         license = lib.licenses.free;
       };
     }
@@ -5058,7 +4809,6 @@
   literate-scratch = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5070,9 +4820,9 @@
         url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar";
         sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
+        homepage = "https://elpa.gnu.org/devel/literate-scratch.html";
         license = lib.licenses.free;
       };
     }
@@ -5080,7 +4830,6 @@
   llm = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -5088,17 +4837,14 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.16.1.0.20240706.201250";
+      version = "0.17.1.0.20240817.163032";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.16.1.0.20240706.201250.tar";
-        sha256 = "0kx90fqdsp762774f07jb4m9vr4lnimls45g4a16rq7xy783cd57";
+        url = "https://elpa.gnu.org/devel/llm-0.17.1.0.20240817.163032.tar";
+        sha256 = "13c6fr5xjiynya6dx39bp5zs9q0csq98a92nb8mg4bdx6lkldqaa";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/llm.html";
+        homepage = "https://elpa.gnu.org/devel/llm.html";
         license = lib.licenses.free;
       };
     }
@@ -5107,7 +4853,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5119,12 +4864,9 @@
         url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar";
         sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lmc.html";
+        homepage = "https://elpa.gnu.org/devel/lmc.html";
         license = lib.licenses.free;
       };
     }
@@ -5146,7 +4888,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/load-dir.html";
+        homepage = "https://elpa.gnu.org/devel/load-dir.html";
         license = lib.licenses.free;
       };
     }
@@ -5167,7 +4909,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/load-relative.html";
+        homepage = "https://elpa.gnu.org/devel/load-relative.html";
         license = lib.licenses.free;
       };
     }
@@ -5188,7 +4930,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/loc-changes.html";
+        homepage = "https://elpa.gnu.org/devel/loc-changes.html";
         license = lib.licenses.free;
       };
     }
@@ -5196,7 +4938,6 @@
   loccur = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5208,9 +4949,9 @@
         url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar";
         sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/loccur.html";
+        homepage = "https://elpa.gnu.org/devel/loccur.html";
         license = lib.licenses.free;
       };
     }
@@ -5218,7 +4959,6 @@
   logos = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5230,9 +4970,9 @@
         url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar";
         sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/logos.html";
+        homepage = "https://elpa.gnu.org/devel/logos.html";
         license = lib.licenses.free;
       };
     }
@@ -5240,7 +4980,6 @@
   luwak = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5252,9 +4991,9 @@
         url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar";
         sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/luwak.html";
+        homepage = "https://elpa.gnu.org/devel/luwak.html";
         license = lib.licenses.free;
       };
     }
@@ -5275,7 +5014,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lv.html";
+        homepage = "https://elpa.gnu.org/devel/lv.html";
         license = lib.licenses.free;
       };
     }
@@ -5297,7 +5036,7 @@
       };
       packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/m-buffer.html";
+        homepage = "https://elpa.gnu.org/devel/m-buffer.html";
         license = lib.licenses.free;
       };
     }
@@ -5305,7 +5044,6 @@
   map = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5317,9 +5055,9 @@
         url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar";
         sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/map.html";
+        homepage = "https://elpa.gnu.org/devel/map.html";
         license = lib.licenses.free;
       };
     }
@@ -5328,24 +5066,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "marginalia";
       ename = "marginalia";
-      version = "1.6.0.20240710.95347";
+      version = "1.7.0.20240818.101722";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240710.95347.tar";
-        sha256 = "1943srwzm6w4ixcb48d968pbf4hs3y3rwcmcnryh8az2q3j6sqgm";
+        url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20240818.101722.tar";
+        sha256 = "1pvr1sr97hbibbpypvp82z85l0g4pmr3mm0qqynv5g5rfb51k53k";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/marginalia.html";
+        homepage = "https://elpa.gnu.org/devel/marginalia.html";
         license = lib.licenses.free;
       };
     }
@@ -5366,7 +5100,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/markchars.html";
+        homepage = "https://elpa.gnu.org/devel/markchars.html";
         license = lib.licenses.free;
       };
     }
@@ -5387,7 +5121,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
+        homepage = "https://elpa.gnu.org/devel/math-symbol-lists.html";
         license = lib.licenses.free;
       };
     }
@@ -5395,7 +5129,6 @@
   mct = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5407,9 +5140,9 @@
         url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar";
         sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mct.html";
+        homepage = "https://elpa.gnu.org/devel/mct.html";
         license = lib.licenses.free;
       };
     }
@@ -5430,7 +5163,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/memory-usage.html";
+        homepage = "https://elpa.gnu.org/devel/memory-usage.html";
         license = lib.licenses.free;
       };
     }
@@ -5452,7 +5185,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/metar.html";
+        homepage = "https://elpa.gnu.org/devel/metar.html";
         license = lib.licenses.free;
       };
     }
@@ -5460,7 +5193,6 @@
   midi-kbd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5472,9 +5204,9 @@
         url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar";
         sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
+        homepage = "https://elpa.gnu.org/devel/midi-kbd.html";
         license = lib.licenses.free;
       };
     }
@@ -5483,7 +5215,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5495,12 +5226,9 @@
         url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar";
         sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mines.html";
+        homepage = "https://elpa.gnu.org/devel/mines.html";
         license = lib.licenses.free;
       };
     }
@@ -5508,7 +5236,6 @@
   minibuffer-header = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5520,9 +5247,9 @@
         url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar";
         sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
+        homepage = "https://elpa.gnu.org/devel/minibuffer-header.html";
         license = lib.licenses.free;
       };
     }
@@ -5543,7 +5270,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
+        homepage = "https://elpa.gnu.org/devel/minibuffer-line.html";
         license = lib.licenses.free;
       };
     }
@@ -5564,7 +5291,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/minimap.html";
+        homepage = "https://elpa.gnu.org/devel/minimap.html";
         license = lib.licenses.free;
       };
     }
@@ -5573,7 +5300,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5585,12 +5311,9 @@
         url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar";
         sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
+        homepage = "https://elpa.gnu.org/devel/mmm-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5598,21 +5321,20 @@
   modus-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "modus-themes";
       ename = "modus-themes";
-      version = "4.4.0.0.20240709.63840";
+      version = "4.4.0.0.20240811.50238";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240709.63840.tar";
-        sha256 = "19yys9lkfsrcbib4rd0ph8d1a3698bih0ghihpb7i1mxy2x0dxwj";
+        url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240811.50238.tar";
+        sha256 = "1bmjhjgj44h4g7fg1m937s5l3rf565kczi3jmm4yc7hhh50k1had";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+        homepage = "https://elpa.gnu.org/devel/modus-themes.html";
         license = lib.licenses.free;
       };
     }
@@ -5620,7 +5342,6 @@
   mpdired = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5632,9 +5353,9 @@
         url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar";
         sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mpdired.html";
+        homepage = "https://elpa.gnu.org/devel/mpdired.html";
         license = lib.licenses.free;
       };
     }
@@ -5655,7 +5376,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/multi-mode.html";
+        homepage = "https://elpa.gnu.org/devel/multi-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5677,7 +5398,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/multishell.html";
+        homepage = "https://elpa.gnu.org/devel/multishell.html";
         license = lib.licenses.free;
       };
     }
@@ -5698,7 +5419,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/muse.html";
+        homepage = "https://elpa.gnu.org/devel/muse.html";
         license = lib.licenses.free;
       };
     }
@@ -5706,7 +5427,6 @@
   myers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5718,9 +5438,9 @@
         url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar";
         sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/myers.html";
+        homepage = "https://elpa.gnu.org/devel/myers.html";
         license = lib.licenses.free;
       };
     }
@@ -5741,7 +5461,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nadvice.html";
+        homepage = "https://elpa.gnu.org/devel/nadvice.html";
         license = lib.licenses.free;
       };
     }
@@ -5749,7 +5469,6 @@
   nameless = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5761,9 +5480,9 @@
         url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar";
         sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nameless.html";
+        homepage = "https://elpa.gnu.org/devel/nameless.html";
         license = lib.licenses.free;
       };
     }
@@ -5772,7 +5491,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -5787,11 +5505,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/names.html";
+        homepage = "https://elpa.gnu.org/devel/names.html";
         license = lib.licenses.free;
       };
     }
@@ -5799,7 +5516,6 @@
   nano-agenda = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5811,9 +5527,9 @@
         url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar";
         sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
+        homepage = "https://elpa.gnu.org/devel/nano-agenda.html";
         license = lib.licenses.free;
       };
     }
@@ -5821,7 +5537,6 @@
   nano-modeline = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5833,9 +5548,9 @@
         url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar";
         sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
+        homepage = "https://elpa.gnu.org/devel/nano-modeline.html";
         license = lib.licenses.free;
       };
     }
@@ -5843,7 +5558,6 @@
   nano-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5855,9 +5569,9 @@
         url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar";
         sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nano-theme.html";
+        homepage = "https://elpa.gnu.org/devel/nano-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -5865,7 +5579,6 @@
   nftables-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5877,9 +5590,9 @@
         url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar";
         sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
+        homepage = "https://elpa.gnu.org/devel/nftables-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5887,7 +5600,6 @@
   nhexl-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5899,9 +5611,9 @@
         url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar";
         sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
+        homepage = "https://elpa.gnu.org/devel/nhexl-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5922,7 +5634,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nlinum.html";
+        homepage = "https://elpa.gnu.org/devel/nlinum.html";
         license = lib.licenses.free;
       };
     }
@@ -5943,7 +5655,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/notes-mode.html";
+        homepage = "https://elpa.gnu.org/devel/notes-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5951,7 +5663,6 @@
   notmuch-indicator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5963,9 +5674,9 @@
         url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar";
         sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
+        homepage = "https://elpa.gnu.org/devel/notmuch-indicator.html";
         license = lib.licenses.free;
       };
     }
@@ -5986,7 +5697,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ntlm.html";
+        homepage = "https://elpa.gnu.org/devel/ntlm.html";
         license = lib.licenses.free;
       };
     }
@@ -6007,7 +5718,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/num3-mode.html";
+        homepage = "https://elpa.gnu.org/devel/num3-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -6033,7 +5744,7 @@
         nadvice
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/oauth2.html";
+        homepage = "https://elpa.gnu.org/devel/oauth2.html";
         license = lib.licenses.free;
       };
     }
@@ -6054,7 +5765,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
+        homepage = "https://elpa.gnu.org/devel/ob-asymptote.html";
         license = lib.licenses.free;
       };
     }
@@ -6075,7 +5786,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
+        homepage = "https://elpa.gnu.org/devel/ob-haxe.html";
         license = lib.licenses.free;
       };
     }
@@ -6084,7 +5795,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6096,12 +5806,9 @@
         url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar";
         sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/objed.html";
+        homepage = "https://elpa.gnu.org/devel/objed.html";
         license = lib.licenses.free;
       };
     }
@@ -6122,7 +5829,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/omn-mode.html";
+        homepage = "https://elpa.gnu.org/devel/omn-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -6144,7 +5851,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/on-screen.html";
+        homepage = "https://elpa.gnu.org/devel/on-screen.html";
         license = lib.licenses.free;
       };
     }
@@ -6152,43 +5859,42 @@
   openpgp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "openpgp";
       ename = "openpgp";
-      version = "1.0.1.0.20230325.141904";
+      version = "1.0.2.0.20240726.81226";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar";
-        sha256 = "012svyzmr4rwi2a1v99klyjnwrrfqz8jd053f9xjfm44payfafkg";
+        url = "https://elpa.gnu.org/devel/openpgp-1.0.2.0.20240726.81226.tar";
+        sha256 = "0yxvzc0jbkgx9hvd57cicmw38bm178w0ahqqa6fvxn55i4ssgmjs";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/openpgp.html";
+        homepage = "https://elpa.gnu.org/devel/openpgp.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   orderless = callPackage (
     {
+      compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "orderless";
       ename = "orderless";
-      version = "1.1.0.20240711.200241";
+      version = "1.1.0.20240717.75820";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240711.200241.tar";
-        sha256 = "04ambf76p24z45b5zswbqprbvy31vdg48mk36dmd85apl0myvi95";
+        url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240717.75820.tar";
+        sha256 = "0x54jhhxm1j8hbxhwpn5ws3dcg20bszpwm7qhqg3hk1jf3f9xp61";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/orderless.html";
+        homepage = "https://elpa.gnu.org/devel/orderless.html";
         license = lib.licenses.free;
       };
     }
@@ -6196,21 +5902,20 @@
   org = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.8pre0.20240712.111340";
+      version = "9.8pre0.20240818.102310";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-9.8pre0.20240712.111340.tar";
-        sha256 = "1nqx0kvmxf7prfip30l1br9gl2s7bmcacds5ifafawywnc720jl6";
+        url = "https://elpa.gnu.org/devel/org-9.8pre0.20240818.102310.tar";
+        sha256 = "0mcisziws7nx445csnz6q89gwm4q2fxy4ddz1d4dixqsj4r1pkdj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org.html";
+        homepage = "https://elpa.gnu.org/devel/org.html";
         license = lib.licenses.free;
       };
     }
@@ -6218,7 +5923,6 @@
   org-contacts = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6226,17 +5930,14 @@
     elpaBuild {
       pname = "org-contacts";
       ename = "org-contacts";
-      version = "1.1.0.20240609.105801";
+      version = "1.1.0.20240807.73345";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240609.105801.tar";
-        sha256 = "1rx5lnn151wn42zpnrr64g1qn5lvk0syfqm2v4h58np7lsf10c2y";
+        url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240807.73345.tar";
+        sha256 = "1j0qwzhxaj1499qk0bjfvvgywi34v7p9cmpc585kxcanb8g1lvg2";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-contacts.html";
+        homepage = "https://elpa.gnu.org/devel/org-contacts.html";
         license = lib.licenses.free;
       };
     }
@@ -6244,7 +5945,6 @@
   org-edna = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6259,12 +5959,11 @@
         sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq";
       };
       packageRequires = [
-        emacs
         org
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-edna.html";
+        homepage = "https://elpa.gnu.org/devel/org-edna.html";
         license = lib.licenses.free;
       };
     }
@@ -6272,7 +5971,6 @@
   org-jami-bot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       jami-bot,
       lib,
@@ -6285,12 +5983,9 @@
         url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar";
         sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4";
       };
-      packageRequires = [
-        emacs
-        jami-bot
-      ];
+      packageRequires = [ jami-bot ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
+        homepage = "https://elpa.gnu.org/devel/org-jami-bot.html";
         license = lib.licenses.free;
       };
     }
@@ -6299,24 +5994,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org-modern";
       ename = "org-modern";
-      version = "1.3.0.20240708.215718";
+      version = "1.5.0.20240803.195206";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-modern-1.3.0.20240708.215718.tar";
-        sha256 = "1r3hk48781j375c307dp3mgb662nk223g6cqfbv72jhqbis7770g";
+        url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20240803.195206.tar";
+        sha256 = "1nrry2zn7ldmbmsr0iznf4w01dhkc618ywbqbbz10ahhja509z2v";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-modern.html";
+        homepage = "https://elpa.gnu.org/devel/org-modern.html";
         license = lib.licenses.free;
       };
     }
@@ -6324,7 +6015,6 @@
   org-notify = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6336,9 +6026,9 @@
         url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar";
         sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-notify.html";
+        homepage = "https://elpa.gnu.org/devel/org-notify.html";
         license = lib.licenses.free;
       };
     }
@@ -6347,7 +6037,6 @@
     {
       boxy,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6362,11 +6051,10 @@
       };
       packageRequires = [
         boxy
-        emacs
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-real.html";
+        homepage = "https://elpa.gnu.org/devel/org-real.html";
         license = lib.licenses.free;
       };
     }
@@ -6374,7 +6062,6 @@
   org-remark = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6387,12 +6074,9 @@
         url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar";
         sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-remark.html";
+        homepage = "https://elpa.gnu.org/devel/org-remark.html";
         license = lib.licenses.free;
       };
     }
@@ -6400,7 +6084,6 @@
   org-transclusion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6413,12 +6096,9 @@
         url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar";
         sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
+        homepage = "https://elpa.gnu.org/devel/org-transclusion.html";
         license = lib.licenses.free;
       };
     }
@@ -6426,7 +6106,6 @@
   org-translate = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -6439,12 +6118,9 @@
         url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar";
         sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-translate.html";
+        homepage = "https://elpa.gnu.org/devel/org-translate.html";
         license = lib.licenses.free;
       };
     }
@@ -6452,7 +6128,6 @@
   orgalist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6464,9 +6139,9 @@
         url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar";
         sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/orgalist.html";
+        homepage = "https://elpa.gnu.org/devel/orgalist.html";
         license = lib.licenses.free;
       };
     }
@@ -6487,7 +6162,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/osc.html";
+        homepage = "https://elpa.gnu.org/devel/osc.html";
         license = lib.licenses.free;
       };
     }
@@ -6496,24 +6171,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "osm";
       ename = "osm";
-      version = "1.3.0.20240708.215736";
+      version = "1.4.0.20240723.220720";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/osm-1.3.0.20240708.215736.tar";
-        sha256 = "12w8mgm7b3hg4h6yks0a1z2sy22b91gk5qsbs014ymq1z4mg38m3";
+        url = "https://elpa.gnu.org/devel/osm-1.4.0.20240723.220720.tar";
+        sha256 = "0z3ng8p5921haj0ynn6sfgsdssfmkz2gsm5ybrz9wanxznswrs9d";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/osm.html";
+        homepage = "https://elpa.gnu.org/devel/osm.html";
         license = lib.licenses.free;
       };
     }
@@ -6521,7 +6192,6 @@
   other-frame-window = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6533,9 +6203,9 @@
         url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar";
         sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
+        homepage = "https://elpa.gnu.org/devel/other-frame-window.html";
         license = lib.licenses.free;
       };
     }
@@ -6543,7 +6213,6 @@
   pabbrev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6555,9 +6224,9 @@
         url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar";
         sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pabbrev.html";
+        homepage = "https://elpa.gnu.org/devel/pabbrev.html";
         license = lib.licenses.free;
       };
     }
@@ -6566,7 +6235,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6578,12 +6246,9 @@
         url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar";
         sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/paced.html";
+        homepage = "https://elpa.gnu.org/devel/paced.html";
         license = lib.licenses.free;
       };
     }
@@ -6592,7 +6257,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6604,12 +6268,9 @@
         url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar";
         sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parsec.html";
+        homepage = "https://elpa.gnu.org/devel/parsec.html";
         license = lib.licenses.free;
       };
     }
@@ -6617,7 +6278,6 @@
   parser-generator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6629,9 +6289,9 @@
         url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar";
         sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parser-generator.html";
+        homepage = "https://elpa.gnu.org/devel/parser-generator.html";
         license = lib.licenses.free;
       };
     }
@@ -6639,7 +6299,6 @@
   path-iterator = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6651,9 +6310,9 @@
         url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar";
         sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/path-iterator.html";
+        homepage = "https://elpa.gnu.org/devel/path-iterator.html";
         license = lib.licenses.free;
       };
     }
@@ -6661,7 +6320,6 @@
   peg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6673,9 +6331,9 @@
         url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar";
         sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/peg.html";
+        homepage = "https://elpa.gnu.org/devel/peg.html";
         license = lib.licenses.free;
       };
     }
@@ -6683,7 +6341,6 @@
   perl-doc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6695,9 +6352,9 @@
         url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar";
         sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/perl-doc.html";
+        homepage = "https://elpa.gnu.org/devel/perl-doc.html";
         license = lib.licenses.free;
       };
     }
@@ -6705,21 +6362,20 @@
   persist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "persist";
       ename = "persist";
-      version = "0.6.1.0.20240615.190609";
+      version = "0.6.1.0.20240801.14323";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240615.190609.tar";
-        sha256 = "0qncm2q42y4xqijx468cpvbh841nw9fk27mm5zdc3l792i0i29y4";
+        url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240801.14323.tar";
+        sha256 = "05y2a66a9gzs2xn4skb7ralidfk01z49ac3hf51sznrlri3wikng";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/persist.html";
+        homepage = "https://elpa.gnu.org/devel/persist.html";
         license = lib.licenses.free;
       };
     }
@@ -6734,14 +6390,14 @@
     elpaBuild {
       pname = "phpinspect";
       ename = "phpinspect";
-      version = "0.0.20240322.152749";
+      version = "0.0.20240819.94625";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar";
-        sha256 = "0060s1p60cqq0llx5m41iwqj1bxl98c444kyhfvdvx3c7z5dapmp";
+        url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240819.94625.tar";
+        sha256 = "1xmyhfzl04aq82a1880p9l7m0az3267amz2qi0a36p5pxcnshz7z";
       };
       packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/phpinspect.html";
+        homepage = "https://elpa.gnu.org/devel/phpinspect.html";
         license = lib.licenses.free;
       };
     }
@@ -6749,7 +6405,6 @@
   phps-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6761,9 +6416,9 @@
         url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar";
         sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/phps-mode.html";
+        homepage = "https://elpa.gnu.org/devel/phps-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -6784,7 +6439,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pinentry.html";
+        homepage = "https://elpa.gnu.org/devel/pinentry.html";
         license = lib.licenses.free;
       };
     }
@@ -6792,21 +6447,20 @@
   plz = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "plz";
       ename = "plz";
-      version = "0.9.0.20240610.142147";
+      version = "0.10pre0.20240816.164727";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-0.9.0.20240610.142147.tar";
-        sha256 = "1jbm07jw7kw2s57q4d0l6r8zxwjj1mi9kx37ppdqv28dbjmbln1r";
+        url = "https://elpa.gnu.org/devel/plz-0.10pre0.20240816.164727.tar";
+        sha256 = "13rimqccllasx5zvb5hm3mkcnhwzy2b2fp5p3klv4xz0szf1981k";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/plz.html";
+        homepage = "https://elpa.gnu.org/devel/plz.html";
         license = lib.licenses.free;
       };
     }
@@ -6814,25 +6468,21 @@
   plz-event-source = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
-      plz,
+      plz-media-type,
     }:
     elpaBuild {
       pname = "plz-event-source";
       ename = "plz-event-source";
-      version = "0.1pre0.20240607.160859";
+      version = "0.1.1.0.20240814.73632";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240607.160859.tar";
-        sha256 = "02wv00dij35crkff82plxlkwgninjnllpc44lq0ynxwk1lgx3q5a";
+        url = "https://elpa.gnu.org/devel/plz-event-source-0.1.1.0.20240814.73632.tar";
+        sha256 = "1bcmc2wribnhvkp0yg57k8xvdbi2hp39jmvapjfpy6hhs1c5j7n9";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz-media-type ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/plz-event-source.html";
+        homepage = "https://elpa.gnu.org/devel/plz-event-source.html";
         license = lib.licenses.free;
       };
     }
@@ -6840,7 +6490,6 @@
   plz-media-type = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -6848,17 +6497,14 @@
     elpaBuild {
       pname = "plz-media-type";
       ename = "plz-media-type";
-      version = "0.1pre0.20240607.134302";
+      version = "0.2.1.0.20240814.73530";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240607.134302.tar";
-        sha256 = "1q6a4yyy339l2crc24mssxansmpmhq401h3mcqkzkcw60xh9wsr8";
+        url = "https://elpa.gnu.org/devel/plz-media-type-0.2.1.0.20240814.73530.tar";
+        sha256 = "0lw95balq4zasj7q2ck1fmbkzs8rkasaqsda3aj859y3zdsqlqkd";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/plz-media-type.html";
+        homepage = "https://elpa.gnu.org/devel/plz-media-type.html";
         license = lib.licenses.free;
       };
     }
@@ -6866,7 +6512,6 @@
   plz-see = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -6879,12 +6524,9 @@
         url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar";
         sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq";
       };
-      packageRequires = [
-        emacs
-        plz
-      ];
+      packageRequires = [ plz ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/plz-see.html";
+        homepage = "https://elpa.gnu.org/devel/plz-see.html";
         license = lib.licenses.free;
       };
     }
@@ -6892,7 +6534,6 @@
   poke = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6904,9 +6545,9 @@
         url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar";
         sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/poke.html";
+        homepage = "https://elpa.gnu.org/devel/poke.html";
         license = lib.licenses.free;
       };
     }
@@ -6927,7 +6568,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/poke-mode.html";
+        homepage = "https://elpa.gnu.org/devel/poke-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -6948,7 +6589,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/poker.html";
+        homepage = "https://elpa.gnu.org/devel/poker.html";
         license = lib.licenses.free;
       };
     }
@@ -6956,7 +6597,6 @@
   polymode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6968,9 +6608,9 @@
         url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar";
         sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/polymode.html";
+        homepage = "https://elpa.gnu.org/devel/polymode.html";
         license = lib.licenses.free;
       };
     }
@@ -6978,7 +6618,6 @@
   popper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -6990,9 +6629,9 @@
         url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar";
         sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/popper.html";
+        homepage = "https://elpa.gnu.org/devel/popper.html";
         license = lib.licenses.free;
       };
     }
@@ -7000,7 +6639,6 @@
   posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7012,9 +6650,9 @@
         url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar";
         sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/posframe.html";
+        homepage = "https://elpa.gnu.org/devel/posframe.html";
         license = lib.licenses.free;
       };
     }
@@ -7022,7 +6660,6 @@
   pq = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7034,9 +6671,9 @@
         url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar";
         sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pq.html";
+        homepage = "https://elpa.gnu.org/devel/pq.html";
         license = lib.licenses.free;
       };
     }
@@ -7057,7 +6694,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/prefixed-core.html";
+        homepage = "https://elpa.gnu.org/devel/prefixed-core.html";
         license = lib.licenses.free;
       };
     }
@@ -7066,24 +6703,20 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "preview-auto";
       ename = "preview-auto";
-      version = "0.3.0.20240629.205058";
+      version = "0.3.0.20240818.113948";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240629.205058.tar";
-        sha256 = "12qmpx9lamxkwkvximygqkczyvwxv6dn8zyv8x55v2qiav0vcp1r";
+        url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240818.113948.tar";
+        sha256 = "1nr80nrzkq0pak5pinxz3v6j6kr879y35whaxn9q6as1c93aay9d";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/preview-auto.html";
+        homepage = "https://elpa.gnu.org/devel/preview-auto.html";
         license = lib.licenses.free;
       };
     }
@@ -7092,7 +6725,6 @@
     {
       auctex,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7104,12 +6736,9 @@
         url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar";
         sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8";
       };
-      packageRequires = [
-        auctex
-        emacs
-      ];
+      packageRequires = [ auctex ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
+        homepage = "https://elpa.gnu.org/devel/preview-tailor.html";
         license = lib.licenses.free;
       };
     }
@@ -7117,7 +6746,6 @@
   project = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xref,
@@ -7125,17 +6753,14 @@
     elpaBuild {
       pname = "project";
       ename = "project";
-      version = "0.11.1.0.20240614.152748";
+      version = "0.11.1.0.20240817.24032";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240614.152748.tar";
-        sha256 = "0izv7szsi3gqqafdjrqnpy3znsk1izr2zkcyc45jiyv5bafd76ik";
+        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240817.24032.tar";
+        sha256 = "1f29qrv2g772sgc4m1y2agm3hwz9fl06mpizak1kbx6ak8klw6zk";
       };
-      packageRequires = [
-        emacs
-        xref
-      ];
+      packageRequires = [ xref ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/project.html";
+        homepage = "https://elpa.gnu.org/devel/project.html";
         license = lib.licenses.free;
       };
     }
@@ -7156,7 +6781,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/psgml.html";
+        homepage = "https://elpa.gnu.org/devel/psgml.html";
         license = lib.licenses.free;
       };
     }
@@ -7177,7 +6802,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
+        homepage = "https://elpa.gnu.org/devel/pspp-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -7185,7 +6810,6 @@
   pulsar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7197,9 +6821,9 @@
         url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar";
         sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pulsar.html";
+        homepage = "https://elpa.gnu.org/devel/pulsar.html";
         license = lib.licenses.free;
       };
     }
@@ -7208,7 +6832,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xr,
@@ -7223,11 +6846,10 @@
       };
       packageRequires = [
         async
-        emacs
         xr
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pyim.html";
+        homepage = "https://elpa.gnu.org/devel/pyim.html";
         license = lib.licenses.free;
       };
     }
@@ -7248,7 +6870,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
+        homepage = "https://elpa.gnu.org/devel/pyim-basedict.html";
         license = lib.licenses.free;
       };
     }
@@ -7257,7 +6879,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -7272,11 +6893,10 @@
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/python.html";
+        homepage = "https://elpa.gnu.org/devel/python.html";
         license = lib.licenses.free;
       };
     }
@@ -7297,7 +6917,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
+        homepage = "https://elpa.gnu.org/devel/quarter-plane.html";
         license = lib.licenses.free;
       };
     }
@@ -7319,7 +6939,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/queue.html";
+        homepage = "https://elpa.gnu.org/devel/queue.html";
         license = lib.licenses.free;
       };
     }
@@ -7340,7 +6960,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
+        homepage = "https://elpa.gnu.org/devel/rainbow-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -7361,7 +6981,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rbit.html";
+        homepage = "https://elpa.gnu.org/devel/rbit.html";
         license = lib.licenses.free;
       };
     }
@@ -7369,7 +6989,6 @@
   rcirc-color = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7381,9 +7000,9 @@
         url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar";
         sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+        homepage = "https://elpa.gnu.org/devel/rcirc-color.html";
         license = lib.licenses.free;
       };
     }
@@ -7404,7 +7023,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+        homepage = "https://elpa.gnu.org/devel/rcirc-menu.html";
         license = lib.licenses.free;
       };
     }
@@ -7412,7 +7031,6 @@
   rcirc-sqlite = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7424,9 +7042,9 @@
         url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar";
         sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
+        homepage = "https://elpa.gnu.org/devel/rcirc-sqlite.html";
         license = lib.licenses.free;
       };
     }
@@ -7434,7 +7052,6 @@
   realgud = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7450,13 +7067,12 @@
         sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva";
       };
       packageRequires = [
-        emacs
         load-relative
         loc-changes
         test-simple
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud.html";
+        homepage = "https://elpa.gnu.org/devel/realgud.html";
         license = lib.licenses.free;
       };
     }
@@ -7464,7 +7080,6 @@
   realgud-ipdb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7479,12 +7094,11 @@
         sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-ipdb.html";
         license = lib.licenses.free;
       };
     }
@@ -7492,7 +7106,6 @@
   realgud-jdb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7507,12 +7120,11 @@
         sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-jdb.html";
         license = lib.licenses.free;
       };
     }
@@ -7520,7 +7132,6 @@
   realgud-lldb = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7535,12 +7146,11 @@
         sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-lldb.html";
         license = lib.licenses.free;
       };
     }
@@ -7549,7 +7159,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7565,12 +7174,11 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-node-debug.html";
         license = lib.licenses.free;
       };
     }
@@ -7579,7 +7187,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7595,12 +7202,11 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-node-inspect.html";
         license = lib.licenses.free;
       };
     }
@@ -7608,7 +7214,6 @@
   realgud-trepan-ni = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7623,12 +7228,11 @@
         sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-trepan-ni.html";
         license = lib.licenses.free;
       };
     }
@@ -7636,7 +7240,6 @@
   realgud-trepan-xpy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       load-relative,
@@ -7651,12 +7254,11 @@
         sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i";
       };
       packageRequires = [
-        emacs
         load-relative
         realgud
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
+        homepage = "https://elpa.gnu.org/devel/realgud-trepan-xpy.html";
         license = lib.licenses.free;
       };
     }
@@ -7664,7 +7266,6 @@
   rec-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7676,9 +7277,9 @@
         url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar";
         sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rec-mode.html";
+        homepage = "https://elpa.gnu.org/devel/rec-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -7699,7 +7300,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/register-list.html";
+        homepage = "https://elpa.gnu.org/devel/register-list.html";
         license = lib.licenses.free;
       };
     }
@@ -7707,7 +7308,6 @@
   relint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       xr,
@@ -7715,17 +7315,14 @@
     elpaBuild {
       pname = "relint";
       ename = "relint";
-      version = "1.24.0.20240510.91500";
+      version = "2.0.0.20240802.81954";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar";
-        sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389";
+        url = "https://elpa.gnu.org/devel/relint-2.0.0.20240802.81954.tar";
+        sha256 = "1ncai8nbswxgx18kc8qvm47am4n6qbhs38gjbx1ps6xxbipbks1z";
       };
-      packageRequires = [
-        emacs
-        xr
-      ];
+      packageRequires = [ xr ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/relint.html";
+        homepage = "https://elpa.gnu.org/devel/relint.html";
         license = lib.licenses.free;
       };
     }
@@ -7733,7 +7330,6 @@
   repology = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7745,9 +7341,9 @@
         url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar";
         sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/repology.html";
+        homepage = "https://elpa.gnu.org/devel/repology.html";
         license = lib.licenses.free;
       };
     }
@@ -7769,7 +7365,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rich-minority.html";
+        homepage = "https://elpa.gnu.org/devel/rich-minority.html";
         license = lib.licenses.free;
       };
     }
@@ -7790,7 +7386,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
+        homepage = "https://elpa.gnu.org/devel/rnc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -7811,7 +7407,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
+        homepage = "https://elpa.gnu.org/devel/rt-liberation.html";
         license = lib.licenses.free;
       };
     }
@@ -7832,7 +7428,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ruby-end.html";
+        homepage = "https://elpa.gnu.org/devel/ruby-end.html";
         license = lib.licenses.free;
       };
     }
@@ -7843,7 +7439,6 @@
       cl-lib ? null,
       cl-print ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7859,10 +7454,9 @@
         cl-generic
         cl-lib
         cl-print
-        emacs
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rudel.html";
+        homepage = "https://elpa.gnu.org/devel/rudel.html";
         license = lib.licenses.free;
       };
     }
@@ -7870,7 +7464,6 @@
   satchel = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -7883,12 +7476,9 @@
         url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar";
         sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/satchel.html";
+        homepage = "https://elpa.gnu.org/devel/satchel.html";
         license = lib.licenses.free;
       };
     }
@@ -7897,7 +7487,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7909,12 +7498,9 @@
         url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar";
         sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scanner.html";
+        homepage = "https://elpa.gnu.org/devel/scanner.html";
         license = lib.licenses.free;
       };
     }
@@ -7935,7 +7521,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
+        homepage = "https://elpa.gnu.org/devel/scroll-restore.html";
         license = lib.licenses.free;
       };
     }
@@ -7956,7 +7542,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sed-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sed-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -7977,7 +7563,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/seq.html";
+        homepage = "https://elpa.gnu.org/devel/seq.html";
         license = lib.licenses.free;
       };
     }
@@ -7985,7 +7571,6 @@
   setup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -7997,9 +7582,9 @@
         url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar";
         sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/setup.html";
+        homepage = "https://elpa.gnu.org/devel/setup.html";
         license = lib.licenses.free;
       };
     }
@@ -8020,7 +7605,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shelisp.html";
+        homepage = "https://elpa.gnu.org/devel/shelisp.html";
         license = lib.licenses.free;
       };
     }
@@ -8028,21 +7613,20 @@
   shell-command-plus = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "shell-command-plus";
       ename = "shell-command+";
-      version = "2.4.2.0.20240712.91350";
+      version = "2.4.2.0.20240801.143007";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240712.91350.tar";
-        sha256 = "11qma2a8cph3q87bma8jwb8q4vfqdqs7gmb88yw8ywil76p6jdms";
+        url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240801.143007.tar";
+        sha256 = "0mhr5yki3b0px40ldk8wzwpzy5ji0l301v4wilivzii8lgaq571c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+        homepage = "https://elpa.gnu.org/devel/shell-command+.html";
         license = lib.licenses.free;
       };
     }
@@ -8063,7 +7647,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shell-quasiquote.html";
+        homepage = "https://elpa.gnu.org/devel/shell-quasiquote.html";
         license = lib.licenses.free;
       };
     }
@@ -8084,7 +7668,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shen-mode.html";
+        homepage = "https://elpa.gnu.org/devel/shen-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8105,7 +7689,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sisu-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8113,7 +7697,6 @@
   site-lisp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8125,9 +7708,9 @@
         url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar";
         sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/site-lisp.html";
+        homepage = "https://elpa.gnu.org/devel/site-lisp.html";
         license = lib.licenses.free;
       };
     }
@@ -8148,7 +7731,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sketch-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8170,7 +7753,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
+        homepage = "https://elpa.gnu.org/devel/slime-volleyball.html";
         license = lib.licenses.free;
       };
     }
@@ -8191,7 +7774,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sm-c-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8212,7 +7795,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
+        homepage = "https://elpa.gnu.org/devel/smalltalk-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8220,7 +7803,6 @@
   smart-yank = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8232,9 +7814,9 @@
         url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar";
         sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/smart-yank.html";
+        homepage = "https://elpa.gnu.org/devel/smart-yank.html";
         license = lib.licenses.free;
       };
     }
@@ -8243,7 +7825,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8255,12 +7836,9 @@
         url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar";
         sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sml-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sml-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8268,7 +7846,6 @@
   so-long = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8280,9 +7857,9 @@
         url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar";
         sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/so-long.html";
+        homepage = "https://elpa.gnu.org/devel/so-long.html";
         license = lib.licenses.free;
       };
     }
@@ -8291,7 +7868,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8303,12 +7879,9 @@
         url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar";
         sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/soap-client.html";
+        homepage = "https://elpa.gnu.org/devel/soap-client.html";
         license = lib.licenses.free;
       };
     }
@@ -8317,7 +7890,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8329,12 +7901,9 @@
         url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar";
         sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sokoban.html";
+        homepage = "https://elpa.gnu.org/devel/sokoban.html";
         license = lib.licenses.free;
       };
     }
@@ -8342,7 +7911,6 @@
   sotlisp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8354,9 +7922,9 @@
         url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar";
         sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sotlisp.html";
+        homepage = "https://elpa.gnu.org/devel/sotlisp.html";
         license = lib.licenses.free;
       };
     }
@@ -8364,21 +7932,20 @@
   spacious-padding = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "spacious-padding";
       ename = "spacious-padding";
-      version = "0.5.0.0.20240429.82953";
+      version = "0.5.0.0.20240801.94014";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar";
-        sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi";
+        url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240801.94014.tar";
+        sha256 = "0nv1gg30kwdcb0isp159ir03xh3l28yv11m9rznch48axwd1bjwp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
+        homepage = "https://elpa.gnu.org/devel/spacious-padding.html";
         license = lib.licenses.free;
       };
     }
@@ -8386,7 +7953,6 @@
   spinner = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8398,9 +7964,9 @@
         url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar";
         sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spinner.html";
+        homepage = "https://elpa.gnu.org/devel/spinner.html";
         license = lib.licenses.free;
       };
     }
@@ -8421,7 +7987,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
+        homepage = "https://elpa.gnu.org/devel/sql-beeline.html";
         license = lib.licenses.free;
       };
     }
@@ -8429,7 +7995,6 @@
   sql-cassandra = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8441,9 +8006,9 @@
         url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar";
         sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
+        homepage = "https://elpa.gnu.org/devel/sql-cassandra.html";
         license = lib.licenses.free;
       };
     }
@@ -8465,7 +8030,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+        homepage = "https://elpa.gnu.org/devel/sql-indent.html";
         license = lib.licenses.free;
       };
     }
@@ -8486,7 +8051,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sql-smie.html";
+        homepage = "https://elpa.gnu.org/devel/sql-smie.html";
         license = lib.licenses.free;
       };
     }
@@ -8494,7 +8059,6 @@
   srht = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       plz,
@@ -8509,12 +8073,11 @@
         sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0";
       };
       packageRequires = [
-        emacs
         plz
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/srht.html";
+        homepage = "https://elpa.gnu.org/devel/srht.html";
         license = lib.licenses.free;
       };
     }
@@ -8522,7 +8085,6 @@
   ssh-deploy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8534,9 +8096,9 @@
         url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar";
         sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
+        homepage = "https://elpa.gnu.org/devel/ssh-deploy.html";
         license = lib.licenses.free;
       };
     }
@@ -8544,21 +8106,20 @@
   standard-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "standard-themes";
       ename = "standard-themes";
-      version = "2.0.1.0.20240520.83250";
+      version = "2.1.0.0.20240811.61021";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar";
-        sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx";
+        url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20240811.61021.tar";
+        sha256 = "15p3fa8a5gqxkzkk5ldcjbzq7ja478w0w3xc4xhw4hbklzknph6n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/standard-themes.html";
+        homepage = "https://elpa.gnu.org/devel/standard-themes.html";
         license = lib.licenses.free;
       };
     }
@@ -8566,7 +8127,6 @@
   stream = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8578,9 +8138,9 @@
         url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar";
         sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/stream.html";
+        homepage = "https://elpa.gnu.org/devel/stream.html";
         license = lib.licenses.free;
       };
     }
@@ -8588,7 +8148,6 @@
   substitute = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8600,9 +8159,9 @@
         url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar";
         sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/substitute.html";
+        homepage = "https://elpa.gnu.org/devel/substitute.html";
         license = lib.licenses.free;
       };
     }
@@ -8610,21 +8169,20 @@
   svg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "svg";
       ename = "svg";
-      version = "1.1.0.20240102.22814";
+      version = "1.1.0.20240804.74716";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar";
-        sha256 = "1ddz3zadwmm4am2ywwmrqj2a56kr73i45q7svjmgnljgvvs267b3";
+        url = "https://elpa.gnu.org/devel/svg-1.1.0.20240804.74716.tar";
+        sha256 = "1jgcs5x5rq4bd1ac2kyh9ylid9wp9c4sijxd1zch0yi2z67x8z62";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/svg.html";
+        homepage = "https://elpa.gnu.org/devel/svg.html";
         license = lib.licenses.free;
       };
     }
@@ -8632,7 +8190,6 @@
   svg-clock = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg,
@@ -8645,12 +8202,9 @@
         url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar";
         sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx";
       };
-      packageRequires = [
-        emacs
-        svg
-      ];
+      packageRequires = [ svg ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/svg-clock.html";
+        homepage = "https://elpa.gnu.org/devel/svg-clock.html";
         license = lib.licenses.free;
       };
     }
@@ -8658,7 +8212,6 @@
   svg-lib = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8670,9 +8223,9 @@
         url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar";
         sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/svg-lib.html";
+        homepage = "https://elpa.gnu.org/devel/svg-lib.html";
         license = lib.licenses.free;
       };
     }
@@ -8680,7 +8233,6 @@
   svg-tag-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       svg-lib,
@@ -8693,12 +8245,9 @@
         url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar";
         sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln";
       };
-      packageRequires = [
-        emacs
-        svg-lib
-      ];
+      packageRequires = [ svg-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
+        homepage = "https://elpa.gnu.org/devel/svg-tag-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8706,7 +8255,6 @@
   swiper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       ivy,
       lib,
@@ -8719,12 +8267,9 @@
         url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar";
         sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma";
       };
-      packageRequires = [
-        emacs
-        ivy
-      ];
+      packageRequires = [ ivy ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/swiper.html";
+        homepage = "https://elpa.gnu.org/devel/swiper.html";
         license = lib.licenses.free;
       };
     }
@@ -8733,7 +8278,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8745,12 +8289,9 @@
         url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar";
         sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/switchy-window.html";
+        homepage = "https://elpa.gnu.org/devel/switchy-window.html";
         license = lib.licenses.free;
       };
     }
@@ -8758,7 +8299,6 @@
   sxhkdrc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8770,9 +8310,9 @@
         url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar";
         sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
+        homepage = "https://elpa.gnu.org/devel/sxhkdrc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -8780,7 +8320,6 @@
   system-packages = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8792,9 +8331,9 @@
         url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar";
         sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/system-packages.html";
+        homepage = "https://elpa.gnu.org/devel/system-packages.html";
         license = lib.licenses.free;
       };
     }
@@ -8816,7 +8355,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/systemd.html";
+        homepage = "https://elpa.gnu.org/devel/systemd.html";
         license = lib.licenses.free;
       };
     }
@@ -8842,7 +8381,7 @@
         queue
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tNFA.html";
+        homepage = "https://elpa.gnu.org/devel/tNFA.html";
         license = lib.licenses.free;
       };
     }
@@ -8850,7 +8389,6 @@
   tam = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8862,9 +8400,9 @@
         url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar";
         sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tam.html";
+        homepage = "https://elpa.gnu.org/devel/tam.html";
         license = lib.licenses.free;
       };
     }
@@ -8872,21 +8410,20 @@
   taxy = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "taxy";
       ename = "taxy";
-      version = "0.10.1.0.20220919.160646";
+      version = "0.10.2.0.20240816.184044";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar";
-        sha256 = "0bld0sjni4ipbllrjnlwk5419454ac5s3mf6imw91z4ddk46vp18";
+        url = "https://elpa.gnu.org/devel/taxy-0.10.2.0.20240816.184044.tar";
+        sha256 = "1qsy9j5si9kkhv7vssc7cg8iypizgzfckb5bpvas0cxiv7ibfqv6";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/taxy.html";
+        homepage = "https://elpa.gnu.org/devel/taxy.html";
         license = lib.licenses.free;
       };
     }
@@ -8894,7 +8431,6 @@
   taxy-magit-section = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit-section,
@@ -8903,18 +8439,17 @@
     elpaBuild {
       pname = "taxy-magit-section";
       ename = "taxy-magit-section";
-      version = "0.14pre0.20240703.212805";
+      version = "0.14.0.20240816.184417";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14pre0.20240703.212805.tar";
-        sha256 = "0sdjfryyg0lgr8mry0v662j9m3kaqcap6f73s4ds81yc67y30qbg";
+        url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14.0.20240816.184417.tar";
+        sha256 = "1r1akz148a9sbqcsycc8i5vdifxsamcy8qhrlq0s8fj39qcdj39m";
       };
       packageRequires = [
-        emacs
         magit-section
         taxy
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
+        homepage = "https://elpa.gnu.org/devel/taxy-magit-section.html";
         license = lib.licenses.free;
       };
     }
@@ -8922,7 +8457,6 @@
   temp-buffer-browse = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -8934,9 +8468,9 @@
         url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar";
         sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
+        homepage = "https://elpa.gnu.org/devel/temp-buffer-browse.html";
         license = lib.licenses.free;
       };
     }
@@ -8945,24 +8479,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "tempel";
       ename = "tempel";
-      version = "1.1.0.20240708.212025";
+      version = "1.2.0.20240723.220630";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240708.212025.tar";
-        sha256 = "0jlqq91w8rwqkd6knqlpw9218xqblfqw253406q4an820rxkzx7l";
+        url = "https://elpa.gnu.org/devel/tempel-1.2.0.20240723.220630.tar";
+        sha256 = "0a5z3lw4lf6swanvs22z2wpayclmk573gb6r9v93xwj3941dwgnk";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tempel.html";
+        homepage = "https://elpa.gnu.org/devel/tempel.html";
         license = lib.licenses.free;
       };
     }
@@ -8984,7 +8514,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/test-simple.html";
+        homepage = "https://elpa.gnu.org/devel/test-simple.html";
         license = lib.licenses.free;
       };
     }
@@ -8992,7 +8522,6 @@
   tex-item = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9004,9 +8533,9 @@
         url = "https://elpa.gnu.org/devel/tex-item-0.1.0.20240617.174820.tar";
         sha256 = "17b95npakxjzc03qrsxla5jhdzhq0clwdrx57f9ck94a0fnpji3x";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tex-item.html";
+        homepage = "https://elpa.gnu.org/devel/tex-item.html";
         license = lib.licenses.free;
       };
     }
@@ -9014,7 +8543,6 @@
   tex-parens = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9026,9 +8554,9 @@
         url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar";
         sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tex-parens.html";
+        homepage = "https://elpa.gnu.org/devel/tex-parens.html";
         license = lib.licenses.free;
       };
     }
@@ -9036,7 +8564,6 @@
   theme-buffet = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9048,9 +8575,9 @@
         url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar";
         sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
+        homepage = "https://elpa.gnu.org/devel/theme-buffet.html";
         license = lib.licenses.free;
       };
     }
@@ -9059,7 +8586,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9071,12 +8597,9 @@
         url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar";
         sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
+        homepage = "https://elpa.gnu.org/devel/timerfunctions.html";
         license = lib.licenses.free;
       };
     }
@@ -9097,7 +8620,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tiny.html";
+        homepage = "https://elpa.gnu.org/devel/tiny.html";
         license = lib.licenses.free;
       };
     }
@@ -9106,7 +8629,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9118,12 +8640,9 @@
         url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar";
         sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tmr.html";
+        homepage = "https://elpa.gnu.org/devel/tmr.html";
         license = lib.licenses.free;
       };
     }
@@ -9131,7 +8650,6 @@
   tomelr = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -9146,12 +8664,11 @@
         sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa";
       };
       packageRequires = [
-        emacs
         map
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tomelr.html";
+        homepage = "https://elpa.gnu.org/devel/tomelr.html";
         license = lib.licenses.free;
       };
     }
@@ -9159,7 +8676,6 @@
   topspace = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9171,9 +8687,9 @@
         url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar";
         sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/topspace.html";
+        homepage = "https://elpa.gnu.org/devel/topspace.html";
         license = lib.licenses.free;
       };
     }
@@ -9181,7 +8697,6 @@
   track-changes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9193,9 +8708,9 @@
         url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar";
         sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/track-changes.html";
+        homepage = "https://elpa.gnu.org/devel/track-changes.html";
         license = lib.licenses.free;
       };
     }
@@ -9203,21 +8718,20 @@
   tramp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "tramp";
       ename = "tramp";
-      version = "2.7.1.0.20240629.82953";
+      version = "2.7.1.1.0.20240730.150621";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tramp-2.7.1.0.20240629.82953.tar";
-        sha256 = "0kf7l5v84hqhbxzvg6xmffs8b03shd6062wjxfxy9z8y9xb6zpar";
+        url = "https://elpa.gnu.org/devel/tramp-2.7.1.1.0.20240730.150621.tar";
+        sha256 = "13abfs3a483ird3gwc49ixbxdwmayrlqnh349wm0j1hlmbciqczh";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tramp.html";
+        homepage = "https://elpa.gnu.org/devel/tramp.html";
         license = lib.licenses.free;
       };
     }
@@ -9225,7 +8739,6 @@
   tramp-nspawn = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9237,9 +8750,9 @@
         url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar";
         sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
+        homepage = "https://elpa.gnu.org/devel/tramp-nspawn.html";
         license = lib.licenses.free;
       };
     }
@@ -9247,7 +8760,6 @@
   tramp-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9259,9 +8771,9 @@
         url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar";
         sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
+        homepage = "https://elpa.gnu.org/devel/tramp-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -9282,7 +8794,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/transcribe.html";
+        homepage = "https://elpa.gnu.org/devel/transcribe.html";
         license = lib.licenses.free;
       };
     }
@@ -9291,7 +8803,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9299,18 +8810,17 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.7.2.0.20240629.150812";
+      version = "0.7.4.0.20240805.123130";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.7.2.0.20240629.150812.tar";
-        sha256 = "02d73zfxcbk2p5pzs5j2hv0qznj2zbjyjd6xhinpxx657w1c3zsx";
+        url = "https://elpa.gnu.org/devel/transient-0.7.4.0.20240805.123130.tar";
+        sha256 = "1bm1kv7n24bzixa2gmb6km2iacqag4l8kwrcxdf09yxwisg0a3zf";
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/transient.html";
+        homepage = "https://elpa.gnu.org/devel/transient.html";
         license = lib.licenses.free;
       };
     }
@@ -9318,7 +8828,6 @@
   transient-cycles = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9330,9 +8839,9 @@
         url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar";
         sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
+        homepage = "https://elpa.gnu.org/devel/transient-cycles.html";
         license = lib.licenses.free;
       };
     }
@@ -9340,7 +8849,6 @@
   tree-inspector = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       treeview,
@@ -9353,12 +8861,9 @@
         url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar";
         sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap";
       };
-      packageRequires = [
-        emacs
-        treeview
-      ];
+      packageRequires = [ treeview ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
+        homepage = "https://elpa.gnu.org/devel/tree-inspector.html";
         license = lib.licenses.free;
       };
     }
@@ -9384,7 +8889,7 @@
         tNFA
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/trie.html";
+        homepage = "https://elpa.gnu.org/devel/trie.html";
         license = lib.licenses.free;
       };
     }
@@ -9392,7 +8897,6 @@
   triples = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9405,12 +8909,9 @@
         url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar";
         sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/triples.html";
+        homepage = "https://elpa.gnu.org/devel/triples.html";
         license = lib.licenses.free;
       };
     }
@@ -9418,7 +8919,6 @@
   typo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9430,9 +8930,9 @@
         url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar";
         sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/typo.html";
+        homepage = "https://elpa.gnu.org/devel/typo.html";
         license = lib.licenses.free;
       };
     }
@@ -9440,7 +8940,6 @@
   ulisp-repl = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9452,9 +8951,9 @@
         url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar";
         sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
+        homepage = "https://elpa.gnu.org/devel/ulisp-repl.html";
         license = lib.licenses.free;
       };
     }
@@ -9462,7 +8961,6 @@
   undo-tree = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       queue,
@@ -9475,12 +8973,9 @@
         url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar";
         sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030";
       };
-      packageRequires = [
-        emacs
-        queue
-      ];
+      packageRequires = [ queue ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/undo-tree.html";
+        homepage = "https://elpa.gnu.org/devel/undo-tree.html";
         license = lib.licenses.free;
       };
     }
@@ -9501,7 +8996,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
+        homepage = "https://elpa.gnu.org/devel/uni-confusables.html";
         license = lib.licenses.free;
       };
     }
@@ -9509,7 +9004,6 @@
   uniquify-files = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9521,9 +9015,9 @@
         url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar";
         sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
+        homepage = "https://elpa.gnu.org/devel/uniquify-files.html";
         license = lib.licenses.free;
       };
     }
@@ -9532,7 +9026,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -9540,18 +9033,17 @@
     elpaBuild {
       pname = "urgrep";
       ename = "urgrep";
-      version = "0.5.1snapshot0.20240530.111648";
+      version = "0.5.1snapshot0.20240729.214836";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240530.111648.tar";
-        sha256 = "160h7jzbkf1igaz49sp9gw30471qmw9b28h2pq9r8f1varkvy9an";
+        url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240729.214836.tar";
+        sha256 = "008kdywxj0zpgiqbjcngs8kbj4az2liisblkcc2cifhj31427cyd";
       };
       packageRequires = [
         compat
-        emacs
         project
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/urgrep.html";
+        homepage = "https://elpa.gnu.org/devel/urgrep.html";
         license = lib.licenses.free;
       };
     }
@@ -9579,7 +9071,7 @@
         ntlm
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
+        homepage = "https://elpa.gnu.org/devel/url-http-ntlm.html";
         license = lib.licenses.free;
       };
     }
@@ -9600,7 +9092,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
+        homepage = "https://elpa.gnu.org/devel/url-http-oauth.html";
         license = lib.licenses.free;
       };
     }
@@ -9608,7 +9100,6 @@
   url-scgi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9620,9 +9111,9 @@
         url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar";
         sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/url-scgi.html";
+        homepage = "https://elpa.gnu.org/devel/url-scgi.html";
         license = lib.licenses.free;
       };
     }
@@ -9631,24 +9122,20 @@
     {
       bind-key,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "use-package";
       ename = "use-package";
-      version = "2.4.5.0.20240708.120317";
+      version = "2.4.5.0.20240804.85212";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240708.120317.tar";
-        sha256 = "1kp1mh2hm6yhwchkr1vxpnnajdc378knwkmf88vky2ygnnscczy7";
+        url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240804.85212.tar";
+        sha256 = "1i1vm2vsc9wa25lxyrfaizrnj47l5cbfaxaan3n6rc7i88zw62bx";
       };
-      packageRequires = [
-        bind-key
-        emacs
-      ];
+      packageRequires = [ bind-key ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/use-package.html";
+        homepage = "https://elpa.gnu.org/devel/use-package.html";
         license = lib.licenses.free;
       };
     }
@@ -9657,7 +9144,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -9672,11 +9158,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/validate.html";
+        homepage = "https://elpa.gnu.org/devel/validate.html";
         license = lib.licenses.free;
       };
     }
@@ -9684,7 +9169,6 @@
   valign = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9696,9 +9180,9 @@
         url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar";
         sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/valign.html";
+        homepage = "https://elpa.gnu.org/devel/valign.html";
         license = lib.licenses.free;
       };
     }
@@ -9707,7 +9191,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9719,12 +9202,9 @@
         url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar";
         sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vc-backup.html";
+        homepage = "https://elpa.gnu.org/devel/vc-backup.html";
         license = lib.licenses.free;
       };
     }
@@ -9732,7 +9212,6 @@
   vc-got = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9744,9 +9223,9 @@
         url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar";
         sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vc-got.html";
+        homepage = "https://elpa.gnu.org/devel/vc-got.html";
         license = lib.licenses.free;
       };
     }
@@ -9754,7 +9233,6 @@
   vc-hgcmd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9766,9 +9244,9 @@
         url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar";
         sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
+        homepage = "https://elpa.gnu.org/devel/vc-hgcmd.html";
         license = lib.licenses.free;
       };
     }
@@ -9776,7 +9254,6 @@
   vcard = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9788,9 +9265,9 @@
         url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar";
         sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vcard.html";
+        homepage = "https://elpa.gnu.org/devel/vcard.html";
         license = lib.licenses.free;
       };
     }
@@ -9811,7 +9288,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
+        homepage = "https://elpa.gnu.org/devel/vcl-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -9819,7 +9296,6 @@
   vdiff = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       hydra,
       lib,
@@ -9832,12 +9308,9 @@
         url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar";
         sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1";
       };
-      packageRequires = [
-        emacs
-        hydra
-      ];
+      packageRequires = [ hydra ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vdiff.html";
+        homepage = "https://elpa.gnu.org/devel/vdiff.html";
         license = lib.licenses.free;
       };
     }
@@ -9858,7 +9331,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
+        homepage = "https://elpa.gnu.org/devel/verilog-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -9867,24 +9340,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "1.8.0.20240711.185118";
+      version = "1.9.0.20240726.213105";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240711.185118.tar";
-        sha256 = "1wsybijh4h46swlxx7viz0wiwh5hbkh4q3a51r60flvys90cjkgz";
+        url = "https://elpa.gnu.org/devel/vertico-1.9.0.20240726.213105.tar";
+        sha256 = "1gdmn8xs5d4mma8q8zvvnqvzdblxcv2xyc3lbkjw1rjjqg5xzj2i";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vertico.html";
+        homepage = "https://elpa.gnu.org/devel/vertico.html";
         license = lib.licenses.free;
       };
     }
@@ -9892,7 +9361,6 @@
   vertico-posframe = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       posframe,
@@ -9907,12 +9375,11 @@
         sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k";
       };
       packageRequires = [
-        emacs
         posframe
         vertico
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
+        homepage = "https://elpa.gnu.org/devel/vertico-posframe.html";
         license = lib.licenses.free;
       };
     }
@@ -9920,7 +9387,6 @@
   vigenere = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9932,9 +9398,9 @@
         url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar";
         sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vigenere.html";
+        homepage = "https://elpa.gnu.org/devel/vigenere.html";
         license = lib.licenses.free;
       };
     }
@@ -9942,21 +9408,20 @@
   visual-filename-abbrev = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "visual-filename-abbrev";
       ename = "visual-filename-abbrev";
-      version = "1.2.0.20221221.82606";
+      version = "1.3.0.20240721.74720";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar";
-        sha256 = "1lb02jpljj2l1qkmn2pmbvw910nrpg9bsz6yfqfccyppvnmrv788";
+        url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.3.0.20240721.74720.tar";
+        sha256 = "06pl6cn2lrxjvhdjmcw0lf7hh1p4lhii86imxa2cqiciyysfxm9c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
+        homepage = "https://elpa.gnu.org/devel/visual-filename-abbrev.html";
         license = lib.licenses.free;
       };
     }
@@ -9977,7 +9442,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/visual-fill.html";
+        homepage = "https://elpa.gnu.org/devel/visual-fill.html";
         license = lib.licenses.free;
       };
     }
@@ -9985,7 +9450,6 @@
   vlf = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -9997,9 +9461,9 @@
         url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar";
         sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vlf.html";
+        homepage = "https://elpa.gnu.org/devel/vlf.html";
         license = lib.licenses.free;
       };
     }
@@ -10007,7 +9471,6 @@
   vundo = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10019,9 +9482,9 @@
         url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar";
         sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vundo.html";
+        homepage = "https://elpa.gnu.org/devel/vundo.html";
         license = lib.licenses.free;
       };
     }
@@ -10042,7 +9505,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
+        homepage = "https://elpa.gnu.org/devel/wcheck-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -10050,7 +9513,6 @@
   wconf = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10062,9 +9524,9 @@
         url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar";
         sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wconf.html";
+        homepage = "https://elpa.gnu.org/devel/wconf.html";
         license = lib.licenses.free;
       };
     }
@@ -10073,7 +9535,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10085,12 +9546,9 @@
         url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar";
         sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/web-server.html";
+        homepage = "https://elpa.gnu.org/devel/web-server.html";
         license = lib.licenses.free;
       };
     }
@@ -10098,7 +9556,6 @@
   webfeeder = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10110,9 +9567,9 @@
         url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar";
         sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/webfeeder.html";
+        homepage = "https://elpa.gnu.org/devel/webfeeder.html";
         license = lib.licenses.free;
       };
     }
@@ -10134,7 +9591,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/websocket.html";
+        homepage = "https://elpa.gnu.org/devel/websocket.html";
         license = lib.licenses.free;
       };
     }
@@ -10142,21 +9599,20 @@
   which-key = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "which-key";
       ename = "which-key";
-      version = "3.6.0.0.20240625.112213";
+      version = "3.6.1.0.20240727.42753";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240625.112213.tar";
-        sha256 = "1shjn6bqnwr8fxccfz86dpwvyqw0crmrn7pb60dwvvjmxqfm0aj6";
+        url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20240727.42753.tar";
+        sha256 = "1db4g0yhin44lxl4hpzsnn68f8hik705a89dgq20jiyihdji5ldq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/which-key.html";
+        homepage = "https://elpa.gnu.org/devel/which-key.html";
         license = lib.licenses.free;
       };
     }
@@ -10164,7 +9620,6 @@
   window-commander = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10176,9 +9631,9 @@
         url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar";
         sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/window-commander.html";
+        homepage = "https://elpa.gnu.org/devel/window-commander.html";
         license = lib.licenses.free;
       };
     }
@@ -10187,7 +9642,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10199,12 +9653,9 @@
         url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar";
         sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
+        homepage = "https://elpa.gnu.org/devel/window-tool-bar.html";
         license = lib.licenses.free;
       };
     }
@@ -10212,7 +9663,6 @@
   windower = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10224,9 +9674,9 @@
         url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar";
         sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/windower.html";
+        homepage = "https://elpa.gnu.org/devel/windower.html";
         license = lib.licenses.free;
       };
     }
@@ -10247,7 +9697,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/windresize.html";
+        homepage = "https://elpa.gnu.org/devel/windresize.html";
         license = lib.licenses.free;
       };
     }
@@ -10255,7 +9705,6 @@
   wisi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -10268,12 +9717,9 @@
         url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar";
         sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wisi.html";
+        homepage = "https://elpa.gnu.org/devel/wisi.html";
         license = lib.licenses.free;
       };
     }
@@ -10281,7 +9727,6 @@
   wisitoken-grammar-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       mmm-mode,
@@ -10296,12 +9741,11 @@
         sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8";
       };
       packageRequires = [
-        emacs
         mmm-mode
         wisi
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
+        homepage = "https://elpa.gnu.org/devel/wisitoken-grammar-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -10322,7 +9766,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
+        homepage = "https://elpa.gnu.org/devel/wpuzzle.html";
         license = lib.licenses.free;
       };
     }
@@ -10336,14 +9780,14 @@
     elpaBuild {
       pname = "wrap-search";
       ename = "wrap-search";
-      version = "4.16.13.0.20240517.214404";
+      version = "4.16.19.0.20240813.40618";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar";
-        sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq";
+        url = "https://elpa.gnu.org/devel/wrap-search-4.16.19.0.20240813.40618.tar";
+        sha256 = "1g8c6wdwb6clrqy61n914ilk1bq1023dilfcqx98c37x8yi0wmm2";
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wrap-search.html";
+        homepage = "https://elpa.gnu.org/devel/wrap-search.html";
         license = lib.licenses.free;
       };
     }
@@ -10364,7 +9808,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xclip.html";
+        homepage = "https://elpa.gnu.org/devel/xclip.html";
         license = lib.licenses.free;
       };
     }
@@ -10372,7 +9816,6 @@
   xeft = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10384,9 +9827,9 @@
         url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar";
         sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xeft.html";
+        homepage = "https://elpa.gnu.org/devel/xeft.html";
         license = lib.licenses.free;
       };
     }
@@ -10395,7 +9838,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10407,12 +9849,9 @@
         url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar";
         sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xelb.html";
+        homepage = "https://elpa.gnu.org/devel/xelb.html";
         license = lib.licenses.free;
       };
     }
@@ -10438,7 +9877,7 @@
         queue
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xpm.html";
+        homepage = "https://elpa.gnu.org/devel/xpm.html";
         license = lib.licenses.free;
       };
     }
@@ -10446,21 +9885,20 @@
   xr = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "xr";
       ename = "xr";
-      version = "1.25.0.20240401.74532";
+      version = "2.0.0.20240802.81742";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/xr-1.25.0.20240401.74532.tar";
-        sha256 = "0q9s706dz52mfnjhc9b5km7756zsx9ws4nlc607i1v71hhz2k3lg";
+        url = "https://elpa.gnu.org/devel/xr-2.0.0.20240802.81742.tar";
+        sha256 = "1x93v2x8zkr3s55c8r8lpimavqzcq0zjxshg5kif84gir10jgcdn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xr.html";
+        homepage = "https://elpa.gnu.org/devel/xr.html";
         license = lib.licenses.free;
       };
     }
@@ -10468,7 +9906,6 @@
   xref = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10480,9 +9917,9 @@
         url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar";
         sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xref.html";
+        homepage = "https://elpa.gnu.org/devel/xref.html";
         license = lib.licenses.free;
       };
     }
@@ -10490,7 +9927,6 @@
   xref-union = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10502,9 +9938,9 @@
         url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar";
         sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xref-union.html";
+        homepage = "https://elpa.gnu.org/devel/xref-union.html";
         license = lib.licenses.free;
       };
     }
@@ -10513,7 +9949,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -10525,12 +9960,9 @@
         url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar";
         sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yasnippet.html";
+        homepage = "https://elpa.gnu.org/devel/yasnippet.html";
         license = lib.licenses.free;
       };
     }
@@ -10552,7 +9984,7 @@
       };
       packageRequires = [ yasnippet ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
+        homepage = "https://elpa.gnu.org/devel/yasnippet-classic-snippets.html";
         license = lib.licenses.free;
       };
     }
@@ -10573,7 +10005,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zones.html";
+        homepage = "https://elpa.gnu.org/devel/zones.html";
         license = lib.licenses.free;
       };
     }
@@ -10595,7 +10027,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ztree.html";
+        homepage = "https://elpa.gnu.org/devel/ztree.html";
         license = lib.licenses.free;
       };
     }
@@ -10603,7 +10035,6 @@
   zuul = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -10616,12 +10047,9 @@
         url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar";
         sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zuul.html";
+        homepage = "https://elpa.gnu.org/devel/zuul.html";
         license = lib.licenses.free;
       };
     }

From b69391897e0a31d193064d34b73fa189d2d6f4a2 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 20 Aug 2024 23:19:17 +0800
Subject: [PATCH 223/235] melpa-packages: updated 2024-08-20 (from overlay)

---
 .../elisp-packages/recipes-archive-melpa.json | 4784 +++++++++--------
 1 file changed, 2549 insertions(+), 2235 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 bba5811c01df..375b589bcb9a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -318,8 +318,8 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20240701,
-    1407
+    20240723,
+    1401
    ],
    "deps": [
     "erlang",
@@ -327,8 +327,8 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "252d9f2de3773dcfc7b07f5edfafc2d9298c366e",
-   "sha256": "1z52wlv60y002xniy7klnp9aww8c4y6lkfif52h1v4l4q23czbhh"
+   "commit": "c3ba6466507bd35ae1d5a2d12e1da9d5c44a02b3",
+   "sha256": "1xssk5srbs56jibkpl8wb8qn021kwdg36kafi7immnrpic4fx1xk"
   },
   "stable": {
    "version": [
@@ -1621,6 +1621,21 @@
    "sha256": "1mww6x8gwhkrqcylxxm25xhcvam52nhj7q3f3bvaxhyfdc7jw9yq"
   }
  },
+ {
+  "ename": "act-mode",
+  "commit": "cf407f944186776070ec6900d1bb8846cb3b8e57",
+  "sha256": "01nybw8gz2fk4938nkb68znbgcpw1ik31kqc2h6iwn6kvnchpw26",
+  "fetcher": "github",
+  "repo": "rafaelcn/act",
+  "unstable": {
+   "version": [
+    20240718,
+    39
+   ],
+   "commit": "90d7d626691591b24d83596149bc89fd51ba39b4",
+   "sha256": "14ym2i12d3nz7wrqbq6xy44zvh8fw601idapafi5zcsl1mpfc9f0"
+  }
+ },
  {
   "ename": "actionscript-mode",
   "commit": "2c11e74f2156f109b713380cebf83022d7159d4a",
@@ -1687,11 +1702,11 @@
   "repo": "brownts/ada-ts-mode",
   "unstable": {
    "version": [
-    20240506,
-    1140
+    20240713,
+    1754
    ],
-   "commit": "3f83ab4c99cf13cf4693dde29eb1e950bbbb6595",
-   "sha256": "1jqsv7f24j39kbh4msvsfm0sv90k20fnw9r1wvmbgi8m7xgdhgzv"
+   "commit": "1e7ea28c1cdfe10a37855105bd47f820bfc90a27",
+   "sha256": "1z1w4wxk7dkhyjp4wh5m3r7v8izbr0iikc09gyq0120h7k51nagx"
   }
  },
  {
@@ -1726,10 +1741,10 @@
  },
  {
   "ename": "add-hooks",
-  "commit": "901f846aef46d512dc0a1770bab7f07c0ae330cd",
-  "sha256": "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p",
+  "commit": "acd620719dff4fcbd32c6cd50d7954732c182c73",
+  "sha256": "14jh1nfzn529i6l3zf005rx9zmlmrxl7pgb6vwkc469ij1hdddn5",
   "fetcher": "github",
-  "repo": "nickmccurdy/add-hooks",
+  "repo": "nickserv/add-hooks",
   "unstable": {
    "version": [
     20171217,
@@ -1904,14 +1919,14 @@
   "repo": "minad/affe",
   "unstable": {
    "version": [
-    20240102,
-    331
+    20240718,
+    1250
    ],
    "deps": [
     "consult"
    ],
-   "commit": "1fd5732afa5d68b120fd2e949702b1abde0466d7",
-   "sha256": "16xi584ls9ll7x3y63hwqp2gv3j0b4dgy40xsnjkmzifp5xl0npr"
+   "commit": "e82be0be353dafe15c5ff617917806bd3728463a",
+   "sha256": "08ph4h883fyzx88jd70pjjraj0ya4rq3k7g2q9l1jjcf2hh0wmmb"
   },
   "stable": {
    "version": [
@@ -3261,11 +3276,11 @@
   "repo": "anki-editor/anki-editor",
   "unstable": {
    "version": [
-    20240710,
-    536
+    20240716,
+    1922
    ],
-   "commit": "b14a6ccb2c3d0b06f2359ce44f8fe6fb535bf391",
-   "sha256": "180f6wb9whnzifpl3x9gcqfs94w04plyy99xk1nl5syx6ila6km3"
+   "commit": "ba7c7bf3269f7630ef8c06f342ab04bdd8efea53",
+   "sha256": "1pf243pv9mnqb1dlb2n3677abg7r3b69zizc7laxxqhik5dn9dd9"
   }
  },
  {
@@ -3424,12 +3439,11 @@
   "stable": {
    "version": [
     2,
-    6,
-    4,
-    3
+    7,
+    0
    ],
-   "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c",
-   "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy"
+   "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe",
+   "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8"
   }
  },
  {
@@ -3795,19 +3809,19 @@
   "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20240517,
-    2228
+    20240803,
+    2322
    ],
-   "commit": "61766b50b24fa16be519d77795dc63522e04dce8",
-   "sha256": "1zichs8b1kczzb63r1pwyiqzav7c0x8sxdvg0inv02w5wq96r2wc"
+   "commit": "3e347cff47eb0072b47c56f6188c4f440e477770",
+   "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj"
   },
   "stable": {
    "version": [
     4,
-    1
+    2
    ],
-   "commit": "7ba74c7cc28e4f0da4006968ecb8587133daa142",
-   "sha256": "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb"
+   "commit": "3e347cff47eb0072b47c56f6188c4f440e477770",
+   "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj"
   }
  },
  {
@@ -3885,11 +3899,11 @@
   "repo": "alexmurray/apparmor-mode",
   "unstable": {
    "version": [
-    20240703,
-    221
+    20240801,
+    505
    ],
-   "commit": "66136e99ad507e9b5404e09d01fe6e1828a930c7",
-   "sha256": "033sy23ybkv5y8194xi9693dwzmrpdxf4r1agy2rs6lkxssd1hb8"
+   "commit": "770f2f0356dbf56a5ae2e2d3abc11f317f5e2556",
+   "sha256": "0jlxy7q4p05d922cm1prxk06b9dzc791kly66gkflgkwl5jmwb3a"
   }
  },
  {
@@ -4404,20 +4418,20 @@
   "repo": "Sorixelle/astro-ts-mode",
   "unstable": {
    "version": [
-    20230802,
-    437
+    20240724,
+    332
    ],
-   "commit": "207e5da093aa8141b9dd2f5e98afd8952832b4b0",
-   "sha256": "0yfz5xdpwzbpihbnm5kixmjpqcmj86h6lm71ji8vzq044rassfga"
+   "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5",
+   "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    1
    ],
-   "commit": "688b7c9f661571fcd7d6d754a91e48a9938d8684",
-   "sha256": "00smy30cxx0n0v2r2pl4jh10vw3w0klhbgk14cbw3yq73gp29pmi"
+   "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5",
+   "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2"
   }
  },
  {
@@ -4461,11 +4475,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20240712,
-    457
+    20240811,
+    1434
    ],
-   "commit": "585231547a495d0a36bdf6db9ef50bb9a19119f3",
-   "sha256": "17mrj3bvh29r7bncsz47gbpwhr1j7d4scj97yb4c58d2a6zmwwcz"
+   "commit": "e1d46f97a56e0c57206bd1ea31d04311097a8cbb",
+   "sha256": "0ik0vb37nlrx6pg4x8dd3cm3b585a9fp6bgp341f5slr108k8nsg"
   },
   "stable": {
    "version": [
@@ -4569,11 +4583,11 @@
   "repo": "meedstrom/asyncloop",
   "unstable": {
    "version": [
-    20240407,
-    1153
+    20240818,
+    1247
    ],
-   "commit": "46e38388870b238221a4d96017874309aada7660",
-   "sha256": "188633b7fxy94xpdafksxxh3hd9cahcrg1f62d6p2j0qvw9a9ly7"
+   "commit": "7d60950d160098a879293e049b9863bc955f8666",
+   "sha256": "1bykvwx85pmh67s4yi8rpi94yx6zrhb8hnah4z5whxviwql3z3ld"
   },
   "stable": {
    "version": [
@@ -4618,10 +4632,10 @@
  },
  {
   "ename": "atl-long-lines",
-  "commit": "e3144a999d236d2718b4b7b94cfafe26c3e4aada",
-  "sha256": "0pb8ysvv2wi5vsv1wj1aac2khjwkjm4rvf70fa0cla4xmnnczxla",
+  "commit": "024ff21dffa39b76019a0acb81a69de318665055",
+  "sha256": "07dyrs95dxm9xaqlzvhidbrdxz90wh02qy8g87vrkqqy006g4h40",
   "fetcher": "github",
-  "repo": "jcs-elpa/atl-long-lines",
+  "repo": "jcs-legacy/atl-long-lines",
   "unstable": {
    "version": [
     20240101,
@@ -4642,10 +4656,10 @@
  },
  {
   "ename": "atl-markup",
-  "commit": "42025212ccfe998023f7eb563588be76282d53de",
-  "sha256": "1123lbnc6hlycm6bg5f7292z7cdnp2iv0wb8mg0n0ydma524s6bm",
+  "commit": "a80fa33585eae3add2e3249862be6195e0bd3b37",
+  "sha256": "0w95jvphv0fzas61ah11fiy961f7c2p2w2kzs8n5ffmw69i1yl29",
   "fetcher": "github",
-  "repo": "jcs-elpa/atl-markup",
+  "repo": "jcs-legacy/atl-markup",
   "unstable": {
    "version": [
     20240101,
@@ -5097,20 +5111,20 @@
   "repo": "emacscollective/auto-compile",
   "unstable": {
    "version": [
-    20240628,
-    2027
+    20240805,
+    1931
    ],
-   "commit": "8f6d708d7021559e0d4577f77b5d42afb3a6cb4f",
-   "sha256": "1dicy4srxlr07qj4sbwaa8bcdbhz91wnxh9zrk2w29z08m0f18c7"
+   "commit": "5cc4e97443727554357f6c57614f12ca87419627",
+   "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p"
   },
   "stable": {
    "version": [
     2,
     0,
-    2
+    3
    ],
-   "commit": "a495b3b92a555953b58ec4b6a8ab8411c337ea3d",
-   "sha256": "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl"
+   "commit": "5cc4e97443727554357f6c57614f12ca87419627",
+   "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p"
   }
  },
  {
@@ -6447,28 +6461,28 @@
   "repo": "tarsius/backline",
   "unstable": {
    "version": [
-    20240712,
-    2214
+    20240805,
+    1306
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "39726634051b2c1ee8d661df894b130447fb7632",
-   "sha256": "07rk77zbjysdqkw2zh6rr3wf2mvqvcgkfjkplg1vyfqqvlsl5lwh"
+   "commit": "9c791fb9a4a2e4a09443ec8b0da8f1f10890c0c6",
+   "sha256": "1gpfg0bvp0333aw9nfaa61nyd01linn9fhishfsyri167k3avihr"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "af07e3862950c77bba6994ecbe9f62e0110dfc50",
-   "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng"
+   "commit": "9c791fb9a4a2e4a09443ec8b0da8f1f10890c0c6",
+   "sha256": "1gpfg0bvp0333aw9nfaa61nyd01linn9fhishfsyri167k3avihr"
   }
  },
  {
@@ -6681,11 +6695,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20240621,
-    2329
+    20240819,
+    340
    ],
-   "commit": "8789114e45d09d114e0e197cb090ce7beb993901",
-   "sha256": "1gipaykmrp20ncf6jlc1cl2w8swsg70iagzid4hj69cc3klay6mk"
+   "commit": "c49bb721af8f15434731bccf42f64dd226c38733",
+   "sha256": "1bv537jys33jv8hkvpdw686wwqjq4k8d13bx8n0iq2j61zsx49fv"
   },
   "stable": {
    "version": [
@@ -7779,26 +7793,26 @@
   "repo": "tarsius/bicycle",
   "unstable": {
    "version": [
-    20240712,
-    2215
+    20240810,
+    2050
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0b7ea156d211e8a87a931afa210d4f6beea20f5d",
-   "sha256": "0mmmxxi29jcngslfas309nv7hvkr94w3m0yb111663x28z24v523"
+   "commit": "80858c93ba5e24b89f1ccc6e4b21548f3eec35ae",
+   "sha256": "0l3lfx362vpbix3hq0hrimxdgv2s4nx1kg7ldsk5qnv8yxmf3xh6"
   },
   "stable": {
    "version": [
     0,
     4,
-    7
+    8
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6244c479486b9a48369236b22a40d0830722e950",
-   "sha256": "1vildffmcj2k5q507ijn2s7f8x4fnabrq4gl2zrsx6ddddsbrym5"
+   "commit": "2f1f037af123df2b8c971f0137da87e55813eefa",
+   "sha256": "0q0cd4xyw0wi6hyj9d914mwvm57vglh82r8mc29rca21ss143id5"
   }
  },
  {
@@ -8903,34 +8917,34 @@
  },
  {
   "ename": "borg",
-  "commit": "af5c1593052d63146e850683c461a760ab166033",
-  "sha256": "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr",
+  "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7",
+  "sha256": "10nszv2wwzp5g95wgw2yj9n0na1a8rp6iy84b4myhpii9bvs5bd6",
   "fetcher": "github",
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20240609,
-    1435
+    20240817,
+    1958
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "940dc6af73cc40b5254fdb15ff1a6058e1b2b8a5",
-   "sha256": "1hlq3ss6waz6xi8qcqig1267l626fddpaz9038xy96w5zcm5wzdj"
+   "commit": "ad76a76424654d77b2b5d95472d86c03ce2c5410",
+   "sha256": "0vfyxd8si7ffwy1jryqk0d92zn0g3w09xr8130ikksazwqjfqzvx"
   },
   "stable": {
    "version": [
-    3,
-    3,
-    1
+    4,
+    0,
+    0
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "66f00318777a3530741535f64a420addc1ccf44a",
-   "sha256": "0w180am9p952j2iyidf5krivlx19mv1ji1f34cwm969mhb3652fy"
+   "commit": "e7a5a696d776f2b61c38335a8cec6108f4af2166",
+   "sha256": "1aclajsxr2nqd0mamr50j8xlgzk7pycigjw3n5wi6yr5c37pq30p"
   }
  },
  {
@@ -9069,11 +9083,11 @@
   "repo": "museoa/bqn-mode",
   "unstable": {
    "version": [
-    20240623,
-    126
+    20240721,
+    2036
    ],
-   "commit": "b2a524b67d07483888fa17649a0618dfb6b22990",
-   "sha256": "1saq9fkdr4wflpnf257ddm3yhnvryhjms5isrik5vjwjv5j5lwrh"
+   "commit": "80f6be6ca678d2f072be7a39e88b10d3c56e63e5",
+   "sha256": "1nwa39yslizdqkh8wixx55b153gri8gnj68s6b612jn8mry1dgny"
   }
  },
  {
@@ -9378,25 +9392,6 @@
    "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7"
   }
  },
- {
-  "ename": "btc-ticker",
-  "commit": "f78796a8835ec44f4d13c99559fd4d113c6f4f29",
-  "sha256": "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1",
-  "fetcher": "github",
-  "repo": "niedbalski/emacs-btc-ticker",
-  "unstable": {
-   "version": [
-    20220409,
-    1647
-   ],
-   "deps": [
-    "json",
-    "request"
-   ],
-   "commit": "2ed18ac6338d5fe98c578f0875840af07f0bc42a",
-   "sha256": "0hx96ah2y1s5hj5f3i2y50v1m0lfphg71sr4fhssjls0yvl995sr"
-  }
- },
  {
   "ename": "bts",
   "commit": "0d2f9c2f465b06c97cd03c5644155cd6c7fade24",
@@ -9990,14 +9985,14 @@
   "repo": "alphapapa/burly.el",
   "unstable": {
    "version": [
-    20231218,
-    1045
+    20240727,
+    545
    ],
    "deps": [
     "map"
    ],
-   "commit": "6626df0c2054cb0662bf113ba4cbad641b588d0f",
-   "sha256": "10ggzbg04midvk932cj9vzg7ni5w97yn1gmx4mj0h5yr7h1lwzhp"
+   "commit": "d5b7133b5b629dd6bca29bb16660a9e472e82e25",
+   "sha256": "18qq5zsmb9gg701158dwx7qkh2l5m4m029lmgmydchi9xb2g9as9"
   },
   "stable": {
    "version": [
@@ -10142,11 +10137,11 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20240328,
-    2016
+    20240718,
+    14
    ],
-   "commit": "a1a86b027ffe030e1c78a9f43c50cd20a6fed19a",
-   "sha256": "0s5c7ia7b873dr6rqljkb1z4bf84zb3p3wjvcvpjhdcnf67m5x10"
+   "commit": "dfbef2177209e3a045e981b7d2956ec46ce3b25b",
+   "sha256": "1vgk6v22pldgi62f3gf816hdzbxfrl3sg4snxs0snfzb16si1bpc"
   },
   "stable": {
    "version": [
@@ -10672,8 +10667,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20240707,
-    1121
+    20240714,
+    642
    ],
    "deps": [
     "dash",
@@ -10683,8 +10678,8 @@
     "s",
     "transient"
    ],
-   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
-   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
+   "commit": "bb9cfb5e5f9c2bb45386c1a9d1273a7832f8c28b",
+   "sha256": "0hmcmwmcv951v9bl8cr1cij6pkak84b9frr7h4aiydw6jpb0lcaa"
   },
   "stable": {
    "version": [
@@ -10851,25 +10846,25 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20240710,
-    1919
+    20240818,
+    1414
    ],
    "deps": [
     "compat"
    ],
-   "commit": "040c1ee30b6ff766ba0f3e1458b43ce4a65f068b",
-   "sha256": "1h3xnjp1897syj2dwbb32x8s00hkcsvn09vsgjg1z204cd2i5czj"
+   "commit": "944c60cc3ff81ceceeb239746f7dd9d8e7d0a663",
+   "sha256": "1y043hha07bi4q6wnq1sii8g4fihmm458xsvlk55p43c3dph1ms9"
   },
   "stable": {
    "version": [
     1,
-    5
+    6
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0",
-   "sha256": "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw"
+   "commit": "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1",
+   "sha256": "0bkkb4fpga7r0rmyj8i621xmn5s0l7w49xyj1byy8z4rgl73zlhb"
   }
  },
  {
@@ -11219,28 +11214,58 @@
   "repo": "kickingvegas/casual-avy",
   "unstable": {
    "version": [
-    20240703,
-    1846
+    20240714,
+    202
    ],
    "deps": [
     "avy",
     "casual-lib"
    ],
-   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
-   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
+   "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc",
+   "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg"
   },
   "stable": {
    "version": [
     1,
     4,
-    0
+    1
    ],
    "deps": [
     "avy",
     "casual-lib"
    ],
-   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
-   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
+   "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc",
+   "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg"
+  }
+ },
+ {
+  "ename": "casual-bookmarks",
+  "commit": "19999b89a2fb2eddd3edbf0df4b9c674b4c2ef29",
+  "sha256": "18w9l94y9zzvdib8im232asw7vhqq49qhylph07ilj5gmqawdwfh",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-bookmarks",
+  "unstable": {
+   "version": [
+    20240806,
+    2233
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "d105638d9440581c4557a76f4d042a64b34e10ab",
+   "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "d105638d9440581c4557a76f4d042a64b34e10ab",
+   "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl"
   }
  },
  {
@@ -11251,26 +11276,26 @@
   "repo": "kickingvegas/casual-calc",
   "unstable": {
    "version": [
-    20240628,
-    2332
+    20240811,
+    103
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
-   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
+   "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0",
+   "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa"
   },
   "stable": {
    "version": [
     1,
-    10,
-    0
+    11,
+    2
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
-   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
+   "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0",
+   "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa"
   }
  },
  {
@@ -11281,26 +11306,26 @@
   "repo": "kickingvegas/casual-dired",
   "unstable": {
    "version": [
-    20240710,
-    2115
+    20240811,
+    2038
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
-   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+   "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c",
+   "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c"
   },
   "stable": {
    "version": [
     1,
-    6,
-    1
+    8,
+    0
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
-   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+   "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c",
+   "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c"
   }
  },
  {
@@ -11311,26 +11336,26 @@
   "repo": "kickingvegas/casual-ibuffer",
   "unstable": {
    "version": [
-    20240712,
-    423
+    20240730,
+    329
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
-   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
+   "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80",
+   "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi"
   },
   "stable": {
    "version": [
     1,
     1,
-    1
+    3
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
-   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
+   "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80",
+   "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi"
   }
  },
  {
@@ -11371,26 +11396,26 @@
   "repo": "kickingvegas/casual-isearch",
   "unstable": {
    "version": [
-    20240711,
-    403
+    20240808,
+    1638
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
-   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+   "commit": "812355ca972c81d9a31611572c490a2ea8ed8881",
+   "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky"
   },
   "stable": {
    "version": [
     1,
     8,
-    1
+    3
    ],
    "deps": [
     "casual-lib"
    ],
-   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
-   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+   "commit": "812355ca972c81d9a31611572c490a2ea8ed8881",
+   "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky"
   }
  },
  {
@@ -11401,26 +11426,56 @@
   "repo": "kickingvegas/casual-lib",
   "unstable": {
    "version": [
-    20240628,
-    2300
+    20240815,
+    1946
    ],
    "deps": [
     "transient"
    ],
-   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
-   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+   "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb",
+   "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    2
    ],
    "deps": [
     "transient"
    ],
-   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
-   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+   "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb",
+   "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3"
+  }
+ },
+ {
+  "ename": "casual-re-builder",
+  "commit": "4963d8a23ffb1ed7222f3672e35239798ee1560d",
+  "sha256": "0li8vx0vq8abjnnssm2kx29mqzlpc7x8gcxjl1n4za315m3007wb",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-re-builder",
+  "unstable": {
+   "version": [
+    20240730,
+    49
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86",
+   "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86",
+   "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z"
   }
  },
  {
@@ -11431,36 +11486,40 @@
   "repo": "kickingvegas/casual-suite",
   "unstable": {
    "version": [
-    20240705,
-    1758
+    20240730,
+    426
    ],
    "deps": [
     "casual-avy",
+    "casual-bookmarks",
     "casual-calc",
     "casual-dired",
     "casual-ibuffer",
     "casual-info",
-    "casual-isearch"
+    "casual-isearch",
+    "casual-re-builder"
    ],
-   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
-   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
+   "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc",
+   "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd"
   },
   "stable": {
    "version": [
     1,
-    2,
-    0
+    4,
+    1
    ],
    "deps": [
     "casual-avy",
+    "casual-bookmarks",
     "casual-calc",
     "casual-dired",
     "casual-ibuffer",
     "casual-info",
-    "casual-isearch"
+    "casual-isearch",
+    "casual-re-builder"
    ],
-   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
-   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
+   "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc",
+   "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd"
   }
  },
  {
@@ -11495,11 +11554,11 @@
   "repo": "catppuccin/emacs",
   "unstable": {
    "version": [
-    20240607,
-    1703
+    20240818,
+    734
    ],
-   "commit": "2f15c7c7cca7834b072bb26421a2755a67786899",
-   "sha256": "19gbkdmjq6616x9q4zhzf6hz9g1d91sh26h00pjzpbp1cj1qml3l"
+   "commit": "0b4a7e43b80aedcb7a8088ce0ab4928bd34d5f95",
+   "sha256": "0875x96djls8yhk1j6g6rl9pml8zyx4r5vysbqjda1m98vdm23np"
   },
   "stable": {
    "version": [
@@ -11780,14 +11839,14 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20240704,
-    1048
+    20240813,
+    1143
    ],
    "deps": [
     "powerline"
    ],
-   "commit": "12663a3ea01d2652d28e63a9644b68ac31c400be",
-   "sha256": "1jlwk3930i389f38mmkrzq5nwk1vfffczdcsc9i0si5rzr010zbs"
+   "commit": "ecee903518f1650421891f6c7bf521f200e22765",
+   "sha256": "0npi4r8bzbsha5m2zi77srlwyak6fk35xcmqyzl233dm7k9yi4sv"
   },
   "stable": {
    "version": [
@@ -12007,16 +12066,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20240630,
-    804
+    20240811,
+    805
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "a16c17e7765f1ae54ae7d40e748871e6b1ffced6",
-   "sha256": "1m1v2an9dpsksar9v60srg9bdhsiiwjxba7lbd7s6iyraj30r2dn"
+   "commit": "4784f043b214aa38c0c2c7f01e67802832a6c380",
+   "sha256": "0zjwf654wf6d18jgn1kw8ll6pb476jqzrlixzlf8bbygsypw5pr8"
   },
   "stable": {
    "version": [
@@ -12106,11 +12165,11 @@
   "repo": "GrammarSoft/cg3",
   "unstable": {
    "version": [
-    20240430,
-    2040
+    20240808,
+    1902
    ],
-   "commit": "06fb61345a4f3aae4bda74f3dfe261b1ec9d902d",
-   "sha256": "1bvbwk79wd13gvfa99ngz2z00b6wc2w8fh1py27zk024hxqbhf3v"
+   "commit": "07e099991185330b1d14e940e6e0e1d203972183",
+   "sha256": "1d4z03n8bl00axrkdkknmw48dlsf83s4fbh5gw9dcd01a41157dh"
   },
   "stable": {
    "version": [
@@ -12280,14 +12339,26 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240709,
-    808
+    20240816,
+    737
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "fce2b6d3609135f827da46dbb6d1f37d65a8b024",
-   "sha256": "1qlm6v2nbalfwwjwz956zmj9ipy2smfimlllidxdlbq0463hnsgs"
+   "commit": "0efead292f053774bba3c0789370e8e383aa49ec",
+   "sha256": "0bqc5d93nplfhhcfh1605pi6ymqbb15774f7ij58wvy98yb5rh0s"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "shell-maker"
+   ],
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
   }
  },
  {
@@ -12706,26 +12777,26 @@
   "repo": "breatheoutbreathein/chordpro-mode.el",
   "unstable": {
    "version": [
-    20240618,
-    626
+    20240819,
+    649
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ea530813edb4936f36efea9b2f0009c9feb6b90b",
-   "sha256": "1rxqqarhspfvyf7ii0h6sg5z8qknn6zqj3cfy797awc2fv3m3drs"
+   "commit": "75b5d36f56ede3af921126ea63bf9639c8dfedb5",
+   "sha256": "0b6mv3qlkc4cylhynkbzxb1h2qwfcw9jsd3pw331i8cg30rsggqy"
   },
   "stable": {
    "version": [
     2,
-    2,
+    3,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "5dd6e08bda7caea872d56b01d83080e5465d3548",
-   "sha256": "0jvw1pkncr27x86iyh51hkhxsnxl37rj4zrpdis2vk7hghqxca1v"
+   "commit": "1cff95d5974d1fb13c4e3e76176270a1342ea176",
+   "sha256": "10vhbjds90pwa2yfna5yfg2h4fvbccrd7fkqw932wc2h4fm84pb5"
   }
  },
  {
@@ -12736,11 +12807,11 @@
   "repo": "galdor/chroma",
   "unstable": {
    "version": [
-    20230503,
-    1210
+    20240716,
+    1131
    ],
-   "commit": "e6ebe08ce439b0dd8cfd2a0a78abf34f195feb3c",
-   "sha256": "1j8zap0jx0dx4f7n7851ipmky70cnq6ixz2jnpmdccpk4w6w6cv6"
+   "commit": "89324b476498bdfc657079040cfbbe33d1da48a3",
+   "sha256": "1zjcmaav6rfirbarqhdaicb7c1sgv90ya704ldmbl7xfi96s7z0v"
   },
   "stable": {
    "version": [
@@ -12775,16 +12846,16 @@
   "repo": "contrapunctus/chronometrist",
   "unstable": {
    "version": [
-    20230712,
-    1532
+    20240807,
+    1850
    ],
    "deps": [
     "dash",
     "seq",
     "ts"
    ],
-   "commit": "dbbcdfd4398cc2845a20aca4161358fafcb60c65",
-   "sha256": "1dq7gnvcck1sg7d8xr93inljfdc736kdlg8y4fa3796mbwb22vl9"
+   "commit": "fdeeba0c0f23cd0ebfa76d5ec2bf4e5e93f87941",
+   "sha256": "1xf7bnqxigc4c3pprv4b6hajc1dr33qsdnwfxjcfpk087xf48a1a"
   },
   "stable": {
    "version": [
@@ -12953,8 +13024,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20240711,
-    1319
+    20240815,
+    918
    ],
    "deps": [
     "clojure-mode",
@@ -12965,8 +13036,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "42608a1369760b6e36a86f0a63daa876c8b24e9e",
-   "sha256": "1rwsfcmxm1fy1lc0h9d511hhp3x17vhsxzmwizdzpfw42xpa1pyq"
+   "commit": "144811a819b469cd797c88ec1f24119cfa8454af",
+   "sha256": "0lydhza3jy60y5wcqgaikbq3wa2gv4n4d4rkbbkqm6kbm5mphk5j"
   },
   "stable": {
    "version": [
@@ -13397,8 +13468,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20240621,
-    1425
+    20240722,
+    1110
    ],
    "deps": [
     "compat",
@@ -13410,8 +13481,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "cfa30b6c95c7465a05da98eccf273608880b22d7",
-   "sha256": "0layhvngypfxms7ivhiqfhfx5787kq0vdp2m4k51mwgjk0cagfqc"
+   "commit": "54184baaff555b5c7993d566d75dd04ed485b5c0",
+   "sha256": "003c8xjdz69irdgi58yibkgai4is0ffbavvkl370n214rwhhhib9"
   },
   "stable": {
    "version": [
@@ -13796,11 +13867,11 @@
   "repo": "llaisdy/clingo-mode",
   "unstable": {
    "version": [
-    20230825,
-    1941
+    20240724,
+    1135
    ],
-   "commit": "8ea6ab5fa7dca439ec0e1dca8f3cdf7ace43390d",
-   "sha256": "0n13i8xkwz6r42qmd7id4bbzhj0q3lnsrvq0hl6y22c1awqi9dr7"
+   "commit": "feff7d3308a824e918740461e9df636ab67a8874",
+   "sha256": "0ci2sc7hc0lxlbkzfz8nbcivfjw3xzsvac64hzdmsys49k5hzwil"
   },
   "stable": {
    "version": [
@@ -14405,11 +14476,11 @@
   "repo": "clojure-emacs/clojure-ts-mode",
   "unstable": {
    "version": [
-    20240618,
-    301
+    20240725,
+    1139
    ],
-   "commit": "7b7a4705d1a952b4414672955e67fb9471213f2a",
-   "sha256": "02hz3wfpfkkiqx92swmj5avisq408934iybip6rs4pwrh69630aq"
+   "commit": "0e6816e76ea31c0f0e4d39d8f016c262e57dcb10",
+   "sha256": "13dwgkqricisnxkp7x066f7gm9w22myc9s7m88s3kslvf9k4qap2"
   },
   "stable": {
    "version": [
@@ -14464,27 +14535,28 @@
   "repo": "magit/closql",
   "unstable": {
    "version": [
-    20240712,
-    2215
+    20240808,
+    1934
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "ebfb860510d895ebcbbe920dd0d86381f1b6504c",
-   "sha256": "0v1maxvxzcihg1ssvxc1h1m4l0yzhfp9702s6fmb7h18yd2g2gvy"
+   "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802",
+   "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw"
   },
   "stable": {
    "version": [
-    1,
     2,
-    1
+    0,
+    0
    ],
    "deps": [
-    "emacsql-sqlite"
+    "compat",
+    "emacsql"
    ],
-   "commit": "1ba85ce9f7094aeddce25044689278eda6739531",
-   "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx"
+   "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802",
+   "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw"
   }
  },
  {
@@ -14657,20 +14729,20 @@
   "url": "https://gitlab.kitware.com/cmake/cmake.git",
   "unstable": {
    "version": [
-    20240624,
-    1425
+    20240814,
+    1725
    ],
-   "commit": "4b874546fc3711bb24fcdba5718e6c85a17c740a",
-   "sha256": "1mjw3wwn0bqqyvlf251mwbjq5pbw018qd6cnid5mjlxglfbj4y75"
+   "commit": "cf1bc1b9371dc6063a1734a1cd80d6cb654ad53e",
+   "sha256": "1anxrj0bdl1z811dqz6cmxqyw0ipsim0hgxlqc0kngms9dnjilnx"
   },
   "stable": {
    "version": [
     3,
     30,
-    0
+    2
    ],
-   "commit": "0f88f57389fd636d76b7f726ac94933476d6c195",
-   "sha256": "1p6jq4yq81r0vdzr7wshllvn8dl80snz6q4ihp2fhd2yjngxj1l4"
+   "commit": "d88682dff6bf053e5bbdc10accf5d6825303e656",
+   "sha256": "1apk3vkg7n6mqpqibib02xmvzsy99zhyc6ajsk4ajr1iri9wyv1h"
   }
  },
  {
@@ -15717,6 +15789,30 @@
    "sha256": "1835kg05794p1wdi7fsmpzlnnqy79dgfnfrxjfjj2j1gzcwmynsw"
   }
  },
+ {
+  "ename": "communinfo",
+  "commit": "4e4c7240098f486d91cc819a13add2aabfc1f2b3",
+  "sha256": "1g6jhy7ibpxpri1spl4p26f52ba3bgcxf93sxg6vbi03f8p2dcwa",
+  "fetcher": "codeberg",
+  "repo": "mekeor/communinfo",
+  "unstable": {
+   "version": [
+    20240709,
+    913
+   ],
+   "commit": "2e1481c2441725f1938d8b11848e954906d118b8",
+   "sha256": "01vf2fz8s02ph3ppnx4sprk7cl7m3ifd5qfbz5d777swhar0wdsl"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "commit": "07bc9343c13809619f2c2229841d690df7f78312",
+   "sha256": "0f5yd86dym98jgf0h4ns6gq22cf9fgk3m382n18kiwpkgzxcdqx0"
+  }
+ },
  {
   "ename": "company",
   "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
@@ -15725,11 +15821,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20240713,
-    303
+    20240729,
+    846
    ],
-   "commit": "31f7ad52e4d353a8b2f0ec7e2c3135c012e500e2",
-   "sha256": "1xj4nghrdns30s8672566gpcbqz22wz6wkchq6g370s76ngmrqhs"
+   "commit": "1321e285a54dfe43cae71f52e58bff4f0c8c161d",
+   "sha256": "0h6hls2w2yl00wqqs187k3zr3g0yjkg7zw7v3g4dsjynkkri55f9"
   },
   "stable": {
    "version": [
@@ -16534,10 +16630,10 @@
  },
  {
   "ename": "company-lean",
-  "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde",
-  "sha256": "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a",
+  "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c",
+  "sha256": "1grfa9944ssbpprrrz77jk6x0r8840kx6cb9pnd4mxwckgb7p2hv",
   "fetcher": "github",
-  "repo": "leanprover/lean-mode",
+  "repo": "leanprover/lean3-mode",
   "unstable": {
    "version": [
     20210305,
@@ -17016,27 +17112,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240226,
-    204
+    20240803,
+    2320
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -18070,11 +18167,11 @@
   "repo": "tralph3/conner",
   "unstable": {
    "version": [
-    20240707,
-    2220
+    20240816,
+    2343
    ],
-   "commit": "583d8288b07f4372b68e1c06917eb77c419c555d",
-   "sha256": "1ix3lrgdhc425kninmq9nly7472nzx9m925c3bpd8bf49pnd7ypk"
+   "commit": "7ea91fb4f1a067a3352ad66b70acfe86c76610da",
+   "sha256": "1av59fgwpp9gvhdlkfxqa20lk0g2vmj9pxdbiwkkvn65jxpn4hml"
   },
   "stable": {
    "version": [
@@ -18108,25 +18205,25 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20240710,
-    2028
+    20240818,
+    1112
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3d7f3d2de22eacb125f56ae5b5af6411bbe00b46",
-   "sha256": "1j6biflxz03ywqnvwiwhpk2x3gscb26q72sxcm8s8p4zkx5wrcwq"
+   "commit": "d403b8bd1b49922de5a8060e79f647db7988ace6",
+   "sha256": "0kwa6vyd54hvlfscjy2i3rc0ln1n7d4614n1hy9vgk5w27iqnnng"
   },
   "stable": {
    "version": [
     1,
-    7
+    8
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fe4852280006e61be7f1374d021ee06155ce5a26",
-   "sha256": "1xvxqv21b0d1c129dc72iajrbyyfibcv8gmv643h388p5wb69msv"
+   "commit": "4889458dccf842ab6223099f8a73ff8b147e9459",
+   "sha256": "06jckxwagpvp4w8hykc0wr90pba9ih8376562g1q93g0nbb3rhrg"
   }
  },
  {
@@ -18348,15 +18445,15 @@
   "repo": "minad/consult-flycheck",
   "unstable": {
    "version": [
-    20240310,
-    1442
+    20240718,
+    1011
    ],
    "deps": [
     "consult",
     "flycheck"
    ],
-   "commit": "754f5497d827f7d58009256a21af614cc44378a3",
-   "sha256": "19smn8wyindw92nvfskg5s889pdc5hn0w9q5z13hmjb8iv2gx9yp"
+   "commit": "3b999ae983900c16c0b5b5c30b7eca640d386a76",
+   "sha256": "108ajqqi0dbcjykippsa6v25bvcc3d17jjyypknznlskch68yw88"
   },
   "stable": {
    "version": [
@@ -18528,16 +18625,16 @@
   "repo": "mclear-tools/consult-notes",
   "unstable": {
    "version": [
-    20240624,
-    1219
+    20240810,
+    1318
    ],
    "deps": [
     "consult",
     "dash",
     "s"
    ],
-   "commit": "9858bb13b54934ea0a95df45947ff40ffde4553b",
-   "sha256": "0kv5hdc3cl7vkr06llyd6dcbddd55rmhhsfr8hzjpmvgw0h317kg"
+   "commit": "6ece62337d6065e88a91b222fac5e252c00a8d53",
+   "sha256": "0jqfybd96wkqcdnwavsp2fzjxmqb7lff8ix23rvq7c1dsgrp0c0v"
   }
  },
  {
@@ -18697,14 +18794,14 @@
   "repo": "titus.pinta/consult-tex",
   "unstable": {
    "version": [
-    20240417,
-    1149
+    20240808,
+    1300
    ],
    "deps": [
     "consult"
    ],
-   "commit": "675755e106f9e64e2c1fd3cf05a43275c09497da",
-   "sha256": "18kz99lmfqr7hm3n3xkp51hi6fibyj2ry6abpl897rl4ky9rabr9"
+   "commit": "9df92b31a8e7ef253667229a4e05153ea13346de",
+   "sha256": "0ipabvybhfk6zzv4q7vvlcpvhr7pxs4shwbvj3bxwr76303ajxvi"
   },
   "stable": {
    "version": [
@@ -19078,25 +19175,25 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20240713,
-    1327
+    20240726,
+    359
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f74d3e7b5aa658663705035aaac2c321bb8ed5cc",
-   "sha256": "1xm04c98kj5qnnjb2kn4ckhsykbvzsgyzp44xh4kma1q76g1glxj"
+   "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a",
+   "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0"
   },
   "stable": {
    "version": [
     1,
-    4
+    5
    ],
    "deps": [
     "compat"
    ],
-   "commit": "cdc3e13ad312f5f12b3f78f842fff0b398eb4473",
-   "sha256": "04vsy5dv3zlid914igyi6ya9hf08ph0hc4c09pbja0z1if4mjrqh"
+   "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a",
+   "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0"
   }
  },
  {
@@ -19136,27 +19233,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240226,
-    204
+    20240803,
+    2320
    ],
    "deps": [
     "corfu",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
    "deps": [
     "corfu",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -20486,8 +20584,8 @@
   "repo": "hlolli/csound-mode",
   "unstable": {
    "version": [
-    20231024,
-    1442
+    20240813,
+    1802
    ],
    "deps": [
     "dash",
@@ -20495,8 +20593,8 @@
     "multi",
     "shut-up"
    ],
-   "commit": "2c9107a78048f16c4e274390eb3021e974372d64",
-   "sha256": "1sfmvqmgvvff56s39jb51sp9b5sz308y99b0xp4galw51s0vm4vq"
+   "commit": "bea3a94f4e1b4d3b32a4ed7943d2beda794908b5",
+   "sha256": "17mq1wkf9rx3idrvn99y2vyylm2xvh9k7288xjl0c6whznaya3zs"
   },
   "stable": {
    "version": [
@@ -20877,11 +20975,14 @@
   "repo": "chachi/cuda-mode",
   "unstable": {
    "version": [
-    20201013,
-    2230
+    20240819,
+    11
    ],
-   "commit": "7f593518fd135fc6af994024bcb47986dfa502d2",
-   "sha256": "0ibap1k70b3c4fnyvgvnqdcxnchqwrpz20k2dk2lw3wgznv3bsx2"
+   "deps": [
+    "compat"
+   ],
+   "commit": "c3dae31b3d1abedf4d0b98840127e2cac73d6ad8",
+   "sha256": "1025v3x4wr8pljjry9dvawyv3yjfs94kvvrn1hjknifq7mfrdwhm"
   },
   "stable": {
    "version": [
@@ -21287,11 +21388,11 @@
   "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
   "unstable": {
    "version": [
-    20240529,
-    611
+    20240813,
+    659
    ],
-   "commit": "cbdabb9ca566cc12403f37f46d4102fe778e2721",
-   "sha256": "1rzmmc40cyg5z5jd8bns7fxb0pkiiiki4cg03wjq415mx7lli5n8"
+   "commit": "9b1676d70edbc2f2788130adfd5797515a5c8538",
+   "sha256": "1fwrf9iy85z1hz1g65k52yyg9z17lmnk4bwci5p6pvcqb8dm2qgm"
   },
   "stable": {
    "version": [
@@ -21431,14 +21532,26 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240112,
-    1749
+    20240814,
+    938
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad",
-   "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c"
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "shell-maker"
+   ],
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
   }
  },
  {
@@ -21489,11 +21602,11 @@
   "repo": "rails-to-cosmos/danneskjold-theme",
   "unstable": {
    "version": [
-    20231110,
-    722
+    20240723,
+    1000
    ],
-   "commit": "b3335e44f468c019c95a8210ce1ed9fe23c65735",
-   "sha256": "19lncwxzxyi73cn7439rk8cvgcj6l4x1kj6fykmw3b18s7rj555f"
+   "commit": "d495ba64e4a9e3e44b028b9fbc3898da3348ffdc",
+   "sha256": "00x2r95xivww43al98w0pak7dh9rrh1vdjhkspyw8cdvq4259s3y"
   }
  },
  {
@@ -21920,11 +22033,11 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20240529,
-    2058
+    20240813,
+    838
    ],
-   "commit": "3852301f9c6f3104d9cc98389612b5ef3452a7de",
-   "sha256": "198xf1ydmgz795a7ffk9s5q4jszy6nrg1d54g1bacipwnq0c654v"
+   "commit": "187699e2d80f6a3b0ec7b2fb2e1d7ece2712208f",
+   "sha256": "0agx20phxdx4wrm4y6zhsin061a6945sdqh5vnqgs4kg1irhan42"
   },
   "stable": {
    "version": [
@@ -22348,11 +22461,11 @@
   "url": "https://salsa.debian.org/emacsen-team/debian-el.git",
   "unstable": {
    "version": [
-    20240704,
-    2138
+    20240727,
+    2230
    ],
-   "commit": "8e41a9b4957b9d56ec6c55ee5d4ce84038d01dd6",
-   "sha256": "1k8w5h0n8imf7w2mnic68rkhb3mhp38nngwzssvmvfilnfb4bmiv"
+   "commit": "232a4b3f20ca7834a8993c4aac2678b7aecca505",
+   "sha256": "1n1c3gnv6svq9v4pji5ry4h6m1kr8gcrdfwrh26l5s61q6bdzk68"
   },
   "stable": {
    "version": [
@@ -22483,20 +22596,20 @@
   "repo": "KeyWeeUsr/decor",
   "unstable": {
    "version": [
-    20231210,
-    1247
+    20240818,
+    1100
    ],
-   "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464",
-   "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93"
+   "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9",
+   "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy"
   },
   "stable": {
    "version": [
     1,
     3,
-    0
+    1
    ],
-   "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464",
-   "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93"
+   "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9",
+   "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy"
   }
  },
  {
@@ -22578,10 +22691,10 @@
  },
  {
   "ename": "defcapture",
-  "commit": "1d636bef32d060df0e0da9dff699436bf949ed3b",
-  "sha256": "1hkbmhirlb1pbpavr61nxzw58a9pjvh0f93abbdf3sqs1lhybbbk",
+  "commit": "4075575ffa0487a8371fb893cf8acdcdf012573d",
+  "sha256": "062y3pna2yx2fi66a3ig2asdd3is5r3a7ki6fqis92rijlh39h0c",
   "fetcher": "github",
-  "repo": "sawyerkirbi/defcapture",
+  "repo": "aaguilarss/defcapture",
   "unstable": {
    "version": [
     20230909,
@@ -22915,15 +23028,15 @@
   "repo": "pprevos/denote-explore",
   "unstable": {
    "version": [
-    20240616,
-    359
+    20240727,
+    804
    ],
    "deps": [
     "dash",
     "denote"
    ],
-   "commit": "242c4d79ee13e9aca4566b552d29c74026b1ff6d",
-   "sha256": "1lgk351d33h0inp9i0vmaz12i57f1l73yswlipd59mpjvdzg04fa"
+   "commit": "ffa666846ab1c890b9475a13c196d9ab7511cbe4",
+   "sha256": "0sj6bpdsyxwp5axprmnhrnybphrmq6d4kh1gass13hkaxdg2f63r"
   }
  },
  {
@@ -23403,11 +23516,11 @@
   "repo": "ideasman42/emacs-diff-ansi",
   "unstable": {
    "version": [
-    20240616,
-    2345
+    20240818,
+    2359
    ],
-   "commit": "0338970469375eadd3c0e492997aec2fcb06bb27",
-   "sha256": "1mjazx6zcskijijdrgm0iqdi2kii01q2j1b6ifwdzg8c9pr7swmq"
+   "commit": "8edf92e34058f49788a085f490ad7ff169ef0d72",
+   "sha256": "17dm7b909j92hlfdz97k12mg7z71xvm9kncip36szflqrm14q33h"
   }
  },
  {
@@ -23433,26 +23546,26 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20240702,
-    2020
+    20240802,
+    2316
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a942b2383db0dc16df389611b84031c29d5c17ed",
-   "sha256": "1i4wgf0mb7c0w2i1zkapds6gbs2njr7ddpfh9g2a7yfjlpb9hyln"
+   "commit": "b80ff9b4a772f7ea000e86fbf88175104ddf9557",
+   "sha256": "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw"
   },
   "stable": {
    "version": [
     1,
-    9,
-    2
+    10,
+    0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5",
-   "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s"
+   "commit": "b80ff9b4a772f7ea000e86fbf88175104ddf9557",
+   "sha256": "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw"
   }
  },
  {
@@ -23598,11 +23711,11 @@
   "repo": "retroj/digistar-mode",
   "unstable": {
    "version": [
-    20240613,
-    225
+    20240814,
+    1546
    ],
-   "commit": "1a02a4773d1380d8cab44f5e342a1e9bcc7276e8",
-   "sha256": "0x0927zfhxx25xplyifnq4qg76ahifk9m51dqqqyahnf9rpljrhl"
+   "commit": "2d7e1a11304399f4a625053ffce8a3ad05f4ec7f",
+   "sha256": "1cybl34n18ib051lq5mnrg5f1b8j5rys2bly82x6a5ic640288dn"
   },
   "stable": {
    "version": [
@@ -23731,26 +23844,26 @@
   "repo": "tarsius/dim-autoload",
   "unstable": {
    "version": [
-    20240712,
-    2215
+    20240805,
+    1309
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9d08ecf4f8b00e53093864a59b51f58e4fb6ae4b",
-   "sha256": "18mp2ls5fs1kjg6wd11gkyqn9x83hkzqzq1djjssbh65z5ln6qd9"
+   "commit": "dbe0f038c0a7fcc7e0f021947a42db5b0e8f143d",
+   "sha256": "1mj1h0j6sdb5c7ylcks51xn69003l0j12kifwz7cmwrhv55g54az"
   },
   "stable": {
    "version": [
     2,
     0,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bb57bf5367b48862864f0dea4287fa81d51a0d5e",
-   "sha256": "0li7s5ny3w75k1r11bsh5psc9d0a3r9ap909brcldrpnp567wvq6"
+   "commit": "dbe0f038c0a7fcc7e0f021947a42db5b0e8f143d",
+   "sha256": "1mj1h0j6sdb5c7ylcks51xn69003l0j12kifwz7cmwrhv55g54az"
   }
  },
  {
@@ -23894,6 +24007,30 @@
    "sha256": "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"
   }
  },
+ {
+  "ename": "dir-config",
+  "commit": "6b4cfc97f1fa63011ed08eca66d415b1b5fce96a",
+  "sha256": "1vhsrsai0kgw0q06i4km6bx9dp6wc352qvkjb8d4yab989ypqn7g",
+  "fetcher": "github",
+  "repo": "jamescherti/dir-config.el",
+  "unstable": {
+   "version": [
+    20240819,
+    1747
+   ],
+   "commit": "d070df87aa5872c9d36e20e6f10b1b2a6642e1fd",
+   "sha256": "1wnlp35wz7gyywxvb1lmj8b0sqnav0dl9n034wf5sd1n01abmdap"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "commit": "5cbc2655a5ee734a4747a1b580e331e88c720737",
+   "sha256": "13flkflgbbh41zr0x378hpcnvkbyld5qa2asr76087dd238ygxhz"
+  }
+ },
  {
   "ename": "dir-treeview",
   "commit": "763f2c1d932d6f415fb2e0be0ef514406fa74151",
@@ -24255,11 +24392,11 @@
   "repo": "mattiasb/dired-hide-dotfiles",
   "unstable": {
    "version": [
-    20210222,
-    1919
+    20240727,
+    1720
    ],
-   "commit": "6a379f23f64045f5950d229254ce6f32dbbf5364",
-   "sha256": "0cwsjndvnv9a62ism7ckj27jdqx362947lyizka78qvmv369avv3"
+   "commit": "0d035ba8c5decc5957d50f3c64ef860b5c2093a1",
+   "sha256": "0c2qb2jnwzgv55qki4lciik6xm32xj1w183ngv7gy4inmr5shz4h"
   },
   "stable": {
    "version": [
@@ -24371,11 +24508,11 @@
   "repo": "thomp/dired-launch",
   "unstable": {
    "version": [
-    20240417,
-    1903
+    20240809,
+    1910
    ],
-   "commit": "933aa6b921010c9d33ddf18f48c8ce780443f963",
-   "sha256": "0al5pglxj12l13j849m4khgyq43nzrnsahn5n7d9a3pkrqhjwqkq"
+   "commit": "31066f860735325a284c12a2f79c51a640d13556",
+   "sha256": "0y4gl6krwbr5g8ac6qfxygd8h9wqx0cw51np5nga3zwnh9z8x766"
   }
  },
  {
@@ -24520,14 +24657,14 @@
   "repo": "xuhdev/dired-quick-sort",
   "unstable": {
    "version": [
-    20240411,
-    229
+    20240805,
+    545
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "d50b910baa716dfcf4830f1c08226c92bcaee7f6",
-   "sha256": "143rgmf4bn4mcfx3g4pa5qcd6ij4zqrn86qnhm0bffmd2x6pljsb"
+   "commit": "eaeab1021b391e3d6275ba7c186c5ac95fb8a10e",
+   "sha256": "1sxdiw1qwpr49a0l2q899r78mnwcwqhj4dfs22261acw7ifk07yb"
   },
   "stable": {
    "version": [
@@ -25793,8 +25930,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20231110,
-    1006
+    20240805,
+    1313
    ],
    "deps": [
     "aio",
@@ -25803,8 +25940,8 @@
     "tablist",
     "transient"
    ],
-   "commit": "2def2ab7fa04ed14403d00e3547a94c3822302cb",
-   "sha256": "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460"
+   "commit": "d837c7dfc6c5a949f19e9d673a4ac70b960d282e",
+   "sha256": "09fyd6affgp7rfzfviw1qqqfpizkpyh0dl5pk7ck1ha1m2dymna0"
   },
   "stable": {
    "version": [
@@ -26194,16 +26331,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20240625,
-    230
+    20240816,
+    749
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "1505c13564b83e44d3187611e326a48b742cad3a",
-   "sha256": "1scq3ahqg6s7ccvd0gs0m2ifa8k9rzflaslz3lmp0i7kmv1prs49"
+   "commit": "37fc5cfe4cc8487e82942cf8478c4e42eb0a95bd",
+   "sha256": "104k3mj44qhb6m3bi3h84zgqrncfbhcc4frlig1ikbzpybmlxyi3"
   },
   "stable": {
    "version": [
@@ -26247,14 +26384,14 @@
   "repo": "doomemacs/themes",
   "unstable": {
    "version": [
-    20240712,
-    1822
+    20240809,
+    2135
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2c794a09b023bda09d2f36a7be80684f4e416d88",
-   "sha256": "16mhcbnk8cv0lacl9wycbj1d1i2brrb3vf6lb4hxyici5qlfyykh"
+   "commit": "c589b245d643dcc5ec93054ea436efc5255f9b88",
+   "sha256": "1dqcfh72x87lyx8f60nl25k7x9vdvgncl3a0cv952p022rclry00"
   },
   "stable": {
    "version": [
@@ -26474,14 +26611,14 @@
   "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
   "unstable": {
    "version": [
-    20240626,
-    1953
+    20240727,
+    2303
    ],
    "deps": [
     "debian-el"
    ],
-   "commit": "dbebf6fc2c50facff195ae9fb14bf691ad0f4544",
-   "sha256": "0pj2sjj0dnv12m982icaqf93bnklaab4wg96bbyzhiji981yjs2x"
+   "commit": "eb00c58726be5e914b2487bccf7e3f716e7a61e1",
+   "sha256": "0by13757bxq794b1c11all0yd418mwjb0az70pf3m4lq6j9kn6pm"
   },
   "stable": {
    "version": [
@@ -26685,26 +26822,26 @@
   "repo": "arnested/drupal-mode",
   "unstable": {
    "version": [
-    20220125,
-    1044
+    20240816,
+    1236
    ],
    "deps": [
     "php-mode"
    ],
-   "commit": "17927723adc5921e8058f7c29e5e50e88b975639",
-   "sha256": "1j0zlcjrz0pswcc8wh476vx503qvlyzjscwh0gs3cfss8j6r6gd5"
+   "commit": "3f91d1d44df11ebd0137a896055fca6a1bb2f554",
+   "sha256": "0gia6qrzdai0qa903gnxvnfn5mnva577jdf8zccz3i3f2ki02ygb"
   },
   "stable": {
    "version": [
     0,
-    7,
-    3
+    8,
+    1
    ],
    "deps": [
     "php-mode"
    ],
-   "commit": "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71",
-   "sha256": "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"
+   "commit": "a353f8bdf3ed98f76b9418afbbc4ef17b5552647",
+   "sha256": "0gia6qrzdai0qa903gnxvnfn5mnva577jdf8zccz3i3f2ki02ygb"
   }
  },
  {
@@ -26844,11 +26981,11 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20240623,
-    2118
+    20240714,
+    543
    ],
-   "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c",
-   "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"
+   "commit": "a8aa356684804c52f26602d4e315f1306c6f3e59",
+   "sha256": "1bbgpljx6cqbcx9j35k1rid8bb2cydpkcssbh126pic53ng83iln"
   },
   "stable": {
    "version": [
@@ -27121,11 +27258,20 @@
   "repo": "xenodium/dwim-shell-command",
   "unstable": {
    "version": [
-    20240712,
-    859
+    20240818,
+    1615
    ],
-   "commit": "715f0ae8cfe455f1dc611074bb8bb90e03533dab",
-   "sha256": "0gjz3sliwdxgsvd2c1chmqfzwzk1bbflb7qn8gc3ims1fwjhz0jc"
+   "commit": "2a97a027a0bb1c48fc2004d6e9ae4340522a9bfc",
+   "sha256": "1vb1irv81hzzpbdhgzxmq9zdfih1w9ckri9db4pfciy54gcsbwk8"
+  },
+  "stable": {
+   "version": [
+    0,
+    62,
+    2
+   ],
+   "commit": "7d1c45aa2bc782c448cadd989dc776c2e5f83514",
+   "sha256": "0iy4pg86sl1z3mwnfm6nsy9gjanddbpyg9w099wvflpq0l54lm0g"
   }
  },
  {
@@ -27847,6 +27993,36 @@
    "sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq"
   }
  },
+ {
+  "ename": "easysession",
+  "commit": "3e9ed8efcc22219b1d4fb804521a47670b7668d3",
+  "sha256": "0k540y7vp5cb378fh3nn15f29551rj1b47dw4ambjn8gl0c0x7jq",
+  "fetcher": "github",
+  "repo": "jamescherti/easysession.el",
+  "unstable": {
+   "version": [
+    20240814,
+    1817
+   ],
+   "deps": [
+    "f"
+   ],
+   "commit": "7bf893a307be84af43c00fa6b9eed2e4f9d920b8",
+   "sha256": "1mg6kkvgdb8fwbmw2ipb1jmrm4gdmkl62cdqr045mii5vkpmpmmf"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    5
+   ],
+   "deps": [
+    "f"
+   ],
+   "commit": "3558bcf052e5cd9936ffd2a0d648d991a35581bd",
+   "sha256": "18ga3sq8jfyp4y7w16hkpbvlpmshv5la3ajgvagmanlqg3q81pys"
+  }
+ },
  {
   "ename": "ebdb-mua-sidecar",
   "commit": "14ce9b9c023ca8d3b42485253212c65e50a5e352",
@@ -27920,15 +28096,15 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20240618,
-    1008
+    20240723,
+    1149
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f",
-   "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"
+   "commit": "5ea510a1e4ab17a442352d0212777da5f78d4be2",
+   "sha256": "080n9k0r9w4hdcg5g89blyyr0c6q2jhwqn42fvizn6z8xkkn5cbp"
   },
   "stable": {
    "version": [
@@ -28495,14 +28671,11 @@
   "repo": "editorconfig/editorconfig-emacs",
   "unstable": {
    "version": [
-    20240604,
-    602
+    20240813,
+    801
    ],
-   "deps": [
-    "nadvice"
-   ],
-   "commit": "0ce1abc65bfb030ccec97b0d4231667ca431e663",
-   "sha256": "1kxj0srq9f6ibhdd25428585h5v73xgdf5wq95qlz2r4vshmpxw0"
+   "commit": "648f0cf9aeb72db77b252832a58367332b7bc055",
+   "sha256": "03fms46mfdqi9czp1nkccm9zpi1g5n41djfh299phs4sz8nl19lk"
   },
   "stable": {
    "version": [
@@ -29247,28 +29420,28 @@
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20240506,
-    419
+    20240818,
+    437
    ],
    "deps": [
     "llm",
     "triples"
    ],
-   "commit": "c23f6672fa1075d11e942dffc1c37701731b94f0",
-   "sha256": "0s0cdvifxiz0r4widbcqlg19mcnxkhpcbgibi0c4p9n1iaqc1bfp"
+   "commit": "789cb6d954e0b31f8c25cc0bfa84ba812820f5cf",
+   "sha256": "0klwjc2k0kmbqpija9r4cjmdnf1j58n1gmmhqdp123q22pk4d96y"
   },
   "stable": {
    "version": [
     0,
-    5,
-    1
+    6,
+    2
    ],
    "deps": [
     "llm",
     "triples"
    ],
-   "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539",
-   "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6"
+   "commit": "00ae22d95ee7a006214589b905fc9b7e268141b2",
+   "sha256": "1hfp2v3d6wgbi8v53da72yanqrksyqygmqq6wkfhz896h21fi99j"
   }
  },
  {
@@ -29740,11 +29913,11 @@
   "repo": "Mstrodl/elcord",
   "unstable": {
    "version": [
-    20240305,
-    2138
+    20240815,
+    30
    ],
-   "commit": "e2775f40ec55dfdceea83d535dff77d60534b6bc",
-   "sha256": "0dw5vf6iqncs12x494z5cj7ym9daxaa9ldzbja7vgzkdyy82yvp4"
+   "commit": "252019e21d7de9c06124f4ceddae324b477a64b8",
+   "sha256": "1bvscz7v17p9f03n9mmxqwvnfp316f2z90h8zrd6fyvcafbw3af5"
   }
  },
  {
@@ -29789,11 +29962,11 @@
   "repo": "vilij/slurpbarf-elcute",
   "unstable": {
    "version": [
-    20240708,
-    1910
+    20240724,
+    2106
    ],
-   "commit": "625da6298f7128204de7464d6e2df298741f784f",
-   "sha256": "1g6gajikz1g9hni15r2sa206208q1v23d9yryrr7vrp8my1n72d4"
+   "commit": "b604f934c0c919f5eb0155e38202875b796ac4de",
+   "sha256": "1ba6kf4fzjzcz30sv5976c4p25wd4xavw8hyh50hyyi4zsaqxdp6"
   }
  },
  {
@@ -30179,20 +30352,20 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20240331,
-    1348
+    20240729,
+    1741
    ],
-   "commit": "5c05a1eab37bc113ecb158a4d57fe05352fa2c6a",
-   "sha256": "1ir9vp2629dg3gxhlrf043gwbbf093p08q4igvx2r9hh6kraca5c"
+   "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1",
+   "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"
   },
   "stable": {
    "version": [
     3,
     4,
-    1
+    2
    ],
-   "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
-   "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
+   "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1",
+   "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"
   }
  },
  {
@@ -30487,28 +30660,28 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20210226,
-    258
+    20240729,
+    1741
    ],
    "deps": [
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
-   "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
+   "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1",
+   "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"
   },
   "stable": {
    "version": [
     3,
     4,
-    1
+    2
    ],
    "deps": [
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
-   "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
+   "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1",
+   "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z"
   }
  },
  {
@@ -30597,8 +30770,8 @@
   "repo": "s-kostyaev/elisa",
   "unstable": {
    "version": [
-    20240712,
-    1639
+    20240721,
+    1247
    ],
    "deps": [
     "async",
@@ -30606,14 +30779,14 @@
     "llm",
     "plz"
    ],
-   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
-   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
+   "commit": "85373924896c92b7c27d6737d247f0084df99d6a",
+   "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    4
    ],
    "deps": [
     "async",
@@ -30621,8 +30794,8 @@
     "llm",
     "plz"
    ],
-   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
-   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
+   "commit": "85373924896c92b7c27d6737d247f0084df99d6a",
+   "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q"
   }
  },
  {
@@ -30633,11 +30806,11 @@
   "repo": "ideasman42/emacs-elisp-autofmt",
   "unstable": {
    "version": [
-    20240616,
-    2345
+    20240801,
+    1325
    ],
-   "commit": "98edd8158b778ff9a0e34b5c6615523c0035f8d6",
-   "sha256": "11p41lpw0vvbwm3mshmhqmgqs39b9lmrba45im0hwfpa9wcmx73z"
+   "commit": "43a44dcbd17adf3b235de93e748321c7076f1c3c",
+   "sha256": "1c03qssa74jrsszcsvz1whj5md5vcdximxg8yfyq0s3spld8bs2n"
   }
  },
  {
@@ -30947,30 +31120,30 @@
   "repo": "s-kostyaev/ellama",
   "unstable": {
    "version": [
-    20240710,
-    2027
+    20240721,
+    1138
    ],
    "deps": [
     "compat",
     "llm",
     "spinner"
    ],
-   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
-   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
+   "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb",
+   "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl"
   },
   "stable": {
    "version": [
     0,
     11,
-    9
+    13
    ],
    "deps": [
     "compat",
     "llm",
     "spinner"
    ],
-   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
-   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
+   "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb",
+   "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl"
   }
  },
  {
@@ -31712,28 +31885,28 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20240712,
-    2216
+    20240805,
+    1311
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "1159333ab9a09eaf32b3ab4fe10e4e7cea5a1a64",
-   "sha256": "1976vnpfpk4bz5pw7abh2624dwjwn0bfyf7fyb75djr4yg3g1bjy"
+   "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda",
+   "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k"
   },
   "stable": {
    "version": [
     2,
     0,
-    2
+    3
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "bb621713e2a111be5d2e3c45f4d168ccc8dd6fcd",
-   "sha256": "071x09yh7zaqpm3yphs6gn3lj1yxxzqlh5lf2rzykhnl6241pmv5"
+   "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda",
+   "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k"
   }
  },
  {
@@ -31793,185 +31966,170 @@
  },
  {
   "ename": "emacsql",
-  "commit": "2e40e3364a5dec38672753093c28ae97d85de189",
-  "sha256": "0chvx5y58zabp690fvxxizmvc8px62vqb88xq0s1qmi4k7w08bad",
+  "commit": "d3a5173a519b5b6d3dc37a8ff62d3c0e2dad8dff",
+  "sha256": "1jmci7m6my4w0k5xl1bhw2fa3f21546mf51lg13dmkjk7608bvy5",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240623,
-    1340
+    20240819,
+    1559
    ],
-   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
-   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   },
   "stable": {
    "version": [
-    3,
-    1,
+    4,
+    0,
     1
    ],
-   "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85",
-   "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-mysql",
-  "commit": "f7e6b437ceaaba30f84580656fcaee728332bece",
-  "sha256": "01zs7cprfjcjmw661k8c88nvp2lk7ynvhgbj9n24p8m042p4jj4v",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "1bpi5iqfydcii7di990l5nskgxk0cqg6zg1yddadbdfdznsi37hm",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
   },
   "stable": {
    "version": [
-    3,
-    1,
+    4,
+    0,
     1
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85",
-   "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-pg",
-  "commit": "f7e6b437ceaaba30f84580656fcaee728332bece",
-  "sha256": "0p3kq642lgjqfhfk1dfa15wfi0axb1zq9g7n75ci0p4fi761i020",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "0pryfj9wi3kd6cbxnh8wwgyxhj17ihnic26a9a21rd769m2bsg5a",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql",
-    "pg"
-   ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
   },
   "stable": {
    "version": [
-    3,
-    1,
+    4,
+    0,
     1
    ],
-   "deps": [
-    "emacsql",
-    "pg"
-   ],
-   "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85",
-   "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-psql",
-  "commit": "f7e6b437ceaaba30f84580656fcaee728332bece",
-  "sha256": "10fxnb0l5y0l39yry6y3gshnaml19m62ii72770sdcfqi2llm3hw",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "1kgpmjc81y1851cwn3z2hfs4ia3hllh5b7h7iw5kzpb44kpicqpl",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
   },
   "stable": {
    "version": [
-    3,
-    1,
+    4,
+    0,
     1
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85",
-   "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-sqlite",
-  "commit": "f5f22149f13c361f6657d41f4a22ede651eaaa25",
-  "sha256": "0323bvxrg7sgkb8fpi96b7ks4ypgxgxkryk0ccx0wsjp2v87kajb",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "1dxc8iyshlg5k4hn3alpg4wwfs138f0i65bdjj9rlwl6qinxq0ab",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240623,
-    1340
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
-   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
   },
   "stable": {
    "version": [
-    3,
-    1,
+    4,
+    0,
     1
    ],
-   "deps": [
-    "emacsql"
-   ],
-   "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85",
-   "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-sqlite-builtin",
-  "commit": "62abfe3f85904858c9a1651ab98df763612f1b51",
-  "sha256": "10v2bf0av7li9q90csa6b478hjhfq83kr7laqvrcxxdx4kwi6cr3",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "0yyabz7ai276lhqyc9w7jac8rky96635p34jy9bssh3nq2l99b9b",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
+  },
+  "stable": {
+   "version": [
+    4,
+    0,
+    1
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
   "ename": "emacsql-sqlite-module",
-  "commit": "62abfe3f85904858c9a1651ab98df763612f1b51",
-  "sha256": "1nhwc1yk0w3sa9x454j8gyi77h2d31dzvfph56xvfaa7r5i4a0j0",
+  "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932",
+  "sha256": "07flj471cxdbhx4z8qzqghgk0n4y72mnw947ighasg9042564vqs",
   "fetcher": "github",
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240808,
+    2016
    ],
-   "deps": [
-    "emacsql",
-    "sqlite3"
+   "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e",
+   "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3"
+  },
+  "stable": {
+   "version": [
+    4,
+    0,
+    1
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "e5f0928a047dba8e3a00b6333400422b301bac35",
+   "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf"
   }
  },
  {
@@ -32078,14 +32236,14 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20240607,
-    2213
+    20240724,
+    1801
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013",
-   "sha256": "1l8jqvcn61a1lzclq77z82645f7qsq7i61f9rknwbdwxb9aaidij"
+   "commit": "19a13e344e04bbf861eaa74491b23da52b398672",
+   "sha256": "1w9xr6dq625mnpzzxlkkkln5mmf85msjzm4nqgxh910xslk1xbrr"
   },
   "stable": {
    "version": [
@@ -32107,16 +32265,16 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20240419,
-    452
+    20240717,
+    2103
    ],
    "deps": [
     "compat",
     "consult",
     "embark"
    ],
-   "commit": "195add1f1ccd1059472c9df7334c97c4d155425e",
-   "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg"
+   "commit": "4ddbe6326bc596a05b574cf0109acdb5a79bc748",
+   "sha256": "0919drkk78ksqar8a9k2k9n84aq7fhmx5cpdbc3kqrwsyf3g8alm"
   },
   "stable": {
    "version": [
@@ -32728,28 +32886,28 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20240712,
-    2241
+    20240818,
+    1845
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
-   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
+   "commit": "4bb96d112cab80a7c3a2cdf24e9457c313a9e3d2",
+   "sha256": "0j9qqmyszbaizzz6fwnkf0640wivjav1l3lqa0myi3spby3abnqn"
   },
   "stable": {
    "version": [
     4,
-    4,
+    5,
     0
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
-   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
+   "commit": "ccfe44bbfa79a2a4d2cab06b807d494d4e85d45b",
+   "sha256": "1qwbxhdcl2vvdf0sjgl1iafh47rgbabzmjjwg6jq32p7q64pw6dr"
   }
  },
  {
@@ -32894,11 +33052,11 @@
   "repo": "zenspider/enhanced-ruby-mode",
   "unstable": {
    "version": [
-    20221011,
-    1957
+    20240724,
+    1809
    ],
-   "commit": "7e76d754e1632b4fc9a024fa393c3fc837bcc86b",
-   "sha256": "1gc2kgvnzq6m6hswcvsd4c00xywi2phdnr121r53kvsv46avrq9z"
+   "commit": "69484d6cf0cb2d8bb1f873319bd7c448cb7add33",
+   "sha256": "00fcy97sfyac0c38xcq18zm3qcw2wvqa6149h617c4hlq9rx1lh8"
   },
   "stable": {
    "version": [
@@ -33198,14 +33356,14 @@
  },
  {
   "ename": "epkg",
-  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
-  "sha256": "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww",
+  "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7",
+  "sha256": "1p9l23c9ym306n1nlap2hvx9fy75pkx36cw2l467v954rj2ja5qa",
   "fetcher": "github",
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20240712,
-    2216
+    20240818,
+    1954
    ],
    "deps": [
     "closql",
@@ -33213,20 +33371,23 @@
     "emacsql",
     "llama"
    ],
-   "commit": "e864055a1916a54127050fbb50f07614e2f6319b",
-   "sha256": "0d0y50dacjg6jwz1vn8hmacighn0q7g1h15pwh32gd9qakmp15z1"
+   "commit": "b0003f88afae8b9843e77149c1b1284f7ec4de33",
+   "sha256": "0mffnxs5wwjx6vm82i4217kr8dwkylhdf7cpq5zqvbygs4p7sfhg"
   },
   "stable": {
    "version": [
-    3,
-    3,
-    3
+    4,
+    0,
+    0
    ],
    "deps": [
-    "closql"
+    "closql",
+    "compat",
+    "emacsql",
+    "llama"
    ],
-   "commit": "3075b621a56f13a93337e2f04aea3565b625b8de",
-   "sha256": "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7"
+   "commit": "e14d2b4808631d37faac1ff1c7f962d60ec28825",
+   "sha256": "0w06bpwbwsl3diypywfzrwp6l0kr3h34xja34xssym2bmdl11z8p"
   }
  },
  {
@@ -33237,8 +33398,8 @@
   "repo": "emacscollective/epkg-marginalia",
   "unstable": {
    "version": [
-    20240712,
-    2216
+    20240808,
+    1951
    ],
    "deps": [
     "compat",
@@ -33246,14 +33407,14 @@
     "llama",
     "marginalia"
    ],
-   "commit": "11e551187b7fa37aa8989bee50939ed0adbacdeb",
-   "sha256": "1mplkpm7h33g0y3p98kcywyrw6k0xvyrwjpy1xkiswlwknmvx51i"
+   "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92",
+   "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8"
   },
   "stable": {
    "version": [
     0,
-    1,
-    2
+    2,
+    0
    ],
    "deps": [
     "compat",
@@ -33261,8 +33422,8 @@
     "llama",
     "marginalia"
    ],
-   "commit": "f5eda857a99d02aad9e89bd80c327930e815fc8a",
-   "sha256": "04z5xgcrl2q37fgr9bb1fwnspnn7zq5svmfkfslfmzbb3klvdkcw"
+   "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92",
+   "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8"
   }
  },
  {
@@ -33362,20 +33523,20 @@
  },
  {
   "ename": "equake",
-  "commit": "2a4a0ec11a9c720d7ed90addcb31d0a9d5594f5b",
-  "sha256": "17r10d3acmhixbi24k19rx720qi8ss4v53n107arqmr04rkd1v2y",
-  "fetcher": "gitlab",
+  "commit": "7408152ad61656aee13c94678c76eb0a07baae37",
+  "sha256": "1kxybrzlhcpnjh7ikg2qdi71wj2m7j7gwka3ajk9s9039m9r5a2r",
+  "fetcher": "github",
   "repo": "emacsomancer/equake",
   "unstable": {
    "version": [
-    20220627,
-    2248
+    20240801,
+    1619
    ],
    "deps": [
     "dash"
    ],
-   "commit": "7aa2e1715e6ea286b08bb446d2d9915afa0fdf03",
-   "sha256": "11wag6sgfr62yj4zjr9n71kxd3kfa105l0rpbag47qmac2wsg7h5"
+   "commit": "2506c058fc8cc51539e80d093c9bcdac87720216",
+   "sha256": "0p8b016kqnxhvpb74p54s156qqvrvw20j67if5484y4lkdzispjs"
   }
  },
  {
@@ -33810,15 +33971,15 @@
   "repo": "ergoemacs/ergoemacs-mode",
   "unstable": {
    "version": [
-    20240129,
-    1407
+    20240809,
+    2246
    ],
    "deps": [
     "cl-lib",
     "nadvice"
    ],
-   "commit": "095129648e9846fbda1f585806de39c12e82f37e",
-   "sha256": "0bwvfgrn44hwswnmkhb3qsvgmaphh4c9vxwdy1rrj9x11n0c54z1"
+   "commit": "3c9081fe83f70cf791abc98d6b9184f8ea7fb714",
+   "sha256": "19r0gin181cmaip2jjm0j5kj6b8sba4lgqb37pyg0zvq5z7mjjf5"
   },
   "stable": {
    "version": [
@@ -33870,12 +34031,11 @@
   "stable": {
    "version": [
     2,
-    6,
-    4,
-    3
+    7,
+    0
    ],
-   "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c",
-   "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy"
+   "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe",
+   "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8"
   }
  },
  {
@@ -34950,11 +35110,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20240516,
-    811
+    20240803,
+    1733
    ],
-   "commit": "f307097eac4d182986ed200924f92f14210a7c46",
-   "sha256": "08cnnmzj0da0vwv8m4cszhk0yy347pmqjmld7cvzn9xvqpghkmxv"
+   "commit": "950bf61054bd96d2203ac0457792c0af8dfba721",
+   "sha256": "19b88yd09rxrljfbai8q5hqcdpnsx8pjxkprzprk1smaqc4ppifg"
   },
   "stable": {
    "version": [
@@ -35566,11 +35726,11 @@
   "repo": "mekeor/evenok",
   "unstable": {
    "version": [
-    20240627,
-    2213
+    20240718,
+    723
    ],
-   "commit": "0f3291547de570ce8f03326443bf65452e848fd7",
-   "sha256": "1gf611r3vaq03gf696c2ig7idvxz0k52nji9w08rcmg1qwbl09va"
+   "commit": "2963a451b12c3287879e3872dcc85c9ac476ac3d",
+   "sha256": "0sqgyks726lsy3lqasvkkm10pvm57s8ksj4d6qrvcnn43h7g54yq"
   },
   "stable": {
    "version": [
@@ -35613,15 +35773,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20240712,
-    2240
+    20240810,
+    1655
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "fc993435bbb3c486bdf0666298e2204ec170880b",
-   "sha256": "09a7kl45sj1wxlz8abir2c4d8whmf4kcbv2baldqj80jbljfvpyd"
+   "commit": "5db0bdc7dcd9300b983526d37cbe480f35e36211",
+   "sha256": "1vq7ks1j7h3h2x51mf64pph0ix5jnl6qfpvp3lvvy6wsrcvnmf07"
   },
   "stable": {
    "version": [
@@ -35814,15 +35974,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20240711,
-    1239
+    20240817,
+    2119
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "28d64031ff58871828a0dec25ef437beb9371337",
-   "sha256": "0zm7mgcapkc6nhn531qxnv8wsr5zvhhpd966yfi5f6nwhj7yv10l"
+   "commit": "772571fc6762b6cd1d35cc869e266de9a5c6022b",
+   "sha256": "196j1jnshb5skbngqisb43im0cl6s2fgpbxgwasyrxhingpzaj8i"
   },
   "stable": {
    "version": [
@@ -36513,6 +36673,35 @@
    "sha256": "08ycwss58zh2zikk79jfj074q78yjcd7vbjgv5ssqvws09x5rgfq"
   }
  },
+ {
+  "ename": "evil-neo",
+  "commit": "15650a2fbc95c50bb09bb38a3f6d875a3f91d56f",
+  "sha256": "1p1kjyvwhwsmbd28i77fvs6xk98a1zlnq26fnv041vqs62dj7n5i",
+  "fetcher": "sourcehut",
+  "repo": "p-conrad/evil-neo",
+  "unstable": {
+   "version": [
+    20240721,
+    1241
+   ],
+   "deps": [
+    "evil"
+   ],
+   "commit": "18f115a0ddc12a0930f0eb2f9f119b190c71017e",
+   "sha256": "0lkdl2g8h8sada4g3rzh8kcl14y5kidqy3fynmpjk17s3rv97747"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "evil"
+   ],
+   "commit": "18f115a0ddc12a0930f0eb2f9f119b190c71017e",
+   "sha256": "0lkdl2g8h8sada4g3rzh8kcl14y5kidqy3fynmpjk17s3rv97747"
+  }
+ },
  {
   "ename": "evil-nerd-commenter",
   "commit": "a3e1ff69e7cc95a5b5d628524ad836833f4ee736",
@@ -38117,11 +38306,11 @@
   "url": "https://repo.or.cz/external-dict.el.git",
   "unstable": {
    "version": [
-    20231129,
-    1043
+    20240817,
+    149
    ],
-   "commit": "17807ac7e671b44da495e7e3fac5b8cb72a25feb",
-   "sha256": "1vb6xpwpvr0ly36rzbk7hvxxmr33yb0sif0x0sc5ld4zigr23xl6"
+   "commit": "0399b1c086417030f914bd26fff636dfdd55833a",
+   "sha256": "032ydp8vcl576hamq16wwmk6fl2j13yp6bimsscxjjz0lwiwsr39"
   }
  },
  {
@@ -39170,11 +39359,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20240502,
-    1555
+    20240721,
+    1732
    ],
-   "commit": "b07a726f4d8b6e7f69fdf7f2105abfa5707680dc",
-   "sha256": "129s957d4g288x75x1ixb4i8g6nbf2y032jj4minzhn51627cy88"
+   "commit": "f4bd34e1c3b14313c20af94dd34430b40c0ef35f",
+   "sha256": "1wfk3blx89afdllr47xgqz2ikfl8ya3lblrfwdydwcnbhv2jvq7w"
   },
   "stable": {
    "version": [
@@ -39710,8 +39899,8 @@
   "repo": "LaurenceWarne/finito.el",
   "unstable": {
    "version": [
-    20240219,
-    2059
+    20240818,
+    1003
    ],
    "deps": [
     "async",
@@ -39722,8 +39911,8 @@
     "s",
     "transient"
    ],
-   "commit": "b4f1c776e3a6cda2f51dd71e55f72de6fd3c1dcf",
-   "sha256": "1qrr86xdf9dh7nwlsri5s2i27ynrwj2b3pqcyab3g49qdd2gwnx6"
+   "commit": "9ad22dbf34574c5d6070724eba0d22350b347e6b",
+   "sha256": "1vigknjchsz60pg9qgx95h3xkng5yhrn118rdldsyv03725ld7h8"
   },
   "stable": {
    "version": [
@@ -39882,11 +40071,11 @@
   "repo": "Anoncheg1/firstly-search",
   "unstable": {
    "version": [
-    20240408,
-    556
+    20240804,
+    955
    ],
-   "commit": "2045d990509074a8151c8a27db50e477d254aa31",
-   "sha256": "1xaddr6zgnif4gng8sdqfsxckh2k35yblpn3mirz6zw7iyd46zs3"
+   "commit": "d2f58ef2411f664617e8164a1c8d036541f57cef",
+   "sha256": "035sh3nbdjdg7mg69mrykgz4gfy3rf5i70d2yraznazbzyab7nx9"
   },
   "stable": {
    "version": [
@@ -40306,15 +40495,15 @@
   "repo": "plandes/flex-compile",
   "unstable": {
    "version": [
-    20231219,
-    2113
+    20240729,
+    1757
    ],
    "deps": [
     "buffer-manage",
     "dash"
    ],
-   "commit": "817dd32411748682c13f752786b901041a470504",
-   "sha256": "0c2ysf7asb840xdf5x255r18c2v3j93bgjxsf5wsbgvykx21za00"
+   "commit": "335f6f2e9abb5b5bc1ccabf1136688a3a4e851b6",
+   "sha256": "077q93apmaibia9wr61zi3vzw43sj9y8vbicpnyq4s4cqj72hplv"
   },
   "stable": {
    "version": [
@@ -40668,11 +40857,11 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20240703,
-    1352
+    20240726,
+    456
    ],
-   "commit": "eb29cd8b4adb211226e2b87eac49b8d5fb169c55",
-   "sha256": "1rnn63vwy8fx3g578zlqipffr0w0zl43mmzz0bgdafr4mal4ac5x"
+   "commit": "7a6398ea3538a898eba0276f0f89b2f878325a89",
+   "sha256": "12y29m1gp0gdq8lfc2cd80869xsyasgsp4n2ck8rn4h164bnnn4q"
   },
   "stable": {
    "version": [
@@ -40944,14 +41133,14 @@
   "repo": "zpp0/flycheck-checkpatch",
   "unstable": {
    "version": [
-    20170217,
-    1025
+    20240810,
+    1951
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "6461fc7b0d493eb9863814055f8bce5fa35739de",
-   "sha256": "1651xmw01n5h7x81y3cvsamdmb67jcf385ax52dkp8miyq1a090r"
+   "commit": "61710dff2828ff119968161e7118fce2a4a0b67f",
+   "sha256": "0zbsal98k8d0vxrabq40jpfpmg2m67yldnc1l91wm0jwqym0w14d"
   },
   "stable": {
    "version": [
@@ -42903,14 +43092,14 @@
   "repo": "msherry/flycheck-pycheckers",
   "unstable": {
    "version": [
-    20220923,
-    2250
+    20240817,
+    2
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "897fba15787df94c1ce6a48551f1b149940ffc25",
-   "sha256": "1sdiixvc3rx4ig7p0gag58imc6gjsqr75zvkygnag2y0mfl3vzic"
+   "commit": "1bd9b7a7d4009a81ebd34515a72a3a94c313ad76",
+   "sha256": "1m33yrx2nbwawh38fsibv97fb8gnr461bbrh5yqcnjyw635n7199"
   },
   "stable": {
    "version": [
@@ -43823,11 +44012,11 @@
   "repo": "orzechowskid/flymake-eslint",
   "unstable": {
    "version": [
-    20240322,
-    2315
+    20240819,
+    1943
    ],
-   "commit": "6ab909b85a8e97815db9831cdd5f283a7830177f",
-   "sha256": "19jyim5rrmv8bdskaw8gxb6fch3jj3irqhddi2aaxvgdxn321yxm"
+   "commit": "8d6e7e23a1407eb0c6a68213622de7ac24338c5f",
+   "sha256": "097qd7740vrfbjrpbrp9sf443qybcnb1sb6ixmalqn7wajcgc50q"
   },
   "stable": {
    "version": [
@@ -44710,14 +44899,14 @@
   "repo": "erickgnavar/flymake-ruff",
   "unstable": {
    "version": [
-    20240709,
-    1338
+    20240721,
+    2006
    ],
    "deps": [
     "project"
    ],
-   "commit": "3b69008d6cc3084338392bc03373d00844ad4261",
-   "sha256": "0yy16n5lqyv5bd2q3jlnmcg9hjx79985kf9ap283shx5ssb217zq"
+   "commit": "6405c8a8eb48f371581a05c34ac1110a3d585dd7",
+   "sha256": "0lqjqp8v6ykvpm137cj2fmdw9y3vf2h0rxv5hhls88r72qh0wsdc"
   }
  },
  {
@@ -45637,14 +45826,14 @@
  },
  {
   "ename": "forge",
-  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
-  "sha256": "0pzlh2b77qfg4fgpxm8zxvrnfwl7q38srxsvf39r4hgip30sk3lp",
+  "commit": "09f3189b08b8d8fcf2aebc17c048e4ccf7f55583",
+  "sha256": "0f97q2l3q127s3xh8p8ja51ghdf7ysralcmziw3izs9rql3k2zzb",
   "fetcher": "github",
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20240712,
-    1313
+    20240818,
+    1702
    ],
    "deps": [
     "closql",
@@ -45659,28 +45848,30 @@
     "transient",
     "yaml"
    ],
-   "commit": "03d012ae24eafa89a1a5ba7d9ed4069b05d54e21",
-   "sha256": "09pclclvw92i216m45m5hzw55vi3zszps1jkykyqc2vpl0zna0i8"
+   "commit": "a56eb3cbb27c61387d35cbff6b036a2c1bc1559d",
+   "sha256": "0in7qznyxl2b2y1dpfadbbpq3zy6bfhnz66cffiizwzgla7zgy17"
   },
   "stable": {
    "version": [
     0,
-    3,
-    2
+    4,
+    1
    ],
    "deps": [
     "closql",
+    "compat",
     "dash",
-    "emacsql-sqlite",
+    "emacsql",
     "ghub",
     "let-alist",
     "magit",
     "markdown-mode",
+    "seq",
     "transient",
     "yaml"
    ],
-   "commit": "ecedeaf641f3c06ac72db57837d15bdb02ac198b",
-   "sha256": "0p1jlq169hpalhzmjm3h4q3x5xr9kdmz0qig8jwfvisyqay5vbih"
+   "commit": "22a7aa5f0fe8cad99770fdcdb163de919a74ba76",
+   "sha256": "1kn3n1a6gdsd0l2v831sh43cly4p8s1snn494gdd23cw4jkk3qsv"
   }
  },
  {
@@ -45878,14 +46069,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20240710,
-    937
+    20240716,
+    311
    ],
    "deps": [
     "seq"
    ],
-   "commit": "70967d12f59cef29b7d301c2ed51c32b4a11c7f1",
-   "sha256": "1216wfps6zm0rq2ghq8m7m3nrjqk2j4ky6k1fsqkj5d5lj25x2gx"
+   "commit": "f3e821797beecc73cc16e81bfcbbe126581359ec",
+   "sha256": "1jsa85gk92yvnaxf2ra31df7w5l0qzy5rcrzfch44zq4pj9iv7s5"
   },
   "stable": {
    "version": [
@@ -46031,15 +46222,15 @@
   "repo": "davidshepherd7/frames-only-mode",
   "unstable": {
    "version": [
-    20240213,
-    2142
+    20240716,
+    706
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "53b17d712e363991f070d790493cd3cbf1d8a9be",
-   "sha256": "091ppnizhfvrc9clrq9bd7fcbd7hgg39b8ym3ibbhh890b7a4p56"
+   "commit": "057462df122e588dceef472023343dee3315ceea",
+   "sha256": "00cirlblx28q5b6691l93v9ay8ry1gl4v2sxzn1r61d9ni8ig7c5"
   },
   "stable": {
    "version": [
@@ -46062,26 +46253,26 @@
   "repo": "tarsius/frameshot",
   "unstable": {
    "version": [
-    20240712,
-    2217
+    20240805,
+    1314
    ],
    "deps": [
     "compat"
    ],
-   "commit": "23d550389ca978945300f5a1076d5c4f530d8d0e",
-   "sha256": "0563z8ahn4jlmfwrz391h340d69hmn4szkk41cy1v9nig0f7vp8k"
+   "commit": "050ef28e4007a608f12bbd476ccc52d19854f13d",
+   "sha256": "07wl86qamd3hrgybq29gmm1x0xc25qm3b95bj92ywh61wm173n1d"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
-    8
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c60ef067f582f7dc7ebdfb8e1b544068f56e2bf1",
-   "sha256": "0pbxzn16hjvmf81hscq3d3jj07d1j4x7amg67j741fwddvzkm8wc"
+   "commit": "050ef28e4007a608f12bbd476ccc52d19854f13d",
+   "sha256": "07wl86qamd3hrgybq29gmm1x0xc25qm3b95bj92ywh61wm173n1d"
   }
  },
  {
@@ -46868,26 +47059,26 @@
   "repo": "tarsius/fwb-cmds",
   "unstable": {
    "version": [
-    20240712,
-    2218
+    20240805,
+    1318
    ],
    "deps": [
     "compat"
    ],
-   "commit": "257659fc0bf0112d40f921717c57e558b25f91ea",
-   "sha256": "02b5kgnmadgnq8cpmrh1srxpzw30gxn52azy58g9p16jy0i0lnnf"
+   "commit": "973a0033c406ce644ce0fb87de70c2f4046ab1b7",
+   "sha256": "0dwrmm4hir83xbnhxqjyalb17zk40y62m32i90q7svp32ydw3abg"
   },
   "stable": {
    "version": [
     2,
     0,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a2569c7c986dcde2c859e390a0da5aeacf69db77",
-   "sha256": "0dql8nh79sh10fhxc2h3sypx6qvrg30j2x3ib3mw32qwgx33v8m2"
+   "commit": "973a0033c406ce644ce0fb87de70c2f4046ab1b7",
+   "sha256": "0dwrmm4hir83xbnhxqjyalb17zk40y62m32i90q7svp32ydw3abg"
   }
  },
  {
@@ -46993,25 +47184,25 @@
  },
  {
   "ename": "gams-mode",
-  "commit": "8b6568f0b8a52659864b90c455fd16c7ccfa7b05",
-  "sha256": "18nv0s9njlsrphpgi05srgvadcqv3071sqqn0jm715f0cd6b1ral",
+  "commit": "07c7057b75a61012e880ea3d4f08ee2b5e8fc06c",
+  "sha256": "0vqs24sf0l314q4g1fzaw99ghs9ig997kcyihnfj5mrmzqwj4n5q",
   "fetcher": "github",
   "repo": "ShiroTakeda/gams-mode",
   "unstable": {
    "version": [
-    20240502,
-    1456
+    20240709,
+    410
    ],
-   "commit": "cf0fce18ed51aa6b66e672e3f5655faf4631d9cd",
+   "commit": "6fb90d9c83747ac020743cd7a8c2efda0c5936eb",
    "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y"
   },
   "stable": {
    "version": [
     6,
-    12
+    16
    ],
-   "commit": "ac2d1ef9695e395b4410ef342bbfb75d7852c798",
-   "sha256": "0wmmbz7scd0r1bahlvh9av3lwykni32sgyhcqyzd1w867hc77sv5"
+   "commit": "6fb90d9c83747ac020743cd7a8c2efda0c5936eb",
+   "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y"
   }
  },
  {
@@ -47106,11 +47297,11 @@
   "repo": "shepherd/gdb-x",
   "unstable": {
    "version": [
-    20240617,
-    1857
+    20240814,
+    2137
    ],
-   "commit": "367dbb31e1591ffb3f4b7630f2c8ddcc0692e133",
-   "sha256": "0x1i1lrs5szrmabakhm07d6hiywn072b0bid0ir2jva4msqkcajp"
+   "commit": "55dd7a427a83a9abd5719cd2920ab7d2c94ba558",
+   "sha256": "1fncmi0ciz0fwf97li554kfvbpkqv5vwy0aafin9vcc63aawwi2y"
   }
  },
  {
@@ -47222,14 +47413,14 @@
   "repo": "emacs-geiser/geiser",
   "unstable": {
    "version": [
-    20240706,
-    1537
+    20240726,
+    1217
    ],
    "deps": [
     "project"
    ],
-   "commit": "a81969a5271f155d2d1e389ccbe47e1c7ec36ae7",
-   "sha256": "17srwjw84lxpcfdl0jg7pxh6vdh3am6fs5dk0l4hy3z1axzd3i12"
+   "commit": "3b02581c8422d416d1d4dc3168db5cf7b0ef16fc",
+   "sha256": "0afsymy0751ngly1kwyw7i9i66ddm1sxdv3vags966n7i03lcj4r"
   },
   "stable": {
    "version": [
@@ -47394,28 +47585,28 @@
   "repo": "emacs-geiser/guile",
   "unstable": {
    "version": [
-    20240712,
-    1202
+    20240811,
+    1520
    ],
    "deps": [
     "geiser",
     "transient"
    ],
-   "commit": "ebdd1923b0780778706ea6b16aa2b0ce3e7dc33d",
-   "sha256": "1fhv3r93vq497rkbwrfn6nwq525vviqlfbry6x2fimcm02sizsa1"
+   "commit": "5a856c2982030ff77e2d151ead4fcd991512f362",
+   "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy"
   },
   "stable": {
    "version": [
     0,
     28,
-    1
+    2
    ],
    "deps": [
     "geiser",
     "transient"
    ],
-   "commit": "f57bfd5039ce158de95d2ef2933e64fb16def4f6",
-   "sha256": "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f"
+   "commit": "5a856c2982030ff77e2d151ead4fcd991512f362",
+   "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy"
   }
  },
  {
@@ -48033,27 +48224,27 @@
  },
  {
   "ename": "ghub",
-  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
-  "sha256": "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i",
+  "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7",
+  "sha256": "0ny8yly8ighk07kiy701rlppkw2jipymwxrf3kkr3zvm9nz5wi4s",
   "fetcher": "github",
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20240618,
-    1527
+    20240818,
+    1702
    ],
    "deps": [
     "compat",
     "let-alist",
     "treepy"
    ],
-   "commit": "e44aceeb12831f8b7afac4e089525b5a2dd5a5e8",
-   "sha256": "18k7w0fw56ris6wkf48dp5x4isq11zxzy712grdgax6gp0ls8m84"
+   "commit": "3ad921bf1f5e91446f2a33004dfd51fa1b64ed59",
+   "sha256": "18f6p9ls4zhykbpsxi2di8d010ca4jyl3zgj4z9y7n56h7hc1i75"
   },
   "stable": {
    "version": [
-    3,
-    6,
+    4,
+    0,
     0
    ],
    "deps": [
@@ -48061,8 +48252,8 @@
     "let-alist",
     "treepy"
    ],
-   "commit": "0fd648f0529f34b5da441d54c9dbff7810477d12",
-   "sha256": "11nrh2lr5179r0brd9vl7r0i0dpjxdr5frplxq6j2ca7l2vzwqyr"
+   "commit": "c20bc86c70eb2f43df8674097db7847e172ef2c2",
+   "sha256": "1dnl4idvc96jv73gdsrp377m1782i5n0cq0y4s0mp4i1vqd5drj2"
   }
  },
  {
@@ -48398,15 +48589,15 @@
   "repo": "liuyinz/git-cliff.el",
   "unstable": {
    "version": [
-    20240517,
-    1042
+    20240730,
+    1912
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "90db86c1a600fc319e7c8172839bfe18c3e4221b",
-   "sha256": "0i0gdcs9lh7jm5sjwss0gadl7k645rns67va5d9xahzvfz1qkzb9"
+   "commit": "514396c9306338f7df49140e3c9d2177ad7f3567",
+   "sha256": "0n31v69vg0qn853pbgkxh1i6cvkas0pwivdxz4f8spg14avp7q6s"
   },
   "stable": {
    "version": [
@@ -48457,36 +48648,38 @@
  },
  {
   "ename": "git-commit",
-  "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde",
-  "sha256": "0cdrrmkjxl6dr967i0q9q4f9gw46gic6igw56276ahjk4n1ksqc7",
+  "commit": "3126dac37def07fcaa667a325ee79349fb80d285",
+  "sha256": "0gikqipqd4sp6y60i09bbspxd9q9bh00wn73fgrixkir4p1cgn3c",
   "fetcher": "github",
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240623,
-    1335
+    20240808,
+    1852
    ],
    "deps": [
     "compat",
+    "seq",
     "transient",
     "with-editor"
    ],
-   "commit": "196abe727054a440bf6262c5c254ad4565cbaa66",
-   "sha256": "09hrg76rhjzz1y5svzbcbw2qpq6hxcq0rc4iasb0bqmvljcra0aq"
+   "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1",
+   "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k"
   },
   "stable": {
    "version": [
-    3,
-    3,
+    4,
+    0,
     0
    ],
    "deps": [
-    "dash",
+    "compat",
+    "seq",
     "transient",
     "with-editor"
    ],
-   "commit": "f44f6c14500476d918e9c01de8449edb20af4113",
-   "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn"
+   "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1",
+   "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k"
   }
  },
  {
@@ -48533,11 +48726,11 @@
   "repo": "danilshvalov/git-commit-ts-mode",
   "unstable": {
    "version": [
-    20240527,
-    708
+    20240722,
+    1815
    ],
-   "commit": "04219fdac2a5c1816cd08141513770adc0c2a48b",
-   "sha256": "0chhls16pz215hxsh2c9c95msz4jmj941fvpiqp57alsv7fva9ci"
+   "commit": "ba722ba44964e87b2acf48cb7b6154ad4c99bc26",
+   "sha256": "1123h95cks0sk3dkmx0srazxslizdpk2wnmgz4hsgy78yn27i85b"
   }
  },
  {
@@ -48805,11 +48998,11 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20240630,
-    626
+    20240809,
+    300
    ],
-   "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8",
-   "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z"
+   "commit": "a0a2fff2d2fba516bc4c08cae10e067c3eb10529",
+   "sha256": "130d92jkxq22mz5b9s378nrx93a98nbmb84cjny5vmsl3c2rfzzm"
   },
   "stable": {
    "version": [
@@ -48858,26 +49051,26 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20240618,
-    1609
+    20240805,
+    1320
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
-   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
+   "commit": "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0",
+   "sha256": "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3"
   },
   "stable": {
    "version": [
     1,
     4,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
-   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
+   "commit": "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0",
+   "sha256": "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3"
   }
  },
  {
@@ -49121,20 +49314,20 @@
   "repo": "Justintime50/github-dark-vscode-emacs-theme",
   "unstable": {
    "version": [
-    20231011,
-    2034
+    20240716,
+    523
    ],
-   "commit": "9906e1412d692ea0c115998c1809bcc135e263f6",
-   "sha256": "087vycm8wjzwv271c2wqymplcwyrin5pj9pwcr1y44di658rckj4"
+   "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d",
+   "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k"
   },
   "stable": {
    "version": [
     0,
-    3,
-    1
+    4,
+    0
    ],
-   "commit": "2123bcd08fe42094b07180632be2cd2af606ee21",
-   "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3"
+   "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d",
+   "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k"
   }
  },
  {
@@ -49235,21 +49428,6 @@
    "sha256": "0a5ibyg7hncwiavngzvivhf5sbhp3czsicyfy1rpfijmbjm4whyl"
   }
  },
- {
-  "ename": "github-modern-theme",
-  "commit": "0ee692a25ee31066d22cd1cbe3405ec6c323e72e",
-  "sha256": "1i4589cwf5m7bf1x39mljsi0qjiwva8zpx14i03xbpnmc6h8x3nk",
-  "fetcher": "github",
-  "repo": "vexx9/GitHub-Modern-Theme-for-Emacs",
-  "unstable": {
-   "version": [
-    20171109,
-    1251
-   ],
-   "commit": "a7e7b8e5e9c122138e79e837caf9b7299e748d44",
-   "sha256": "0agfy3wiznb2ksfa00g7066mb0vps4g74mj6nl9wkvx847dzg34h"
-  }
- },
  {
   "ename": "github-notifier",
   "commit": "c09f4e7e8a84a241881d214e8359f8a50ab14ddf",
@@ -49365,21 +49543,6 @@
    "sha256": "03lx8ndhikl2frdblbi3fsaz6xzfay6w2ngl1z0ib85wca55lzqp"
   }
  },
- {
-  "ename": "github-theme",
-  "commit": "41c3ba590a2bb7c864b7f86abf0bf8e82b157f1d",
-  "sha256": "0r22rhhv3qjvd9la0p13hpdk9ar9cblib4m8s8hax0lxqwr0h0gx",
-  "fetcher": "github",
-  "repo": "vexx9/GitHub-Theme-for-Emacs",
-  "unstable": {
-   "version": [
-    20170630,
-    2201
-   ],
-   "commit": "29f00a51d949a248a5f6355a97131e216747c797",
-   "sha256": "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"
-  }
- },
  {
   "ename": "gitignore-snippets",
   "commit": "b1d03ee45e45fc6ec30936a5f4bd8b756728da31",
@@ -49722,6 +49885,21 @@
    "sha256": "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9"
   }
  },
+ {
+  "ename": "gleam-ts-mode",
+  "commit": "51b0a905d5748d4d4f2e807435e56c6c2a312edb",
+  "sha256": "0wbrryjmxczcgd0lp86iwnykmnxij2mxvyz5d9izy7g33092bscb",
+  "fetcher": "github",
+  "repo": "gleam-lang/gleam-mode",
+  "unstable": {
+   "version": [
+    20240819,
+    1355
+   ],
+   "commit": "8d2f1cf6d4b7850bb8fa66cf26b7365f0ad1e925",
+   "sha256": "0cra6mivfgzhizb1nv448jkr6js39blb74hfyckg3l2yf0fdhjxj"
+  }
+ },
  {
   "ename": "global-tags",
   "commit": "2bf3f3de312becb948000a21b280c990a03c8aa0",
@@ -49973,28 +50151,30 @@
   "url": "https://git.thanosapollo.org/gnosis",
   "unstable": {
    "version": [
-    20240712,
-    1936
+    20240818,
+    2127
    ],
    "deps": [
     "compat",
-    "emacsql"
+    "emacsql",
+    "transient"
    ],
-   "commit": "9f678e624d7e89478d0090826f813d05bb811e27",
-   "sha256": "0xlv6vp51gkd2i2xnhajkzhraz0nb8ykynbm8g9kjn8nq5y8dqmp"
+   "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05",
+   "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd"
   },
   "stable": {
    "version": [
     0,
-    3,
-    0
+    4,
+    1
    ],
    "deps": [
     "compat",
-    "emacsql"
+    "emacsql",
+    "transient"
    ],
-   "commit": "688dc187a1684fabb209d4d08a2d2baa5ae0e99d",
-   "sha256": "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6"
+   "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05",
+   "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd"
   }
  },
  {
@@ -50900,19 +51080,20 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20240711,
-    28
+    20240802,
+    131
    ],
-   "commit": "97468ed8ff5ae93e01e93d4018e7be1b711046a1",
-   "sha256": "0c6snl8jm9ykpq2h3cl7335pmzycq9kg6ki3mqq8yzzrp51a6ffh"
+   "commit": "424682b94df9efb3dd59e396677b45e4a67b7723",
+   "sha256": "0cyg3wbxxhyp268w4sidbdi0jdig1a7614mnvd8jl91vryinjf55"
   },
   "stable": {
    "version": [
+    3,
     0,
-    4
+    7
    ],
-   "commit": "c12fe8552259e8c8d4e41fd83ce444a94e17f5da",
-   "sha256": "1bhfd41x3i2gabvf50pdpmnvcdqg69ygslyjcg7jvf486b44gvfk"
+   "commit": "334efbddd3d421ec294002fca166fbd6b0152e2e",
+   "sha256": "0603iq1vjbm44sl7qrmkdfcqzzc703h1g5hdcswpj7pi0w7fxb4s"
   }
  },
  {
@@ -50938,11 +51119,11 @@
   "repo": "emacsorphanage/god-mode",
   "unstable": {
    "version": [
-    20221230,
-    708
+    20240812,
+    1014
    ],
-   "commit": "607aff10a7b27a8aa0c1a15c2c39337ab17cfda7",
-   "sha256": "032c82cgf8dafc3w951f2n2a1327rxz9126ri8vz9n3fblwdizj5"
+   "commit": "55490fffd42ae7d4671ce409214a3fcd0868d791",
+   "sha256": "1mi74kzdqdlrhjisj1fg2zjbr0d9kc0fl00mss1r3wyjl1bjac2f"
   },
   "stable": {
    "version": [
@@ -51528,7 +51709,7 @@
   "stable": {
    "version": [
     0,
-    38,
+    42,
     0
    ],
    "deps": [
@@ -51537,8 +51718,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "51648874c24e2232274693e92218551e3292c425",
-   "sha256": "1bk2bnxc5b7y2ng0pdxnxfwr6s3yp4kpw50zwrak3phiv8z862k7"
+   "commit": "7a7c064655147daa9d03c20c764c0dc3cd8111ff",
+   "sha256": "0hy96w8milg8ap7d3145ab84da9gjlwzh9f0c7ll6y6dg4jdrgaa"
   }
  },
  {
@@ -51621,11 +51802,11 @@
   "repo": "stuhlmueller/gpt.el",
   "unstable": {
    "version": [
-    20231112,
-    2012
+    20240721,
+    1747
    ],
-   "commit": "c1091d25db420320de4b121baba99d7ac2e23932",
-   "sha256": "0b9fcj7zkqxj5928038gnk93shi7k4mpikqir80lypbnnbn96l5f"
+   "commit": "06afbecccac8bf0d7a47b4c1b768a74ed66c5e84",
+   "sha256": "0jnaafsnridafqwndgjkp980pnz0lm4nrw2fqnhx15pzqz1w2v34"
   }
  },
  {
@@ -51692,15 +51873,15 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20240626,
-    2246
+    20240814,
+    1558
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "dcc4e3640ebaa0f94e24b3ad2099a01f7f3a517a",
-   "sha256": "00y8kmzgsyqgvy0hcjinnqnm6jsf22wyg7jfadybwbnw9aiy7q6a"
+   "commit": "17f39f6a8144496252eacc012ef7f1d6a2ac883a",
+   "sha256": "1y1jz2njx8ggagjr4dqdjhbm948knb29qk2p2qhx0sgarfzvvsz6"
   },
   "stable": {
    "version": [
@@ -52032,15 +52213,15 @@
   "repo": "ifitzpatrick/graphql-doc.el",
   "unstable": {
    "version": [
-    20220527,
-    1721
+    20240716,
+    38
    ],
    "deps": [
     "promise",
     "request"
    ],
-   "commit": "d37140267e0c426c7c18aff31900aa1650257394",
-   "sha256": "008wnng94pm2p1xjpbvzzm2l29yq1635j45xywgcj66vknsvvijg"
+   "commit": "17755a2466a1acef68eac664093fcd13cd51494a",
+   "sha256": "075p04xd4pkzmhq982x1b2azy7qdazrsdbrniyyrp58xdr83y9kr"
   },
   "stable": {
    "version": [
@@ -52187,15 +52368,15 @@
   "repo": "michelangelo-rodriguez/greader",
   "unstable": {
    "version": [
-    20240712,
-    2322
+    20240806,
+    1624
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "7301a27f22bcae3e57a85e1e88d7917077b4d791",
-   "sha256": "0zxjkihz5x8jwpyxfykmkp5zna1m9p3kg9bir5h5k7aak07jj7mf"
+   "commit": "6664c20a6a6a32e3a6c31d13a160fb8c9c8e118c",
+   "sha256": "09lff7j09132k62zcgxdd0jk55zpvx2nylm63j1fy7mgjc5zxr3c"
   }
  },
  {
@@ -52344,20 +52525,20 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20230206,
-    323
+    20240817,
+    1013
    ],
-   "commit": "bdee160db6ab8c988bb0de95ad306ff8b793ec67",
-   "sha256": "0mnwpng1zhq4piaxnbrqpn6di4jhnh7dhf2vrgmqiw66c16vz9hx"
+   "commit": "378de9609614448ca29e2add91f2d0059f963d8c",
+   "sha256": "0valpvbklqzc48f9m1rysjh24323cykpz39dk6avx6vj3y70lnaq"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    3
    ],
-   "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32",
-   "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm"
+   "commit": "378de9609614448ca29e2add91f2d0059f963d8c",
+   "sha256": "0valpvbklqzc48f9m1rysjh24323cykpz39dk6avx6vj3y70lnaq"
   }
  },
  {
@@ -53076,11 +53257,11 @@
   "repo": "idlip/haki",
   "unstable": {
    "version": [
-    20240501,
-    1610
+    20240801,
+    1217
    ],
-   "commit": "e076785ca936b723751b8957c5d5eab8dde12346",
-   "sha256": "17ypcl68d2f3m0nqma80g1mrbj50wbf4ljl02xl518y0i9cix50a"
+   "commit": "6b3f555cbf038cf4ad4fd296554467137892776c",
+   "sha256": "1l0wb1v3x3ngg3x0mv2pfa97qfxblm3ff6r2d7b5y5767ifmbn6j"
   }
  },
  {
@@ -53885,6 +54066,21 @@
    "sha256": "0yi3z59sc2ah2173ffpw2l033pmwg5km3id53mpry36pgki02ajn"
   }
  },
+ {
+  "ename": "helix-theme",
+  "commit": "80c21c8b511b2fdf7948c37f0cfb81ca2a138404",
+  "sha256": "1wkrfr5d79h847g44y5gxw0lr9vfy2nxnm68pqlvzgps4wc9l9h8",
+  "fetcher": "github",
+  "repo": "ibakepunk/helix-theme",
+  "unstable": {
+   "version": [
+    20240814,
+    1212
+   ],
+   "commit": "8c70b48fe5fbb392d237b6be2ae9da7b84236320",
+   "sha256": "1v2il312ly6rv5gxg5lvv74zaazhbra9agx66c975p5nqva2vvzz"
+  }
+ },
  {
   "ename": "helm",
   "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
@@ -53893,15 +54089,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240710,
-    509
+    20240818,
+    1231
    ],
    "deps": [
     "helm-core",
     "wfnames"
    ],
-   "commit": "568f104747876a675aad5f2ded395f487a5e6492",
-   "sha256": "1kgkvx6ys43awv6vryr6k0n8z70svn5i3pdx0lcwzc51sysy3zil"
+   "commit": "eb5edc60be7294f9fa623c208bfdb681fbe2a3f1",
+   "sha256": "062i9i8vg83i49k2w6qis6yd1annksf54whn7mxyfs15jikl43gh"
   },
   "stable": {
    "version": [
@@ -54266,23 +54462,22 @@
  },
  {
   "ename": "helm-bm",
-  "commit": "115033d7b02d3ca42902195de933f62c5f927ae4",
-  "sha256": "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh",
+  "commit": "ae45333491f24e0ecb5945db6e929b56e737e260",
+  "sha256": "1bh0c863a5p7zqhm656a2wqgmw4gpk3qr61l25wy4gd1ymmfhx91",
   "fetcher": "github",
-  "repo": "yasuyk/helm-bm",
+  "repo": "emacs-helm/helm-bm",
   "unstable": {
    "version": [
-    20160321,
-    1331
+    20240812,
+    1738
    ],
    "deps": [
     "bm",
     "cl-lib",
-    "helm",
-    "s"
+    "helm"
    ],
-   "commit": "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7",
-   "sha256": "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil"
+   "commit": "4744b5784df5800f36c3c54de5269034191155f5",
+   "sha256": "0fwv4aw6ha0dj9g5paxrp2kwb89hw5daybqvlzfjs8zkyypdbcbh"
   },
   "stable": {
    "version": [
@@ -54784,14 +54979,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240712,
-    1822
+    20240818,
+    528
    ],
    "deps": [
     "async"
    ],
-   "commit": "0b3a41934051ae9be4b97f92115c121f9fb0352a",
-   "sha256": "0w0h8j4m6prxyhqznprwnzdqlqfqmcpvry2f6cb4fx2c4rxvv5sn"
+   "commit": "36a6b50f325be94f30c6cf699ede042fa907c6b1",
+   "sha256": "0cf5q1lwd6ca5hi62cwvz4lfbxbs79403qs96p6bkajg4q4g186h"
   },
   "stable": {
    "version": [
@@ -55430,20 +55625,20 @@
  },
  {
   "ename": "helm-flymake",
-  "commit": "d8547036dceaa466957f4c5a07eb0461f313b924",
-  "sha256": "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b",
+  "commit": "07799dc4acea7123ab1021b6be9bab9a37f5a6c1",
+  "sha256": "18hy2qvxaxvw58crzj41kqjdmnqc6fdnhp9klfy1j3751vfs9ik7",
   "fetcher": "github",
-  "repo": "tam17aki/helm-flymake",
+  "repo": "emacs-helm/helm-flymake",
   "unstable": {
    "version": [
-    20160610,
-    2
+    20240727,
+    617
    ],
    "deps": [
     "helm"
    ],
-   "commit": "72cf18a1a1f843db9bb5d58301739ea9ccb1655b",
-   "sha256": "05wpclg4ibp0ida692m3s8nknx4aizfcdgxgfzlwczgdgw0922kn"
+   "commit": "748193359c26d466b4ef4ff59d733a5edfcd0c48",
+   "sha256": "1ilrw99krmn086spv0lpdqc9dcp5c3m4i3xpg42pyifmhhck050h"
   }
  },
  {
@@ -56245,10 +56440,10 @@
  },
  {
   "ename": "helm-lean",
-  "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde",
-  "sha256": "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si",
+  "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c",
+  "sha256": "0aszjrv08n8lzpzsj694kldnmmx9b9qh9xmwnb6d7qxygzmbw1dj",
   "fetcher": "github",
-  "repo": "leanprover/lean-mode",
+  "repo": "leanprover/lean3-mode",
   "unstable": {
    "version": [
     20210305,
@@ -56340,14 +56535,14 @@
   "repo": "emacs-helm/helm-ls-git",
   "unstable": {
    "version": [
-    20240702,
-    811
+    20240811,
+    1739
    ],
    "deps": [
     "helm"
    ],
-   "commit": "1cf4e5caf8f18ae323764015496b13d0e85c716f",
-   "sha256": "1nixr1si7zgrdpprxr3wrm89fl4g8dnnaq21wr217f9wf3gp7nkr"
+   "commit": "244b6854c1c118e41c8fac0201eff03ba034ddc6",
+   "sha256": "02ckp8s9649kanawl662acl4vd5d5q9cfzvfkfh07xm3x03d44az"
   },
   "stable": {
    "version": [
@@ -56610,14 +56805,14 @@
   "repo": "emacs-helm/helm-mu",
   "unstable": {
    "version": [
-    20240421,
-    1656
+    20240726,
+    608
    ],
    "deps": [
     "helm"
    ],
-   "commit": "36bb948e239f21478939a6848c2b0a3985b27680",
-   "sha256": "18vr00vvra4sb91948h761k30bi9gm2vadyvsyk7r3jxmcyy1ixb"
+   "commit": "4a45bb87215a47c8638034a06bf6529369779c5c",
+   "sha256": "0344rmwl6g9wy2vf919idm0fnrplyw112sfb39h533y0sy2244sy"
   }
  },
  {
@@ -57513,6 +57708,40 @@
    "sha256": "1ng73dmligj38xbfdfr8sb69czppks7wfvh5q5xcm2pha828kcwm"
   }
  },
+ {
+  "ename": "helm-roam",
+  "commit": "3dc5cbec2474de49fd9f92ba5273981aa14ed14d",
+  "sha256": "08wvnx31i8r1gg3sirlxxh1w1bd1v97aw834qk82cxz1ikn2qhq8",
+  "fetcher": "github",
+  "repo": "vhqr0/helm-roam",
+  "unstable": {
+   "version": [
+    20240723,
+    1443
+   ],
+   "deps": [
+    "helm",
+    "org",
+    "org-roam"
+   ],
+   "commit": "85222a9ea50c69b18c1e31a66cc70adb851967d5",
+   "sha256": "1853p09zn61m1bgyawn2lq96ls1ylxgsqz36q4x7hq7k1fpfzvj3"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    2
+   ],
+   "deps": [
+    "helm",
+    "org",
+    "org-roam"
+   ],
+   "commit": "85222a9ea50c69b18c1e31a66cc70adb851967d5",
+   "sha256": "1853p09zn61m1bgyawn2lq96ls1ylxgsqz36q4x7hq7k1fpfzvj3"
+  }
+ },
  {
   "ename": "helm-robe",
   "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
@@ -59715,26 +59944,26 @@
   "repo": "tarsius/hl-todo",
   "unstable": {
    "version": [
-    20240707,
-    1351
+    20240805,
+    1444
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
-   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
+   "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e",
+   "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8"
   },
   "stable": {
    "version": [
     3,
     8,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
-   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
+   "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e",
+   "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8"
   }
  },
  {
@@ -60736,11 +60965,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20240713,
-    827
+    20240819,
+    504
    ],
-   "commit": "e0504916079e982025ca3d260f53dba2ef122679",
-   "sha256": "10r5dhlq3djw1xiz1i21h5a1va5p0wc2q8rbxl9phcgvkph6mmij"
+   "commit": "8fa9e4e19880b6270c138c634855edab8779c2f8",
+   "sha256": "1cr09q8ihjn7fycrz0k9957g8d9isq1lgy4fa5aifm3w3wxz9x9b"
   }
  },
  {
@@ -60751,8 +60980,8 @@
   "repo": "ushin/hyperdrive.el",
   "unstable": {
    "version": [
-    20240713,
-    434
+    20240818,
+    2123
    ],
    "deps": [
     "compat",
@@ -60763,8 +60992,8 @@
     "taxy-magit-section",
     "transient"
    ],
-   "commit": "5afca563c757a7c3ced908f9193beee0cc0b013c",
-   "sha256": "1asaky1r47p1brybjjlcrf6lnwrhxc13m43xq9y08d10r1fvx4ch"
+   "commit": "0af765ab019912b5a0bbdd91529bc51745d48f42",
+   "sha256": "19yp0dyrnsh68px546rz2nxz0kmiwz690w5fvmcknicgh2w9vyl3"
   },
   "stable": {
    "version": [
@@ -60891,14 +61120,14 @@
   "repo": "zzkt/i-ching",
   "unstable": {
    "version": [
-    20230530,
-    937
+    20240729,
+    1054
    ],
    "deps": [
     "request"
    ],
-   "commit": "2f1e8393b09f926188eb640604f5bc637707315e",
-   "sha256": "1g1j0yb6x9bmlz3ld5w7wwgaxn7dw3nfba5jmlhg83q6m6h168qi"
+   "commit": "0870cb1fa5bca0b7848e3f4e902e6d58445eab09",
+   "sha256": "19prq2kmzk33i2w4bargls7zad41rvmdflbw7f1gyz4lyh7spgzg"
   }
  },
  {
@@ -62068,26 +62297,26 @@
   "repo": "tarsius/imake",
   "unstable": {
    "version": [
-    20240618,
-    1725
+    20240805,
+    1321
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
-   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
+   "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788",
+   "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303"
   },
   "stable": {
    "version": [
     1,
     2,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
-   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
+   "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788",
+   "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303"
   }
  },
  {
@@ -63849,11 +64078,11 @@
   "repo": "a13/iqa.el",
   "unstable": {
    "version": [
-    20200520,
-    1137
+    20201113,
+    849
    ],
-   "commit": "03f90a2f68b2f05d8a2509bf3612a337d3d5b67f",
-   "sha256": "0vri1i5lxgp8rcj6gr9sxkmfv2s3qkia3aw6cjm4dyp3q91m2vp1"
+   "commit": "eed962679783133e1ff6ae63d19efaeae4dadb6b",
+   "sha256": "0v5d51rzcx500rz3k0jqqssgiwfzl0m7sxkxz2xl8dpnjmkvsvym"
   }
  },
  {
@@ -64860,27 +65089,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240226,
-    204
+    20240803,
+    2320
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -65889,26 +66119,26 @@
   "repo": "ericdallo/jet.el",
   "unstable": {
    "version": [
-    20230525,
-    1334
+    20240730,
+    1228
    ],
    "deps": [
     "transient"
    ],
-   "commit": "7a3821c2f351a3770ae23e143f286e6c3a868d38",
-   "sha256": "0r1wsz6zk3n67wl7bq7s9jwh38r2n1nr5jsq0hsln6f3jidpy3js"
+   "commit": "67ded216a0a6af0bb8d6874a7faea538912c0345",
+   "sha256": "0vsa8mhqi702fc9izza68maxqh0g80cv62y7vjasnvg3yq64hygm"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "transient"
    ],
-   "commit": "7a3821c2f351a3770ae23e143f286e6c3a868d38",
-   "sha256": "0r1wsz6zk3n67wl7bq7s9jwh38r2n1nr5jsq0hsln6f3jidpy3js"
+   "commit": "67ded216a0a6af0bb8d6874a7faea538912c0345",
+   "sha256": "0vsa8mhqi702fc9izza68maxqh0g80cv62y7vjasnvg3yq64hygm"
   }
  },
  {
@@ -66017,25 +66247,25 @@
   "repo": "minad/jinx",
   "unstable": {
    "version": [
-    20240708,
-    2122
+    20240724,
+    917
    ],
    "deps": [
     "compat"
    ],
-   "commit": "e39f2682ea902a1d06bd118d5899b2bbadfb6dce",
-   "sha256": "0cy2qsgcg4xbivr5qz573xz00mp34igw5kv01h81n98a17cafga4"
+   "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb",
+   "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm"
   },
   "stable": {
    "version": [
     1,
-    9
+    10
    ],
    "deps": [
     "compat"
    ],
-   "commit": "4580aad8a0267bf30c98d210b6bdc1a08b1aad75",
-   "sha256": "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8"
+   "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb",
+   "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm"
   }
  },
  {
@@ -67077,20 +67307,20 @@
   "repo": "llemaitre19/jtsx",
   "unstable": {
    "version": [
-    20240603,
-    1609
+    20240715,
+    2002
    ],
-   "commit": "2b50a2e0d4c59ec465ba3bd8848743eeea13fc09",
-   "sha256": "0yf44n933k772gmav72l5svbl06pss3hnqqni8mi3vff0cy3sdva"
+   "commit": "e81259a7584619ce3266a2d532f674ef45ee4274",
+   "sha256": "0z8z41hy4ssyyb4skzzysayw72jc441bffhbw1mgmgpjr7412b94"
   },
   "stable": {
    "version": [
     0,
     5,
-    0
+    1
    ],
-   "commit": "2ad20cef1b2a6fc1e8b282f34127de82f6e463b1",
-   "sha256": "1kia04cs3xm2f3dvas9i6r9vz62xdlx6g5a0pz995gyxw91f7q3g"
+   "commit": "e81259a7584619ce3266a2d532f674ef45ee4274",
+   "sha256": "0z8z41hy4ssyyb4skzzysayw72jc441bffhbw1mgmgpjr7412b94"
   }
  },
  {
@@ -67190,8 +67420,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20240521,
-    22
+    20240812,
+    840
    ],
    "deps": [
     "dash",
@@ -67200,8 +67430,8 @@
     "s",
     "spinner"
    ],
-   "commit": "f7784c50078332aeeb8e388bf5b8f13042b7406b",
-   "sha256": "0cds08nyr7px5mbna2gbmv6a82hc1my45illdgswf7k67jby46zr"
+   "commit": "dff92c4250e40a6cc106f0ea993f9631ad55eb7c",
+   "sha256": "1s2382n7bf741hnyxafx4f323f66xbfnpp3nky629s4sy8r4x0hr"
   },
   "stable": {
    "version": [
@@ -67411,8 +67641,8 @@
   "repo": "emacs-jupyter/jupyter",
   "unstable": {
    "version": [
-    20240420,
-    1918
+    20240716,
+    2028
    ],
    "deps": [
     "cl-lib",
@@ -67421,8 +67651,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "aec436af541549ccd02e23c066a6c497d1365f6b",
-   "sha256": "1cssm3jrj20n9wjcqq4sz74rx0sm6yg5dbskn9d5h86df00af2zh"
+   "commit": "f97f4b5d8c83e0b901020f835183dde8a2bf649e",
+   "sha256": "0jmhh9ncnf4ai8rr2g474n6dv9m7v983s2w0smy0h7l07sp43klq"
   },
   "stable": {
    "version": [
@@ -67681,25 +67911,27 @@
   "repo": "bram85/kagi.el",
   "unstable": {
    "version": [
-    20240629,
-    557
+    20240811,
+    2130
    ],
    "deps": [
+    "markdown-mode",
     "shell-maker"
    ],
-   "commit": "eb767d1e0dc56b14ebc8f4362890b7fd2be7a542",
-   "sha256": "0gs7lngj5ng6caiafh2hzjjwb3zm95j9kzslxis20lyqmpp64r1l"
+   "commit": "013749218495e2c1bf2bb203c6b61976963817b5",
+   "sha256": "094yip5xp36lyfbj17f46jjvzr8g5c0pqqdm1fhhx3ivahb3jx9x"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
    "deps": [
+    "markdown-mode",
     "shell-maker"
    ],
-   "commit": "a0e06cb928c2def572b4be0a19686e6997c83d92",
-   "sha256": "1x5nrdb2qvy66cbdvk0fc9bq8if3jqzlfnnqfc9y2ifgvh8hg1z5"
+   "commit": "9e48fc96d513f863acde3689077197306e3d205c",
+   "sha256": "1j7z607dxqmyn4cscsv5a8f1n8pmr9nv7fyi7z04nvnpgpg08h05"
   }
  },
  {
@@ -67815,11 +68047,11 @@
   "repo": "Fabiokleis/emacs-kanagawa-theme",
   "unstable": {
    "version": [
-    20240709,
-    1230
+    20240721,
+    1720
    ],
-   "commit": "2cad3191be7c574d0fc933a8566468fa520862e0",
-   "sha256": "0pmy0vjd05vvciryjkscpnmknd5kvjm61pybz4nbzckkzqd6r9g2"
+   "commit": "e1cf4ddb7245031fb214baae95ebbffce27dec06",
+   "sha256": "107p3x02680ndfss9dfczj95yfj5j0xgqjbl6ldwmzjc8vf0j96s"
   }
  },
  {
@@ -68296,26 +68528,26 @@
   "repo": "tarsius/keycast",
   "unstable": {
    "version": [
-    20240618,
-    1727
+    20240805,
+    1322
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
-   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
+   "commit": "c44618d2867fc2410e5061fef2a805e974198cf2",
+   "sha256": "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm"
   },
   "stable": {
    "version": [
     1,
     4,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
-   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
+   "commit": "c44618d2867fc2410e5061fef2a805e974198cf2",
+   "sha256": "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm"
   }
  },
  {
@@ -68399,26 +68631,26 @@
   "repo": "tarsius/keymap-utils",
   "unstable": {
    "version": [
-    20240628,
-    1857
+    20240805,
+    1326
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6605cc638e22865f2c9b98345db4f9f52a2c3d2e",
-   "sha256": "012yhg74r52yx8ma8cid75i4hhqphx63lvjasrszkqmaxlqq2g5i"
+   "commit": "a1ea60ce0adfbb4b47cdd7f29943e5ee362b71ce",
+   "sha256": "1va7dsh0c2xf234lfkkmw63c9p0m9h8aiikrlf361nllrzz77497"
   },
   "stable": {
    "version": [
     4,
     0,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ff539a421f750e6e06ea38a6757461598f857a65",
-   "sha256": "1nb9s5v00r4kx39pa7z7b419xzlv108ilp6b9drx6wzsb1lil6fn"
+   "commit": "a1ea60ce0adfbb4b47cdd7f29943e5ee362b71ce",
+   "sha256": "1va7dsh0c2xf234lfkkmw63c9p0m9h8aiikrlf361nllrzz77497"
   }
  },
  {
@@ -68519,11 +68751,11 @@
   "repo": "hardenedapple/keyswap.el",
   "unstable": {
    "version": [
-    20160813,
-    957
+    20240717,
+    1440
    ],
-   "commit": "cd682a7c4a8d64d6bae6a005db5045232e5e7b95",
-   "sha256": "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2"
+   "commit": "d4f9f56a0e6e1365fc7c8ea8d953b8fdffad27fe",
+   "sha256": "1h229qpfhvfr47kbvip6a452czhjh3cnihsayrx4qkj42id0q2vr"
   }
  },
  {
@@ -68645,28 +68877,28 @@
   "repo": "khoj-ai/khoj",
   "unstable": {
    "version": [
-    20240707,
-    1256
+    20240816,
+    1432
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
-   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
+   "commit": "2b1482d2b44efeface0aff6b7479e4c46aca72b1",
+   "sha256": "0lr0v08c468m4i8w80xgpqzpfj621igff5c2xr0v5nn2phmi05rn"
   },
   "stable": {
    "version": [
     1,
-    16,
-    0
+    20,
+    4
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
-   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
+   "commit": "7815e02dd421b705461df6a97033dafd61ba6419",
+   "sha256": "0rdnar6d85cdf5vligxxnxbsawmdmkxlq1niadk4mg6fmfb7akrz"
   }
  },
  {
@@ -68909,11 +69141,11 @@
   "repo": "WammKD/emacs-klere-theme",
   "unstable": {
    "version": [
-    20240123,
-    124
+    20240815,
+    454
    ],
-   "commit": "e73a01e69bf80f753a1603337fdc4b89e685219a",
-   "sha256": "1kyx1r0hwb1d16mw6y39gl7a3x32wsl0z3riki87c139z66zy8hn"
+   "commit": "fec81fb9925cbcc4472f34ca9625ee310802cbf3",
+   "sha256": "04kv6mca1j1h90l1jg7abwnwn6q5a193d4r51jv2j8cs9pi6rrfy"
   }
  },
  {
@@ -68948,11 +69180,11 @@
   "repo": "vifon/kmacro-x.el",
   "unstable": {
    "version": [
-    20230502,
-    1253
+    20240721,
+    1103
    ],
-   "commit": "b5f6b408a9134f3db14c0516c5ba48d68178a175",
-   "sha256": "1qcs1pn2mkgfxs3975c95xflzl45zkf66kslp9c2lvlw668xyg9i"
+   "commit": "3f58f5421b98b436122dba2514cf559a7359904d",
+   "sha256": "0l3qrxgb8d67vwny7gpjjwnz367pbrj1qhy29cj9bbl9bbnlnkp8"
   }
  },
  {
@@ -68963,20 +69195,20 @@
   "repo": "for-GET/know-your-http-well",
   "unstable": {
    "version": [
-    20160208,
-    2305
+    20240726,
+    1649
    ],
-   "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7",
-   "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k"
+   "commit": "2ff1548a6d59f2b59cfbdd2697fcf202625cc248",
+   "sha256": "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
-   "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7",
-   "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k"
+   "commit": "2ff1548a6d59f2b59cfbdd2697fcf202625cc248",
+   "sha256": "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5"
   }
  },
  {
@@ -69239,8 +69471,8 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20240419,
-    1521
+    20240807,
+    905
    ],
    "deps": [
     "dash",
@@ -69248,8 +69480,8 @@
     "transient",
     "yaml-mode"
    ],
-   "commit": "eb41a6420d20142e5cd33cd34e17654294c99c86",
-   "sha256": "1zqm65vng1fiwfra21hz0xqnbiqh97av8jr981rczxin0byic66a"
+   "commit": "68da30c647e16307dff71e1614015ba9877cd621",
+   "sha256": "0mzrnzr23fva3kbkinn4a5m2lms415a2c71gwicbb02kxxwl1f7h"
   },
   "stable": {
    "version": [
@@ -69530,8 +69762,8 @@
   "repo": "isamert/lab.el",
   "unstable": {
    "version": [
-    20240712,
-    2254
+    20240724,
+    2233
    ],
    "deps": [
     "async-await",
@@ -69542,8 +69774,8 @@
     "request",
     "s"
    ],
-   "commit": "0528ca5c9e445700d7361b4263e85f618686fb38",
-   "sha256": "14qaz5grvkhy4sa6743qblg6b1r17zy5cpwsq1qxqml1kaliiv9q"
+   "commit": "8ecca9a5200b322ffb3aef1f690689dd35764ef1",
+   "sha256": "11nl7r8g8vcvcwmrc07lblbzs9fn6ydyk9jc8grij7h73gia5yxd"
   },
   "stable": {
    "version": [
@@ -69650,30 +69882,30 @@
   "repo": "Deducteam/lambdapi",
   "unstable": {
    "version": [
-    20240425,
-    941
+    20240729,
+    1656
    ],
    "deps": [
     "eglot",
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "a4bc3a492ff542be2989b545362cd98ed38412e1",
-   "sha256": "1968s3bmwhjrvp2lrwbjkjij0xl3s6isxy1fhdkhrpin0iyfizy9"
+   "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5",
+   "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa"
   },
   "stable": {
    "version": [
     2,
     5,
-    0
+    1
    ],
    "deps": [
     "eglot",
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "3730715c845c0732b912e10e14391350c327b6d3",
-   "sha256": "0cbs4nhj4lk6sj454vf6kfsljidchhh9h2ayn611kn9xd95hr082"
+   "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5",
+   "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa"
   }
  },
  {
@@ -69990,20 +70222,20 @@
   "repo": "X9hRRDys/latex-labeler",
   "unstable": {
    "version": [
-    20231231,
-    1909
+    20240730,
+    634
    ],
-   "commit": "c2df4c9d0a41a36de893925a91445ea65d504222",
-   "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r"
+   "commit": "9912f11ac683baa2336726d22ba1942c0c159106",
+   "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j"
   },
   "stable": {
    "version": [
     2,
     1,
-    0
+    1
    ],
-   "commit": "c2df4c9d0a41a36de893925a91445ea65d504222",
-   "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r"
+   "commit": "9912f11ac683baa2336726d22ba1942c0c159106",
+   "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j"
   }
  },
  {
@@ -70431,14 +70663,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20240618,
-    10
+    20240808,
+    2302
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "febda9969046019aae3bf3b7d1f042e9dbef2af9",
-   "sha256": "0d2va4hj66kq0v60caxvl20fpqvz5z9wv1rw54vp765ccslv7y05"
+   "commit": "82ec27e3441900daedeaaebca509181f964da81f",
+   "sha256": "0nsa01d35z3dvvb6dnc43ii461c15pp35ji92k15x8z9nyr25wrd"
   },
   "stable": {
    "version": [
@@ -70516,10 +70748,10 @@
  },
  {
   "ename": "lean-mode",
-  "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
-  "sha256": "0rwb4ca079myvipzq938mry5d0fvq5p7cj40fnjfx1cflwwfxbj8",
+  "commit": "95d2d051c47697fa09c37a64ce9070aded61503d",
+  "sha256": "1sgi79s2d511gb448cjd5sxrxrm2k0kv4ic7a27izm24vgfy77x4",
   "fetcher": "github",
-  "repo": "leanprover/lean-mode",
+  "repo": "leanprover/lean3-mode",
   "unstable": {
    "version": [
     20230611,
@@ -70625,11 +70857,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20240709,
-    1803
+    20240804,
+    1623
    ],
-   "commit": "17983be9e9de42eadccd50709ccc1d3c147e85ca",
-   "sha256": "008hb5d9xyq16mfgxg1hll4szf12q4r1i4p6kc3l7xc7ancb7vr6"
+   "commit": "a6be7a2d79281a442ce5abd3f073b6c20d7d11d8",
+   "sha256": "0faj0q9amfisrjzf7cb0idnsyiw1sf4ravgjlh0k24y0mx25j1xw"
   },
   "stable": {
    "version": [
@@ -70664,18 +70896,17 @@
   "repo": "kaiwk/leetcode.el",
   "unstable": {
    "version": [
-    20230524,
-    1851
+    20240807,
+    1731
    ],
    "deps": [
     "aio",
     "dash",
-    "graphql",
     "log4e",
-    "spinner"
+    "s"
    ],
-   "commit": "e5701191a98d043acdc7112f28d67e3d5c848228",
-   "sha256": "0wdqr5lwgzq5rx47dhilcmldnvmrw16rlbaklbnyn3lfbsj8p18w"
+   "commit": "064a03d3407d67391fd8c0f6494d0e0f0d867edc",
+   "sha256": "0k0mqaj65sq6h45wh9y7qqv434n292r81iyam2ybxyxn99rzjmvh"
   },
   "stable": {
    "version": [
@@ -71317,16 +71548,16 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20240707,
-    730
+    20240715,
+    2304
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "ov"
    ],
-   "commit": "9c9248aff4aca8ae09fdcf391a315569d9ed4c65",
-   "sha256": "1xhlrb2wxm9pny79bs6cclmn72bhm1xh4brvqbxk4wannj3w4zkc"
+   "commit": "76677e48451b77508673a52dcc0845b87e5f81fe",
+   "sha256": "1zr4fvw286gdibf642hv7jnsyyvw81mxk7695g7wqb7q582lkm3h"
   },
   "stable": {
    "version": [
@@ -71475,14 +71706,14 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20240626,
-    1159
+    20240803,
+    1223
    ],
    "deps": [
     "avy"
    ],
-   "commit": "391930f2010014b9b5bc16bb431db01dd21ca7bd",
-   "sha256": "05arbdh5z3hk9z1h0yyafx51hakm9xgsdf8l1ha4bw686r83zxh6"
+   "commit": "eade470b2fe35b36b2ab3cc1c5f87792954063a2",
+   "sha256": "1mkishny6agg02ilshl6apz80hvwibs22yhn8394jpi0iwp8y7yk"
   }
  },
  {
@@ -71982,24 +72213,6 @@
    "sha256": "1gzpvl7pgawikkhprja6p94ymsjbsbklqjgdvhzca835mx1g4aw4"
   }
  },
- {
-  "ename": "litecoin-ticker",
-  "commit": "4976446a8ae40980d502186615902fc05c15ec7c",
-  "sha256": "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5",
-  "fetcher": "github",
-  "repo": "llcc/btcbox-ticker",
-  "unstable": {
-   "version": [
-    20160612,
-    11
-   ],
-   "deps": [
-    "json"
-   ],
-   "commit": "3d8047c736e4ee0b8638953f8cc63eaefad34106",
-   "sha256": "03iggfi3r5xjh9yhhpr1pgyayriycyybf8qnrhqkqcamh77kq21f"
-  }
- },
  {
   "ename": "literal-string",
   "commit": "6519bb53f409eeb0d557809b338849e473c193c4",
@@ -72197,11 +72410,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20240602,
-    513
+    20240720,
+    1532
    ],
-   "commit": "65eb99ca34c306c9f495ac199b9365f46f50ff03",
-   "sha256": "13d657gdviw6k61ivq8gd8hmapp968bq3vk82giih703isx065md"
+   "commit": "86f27626ca3c1350cb459aa2b72c12219962e8d8",
+   "sha256": "1i97jfmzq7q4xrp0h87s7kv2wszhjxa0z30sl4mxyqmv8q9qcc4x"
   },
   "stable": {
    "version": [
@@ -72305,17 +72518,17 @@
  },
  {
   "ename": "llama",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "0v9np9vzdzb9l1w915fw7impxqraiq8k464pgan3bc38r6gw40z2",
-  "fetcher": "sourcehut",
+  "commit": "572e92d1737bf72a1b8d399ef847d9c34862a680",
+  "sha256": "0gw02dcpwm1v4qz123d7p1sifcjgvg1wf8zw6si91hslrskkicw0",
+  "fetcher": "github",
   "repo": "tarsius/llama",
   "unstable": {
    "version": [
-    20240609,
-    1445
+    20240817,
+    1039
    ],
-   "commit": "485949eb0122203b388a2de3a46a7a770a2cb622",
-   "sha256": "1rh3nm9s10pq3l4nyz89f79l5nzrsp6k7p5hlkjqxbk5f6sgcmii"
+   "commit": "732389e3886b510c2661d7d4fd65e01837211e8a",
+   "sha256": "0c5dbslbfyj6aa8pssxwkbzdgsajhrjfm5hsy1qlhb3iasapslfc"
   },
   "stable": {
    "version": [
@@ -72519,20 +72732,20 @@
   "repo": "csmclaren/loco",
   "unstable": {
    "version": [
-    20240712,
-    1721
+    20240718,
+    125
    ],
-   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
-   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+   "commit": "fc590068204ae27eef0addfe89071bff2cfe117c",
+   "sha256": "1ds9bvz6rq7vkw3vgl77arawkcf854sb5a57c77h849mgypj43wz"
   },
   "stable": {
    "version": [
     0,
     1,
-    12
+    15
    ],
-   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
-   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+   "commit": "fc590068204ae27eef0addfe89071bff2cfe117c",
+   "sha256": "1ds9bvz6rq7vkw3vgl77arawkcf854sb5a57c77h849mgypj43wz"
   }
  },
  {
@@ -72912,8 +73125,8 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20240708,
-    156
+    20240818,
+    245
    ],
    "deps": [
     "compat",
@@ -72921,22 +73134,23 @@
     "seq",
     "stream"
    ],
-   "commit": "1c2a2164f24174a87194649f0286e0432594c84d",
-   "sha256": "1hrzyh6lzxl4pl8sg4lkqz3840pw3ngm3zlpq66qnwxqkq11dcsk"
+   "commit": "80a30903628bc8de36c51c966e6cf5b114001e47",
+   "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym"
   },
   "stable": {
    "version": [
     0,
-    12,
-    1
+    13,
+    0
    ],
    "deps": [
     "compat",
     "map",
-    "seq"
+    "seq",
+    "stream"
    ],
-   "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658",
-   "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p"
+   "commit": "80a30903628bc8de36c51c966e6cf5b114001e47",
+   "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym"
   }
  },
  {
@@ -72947,28 +73161,28 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20240225,
-    1740
+    20240818,
+    245
    ],
    "deps": [
     "dash",
     "loopy"
    ],
-   "commit": "eeebd2713d636b3cf08c6af22f46d23b9aa06592",
-   "sha256": "104vwcxcypib6w8706x27szdc2a40mcbz7kakkpk8qhvg5an6gq3"
+   "commit": "80a30903628bc8de36c51c966e6cf5b114001e47",
+   "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym"
   },
   "stable": {
    "version": [
     0,
-    12,
-    1
+    13,
+    0
    ],
    "deps": [
     "dash",
     "loopy"
    ],
-   "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658",
-   "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p"
+   "commit": "80a30903628bc8de36c51c966e6cf5b114001e47",
+   "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym"
   }
  },
  {
@@ -73191,15 +73405,15 @@
   "repo": "emacs-lsp/lsp-haskell",
   "unstable": {
    "version": [
-    20240705,
-    832
+    20240729,
+    1637
    ],
    "deps": [
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "1d15706321ac86ce2275442fe67c2778ecb567a6",
-   "sha256": "0y56l4ln8l5cg2jidr2vvr3ri729si88yfpfv72zf5dmzvyhlgar"
+   "commit": "85a82c9cf4a7ed4be339e80a98cf41cbf2c999d3",
+   "sha256": "1r4dvmhl7hq841l0iil2q2rjyzqipkk3sp9lrdb0f04p2wl3pzx4"
   }
  },
  {
@@ -73386,15 +73600,15 @@
   "repo": "ROCKTAKEY/lsp-latex",
   "unstable": {
    "version": [
-    20240324,
-    1218
+    20240803,
+    1436
    ],
    "deps": [
     "consult",
     "lsp-mode"
    ],
-   "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c",
-   "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k"
+   "commit": "2f45606dce911ebc45a42cbbaa01973b8caff4ec",
+   "sha256": "1wslncvjrcvw7xjjpiyfy8avn30xa2n7jv01lqp66s0jmg7f9pln"
   },
   "stable": {
    "version": [
@@ -73495,8 +73709,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20240711,
-    212
+    20240817,
+    1400
    ],
    "deps": [
     "dash",
@@ -73507,8 +73721,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "52987755175042b9569e32d72ae29eba119020d6",
-   "sha256": "0sj9by3xnpc8xdj7df3x2lfkv32hwq9bakcdyyjhzaydkivsqd6s"
+   "commit": "12befaabe4a1bf8a548bc820faa192be8ee89533",
+   "sha256": "1p0sbcip9vzds2cpcq5r6zqnfn5g84gl9dmmkpgaws403cwz9fia"
   },
   "stable": {
    "version": [
@@ -73801,16 +74015,16 @@
   "repo": "emacs-lsp/lsp-sonarlint",
   "unstable": {
    "version": [
-    20240628,
-    2255
+    20240806,
+    305
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "043bda7b2210440169a4a551e16ae9a093a14589",
-   "sha256": "00f6sm8z54jl2vka5nyx73qh7lq3d1j565w1jxy98jfvxfjw8jq1"
+   "commit": "ad668f7451664c901f798878534d85dd5e09a4a8",
+   "sha256": "15hsgbansrl08i6rbw5hkl3jqva4jwhlj1rlv33vxfkhkamv0krs"
   },
   "stable": {
    "version": [
@@ -73988,10 +74202,10 @@
  },
  {
   "ename": "lurk-mode",
-  "commit": "4d2e408fe6728027e9b54e944c5c252e3fa5c25e",
-  "sha256": "1khsl69wm3b90ydxks1rc1rii9yzpj8b7ms1lpf0g1d6a6grkfx6",
+  "commit": "8399712211a0fb927970917aec906a97488d00fb",
+  "sha256": "09djfy6d0929csx6f32klm4p41rc6gvr01g60wjiyg7yycw1r4fr",
   "fetcher": "github",
-  "repo": "lurk-lab/lurk-emacs",
+  "repo": "argumentcomputer/lurk-emacs",
   "unstable": {
    "version": [
     20230120,
@@ -74279,14 +74493,14 @@
   "repo": "amake/macports.el",
   "unstable": {
    "version": [
-    20240321,
-    2352
+    20240814,
+    1020
    ],
    "deps": [
     "transient"
    ],
-   "commit": "a5ef9d69ff04f5dc62c5a48c5119d96ab3e4d62a",
-   "sha256": "1qwpj4qmq31270r0n17dfkwskxcyd5ysg78f2yggb9zfk5vvdn1d"
+   "commit": "594b0dcd596464270d5e954d7c78015df2132c33",
+   "sha256": "1i6kh84z7cifyb5h0a0p2sajbq6xyqm4pbf9pspqxphgmaspi2mp"
   }
  },
  {
@@ -74451,38 +74665,38 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20240521,
-    1419
+    20240814,
+    914
    ],
    "deps": [
     "compat"
    ],
-   "commit": "51ec2d21e4d68fc549d2022f86a882e090541ec3",
-   "sha256": "1mxpwx1n537gjhb09h8d8mnf8ra5qlcnn13260447xk7z620sh8l"
+   "commit": "e4b0ab1e97095973e7c40fed20e3acbfa1172823",
+   "sha256": "1mkikn2wx32c1q7dbdnrr8r2sd02k4id5803lv7lbgc4h6q0n424"
   },
   "stable": {
    "version": [
     0,
     3,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6ac83927a6c294619bb99cb1ceb2ecf352498599",
-   "sha256": "0x70dd12w0p44c7b5273fwi51sr2giqcl230170v8vk9rn73p12i"
+   "commit": "dfbb5482b18633adf9790599f415aa5c507228ca",
+   "sha256": "15kshz11g2h6d13vpayhl9p3d95qm253s5knhhlwxm8yykw94pp4"
   }
  },
  {
   "ename": "magit",
-  "commit": "40dc61c315a69179487aa14e93acd48aa24d0008",
-  "sha256": "0c3gkp4l3y10gj6231w3x6zg5ybkfal4dp7hvjynaspgq5qkfsx5",
+  "commit": "3126dac37def07fcaa667a325ee79349fb80d285",
+  "sha256": "1fk4h891k1w6q0v6bbwlisfb0wc0pmyh2jxdf23v7crd2fc36wcc",
   "fetcher": "github",
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240711,
-    2313
+    20240819,
+    2250
    ],
    "deps": [
     "compat",
@@ -74493,24 +74707,26 @@
     "transient",
     "with-editor"
    ],
-   "commit": "7b4ab4348ea9ab1022a2717c2bcada62575bf091",
-   "sha256": "1192369nkxb42mfv0bwbjmdmbyg4k624kw6xsycihm0xs7691kzz"
+   "commit": "6234c35d80e994ce93a98a958be99c367dc10171",
+   "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild"
   },
   "stable": {
    "version": [
-    3,
-    3,
+    4,
+    0,
     0
    ],
    "deps": [
+    "compat",
     "dash",
     "git-commit",
     "magit-section",
+    "seq",
     "transient",
     "with-editor"
    ],
-   "commit": "f44f6c14500476d918e9c01de8449edb20af4113",
-   "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn"
+   "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1",
+   "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k"
   }
  },
  {
@@ -74521,28 +74737,26 @@
   "repo": "magit/magit-annex",
   "unstable": {
    "version": [
-    20231210,
-    2140
+    20240811,
+    1850
    ],
    "deps": [
-    "cl-lib",
     "magit"
    ],
-   "commit": "056f0d4462cdccbd7bb7589994da7fef9de766da",
-   "sha256": "1fwy7q03d8q1hnwnd86pygpf9l4lgfgslp6claxsyp840ibrxq5z"
+   "commit": "9db0bc61461f222106c7ae3d8cd6d3de1f1b143f",
+   "sha256": "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc"
   },
   "stable": {
    "version": [
     1,
-    8,
-    1
+    9,
+    0
    ],
    "deps": [
-    "cl-lib",
     "magit"
    ],
-   "commit": "018e8eebd2b1e56e9e8c152c6fb249f4de52e2d8",
-   "sha256": "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk"
+   "commit": "9db0bc61461f222106c7ae3d8cd6d3de1f1b143f",
+   "sha256": "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc"
   }
  },
  {
@@ -74858,26 +75072,26 @@
   "repo": "magit/magit-imerge",
   "unstable": {
    "version": [
-    20230522,
-    1054
+    20240811,
+    1933
    ],
    "deps": [
     "magit"
    ],
-   "commit": "b7cfe49a197c2cf5948109921e053711b156389d",
-   "sha256": "0hh73aq6afixq3wqc7fcrbj9jxvwllwyfxnd0k1b5dx2q02nrxyv"
+   "commit": "e9955c3b4dac2661f67d9882ed3367471e529cfc",
+   "sha256": "0wv37c6rjnmvba14p1zw2fvs698fxj3ka9nhlk1d7bg6wsyscr99"
   },
   "stable": {
    "version": [
     1,
-    2,
+    3,
     0
    ],
    "deps": [
     "magit"
    ],
-   "commit": "1ee213d7fa1536c86c128d09946b44ededbfac9c",
-   "sha256": "1virc4ps25nwv8jkyvlb4ylxpcz676bfw449izaly97f2f2a91hk"
+   "commit": "a4981f6944ff341c1b60b7b47babea625ec37d99",
+   "sha256": "15a66fv53wls4jldbgh6gycpabx7wnpg7x2dpllv3x1qv2159nnz"
   }
  },
  {
@@ -75066,33 +75280,36 @@
  },
  {
   "ename": "magit-section",
-  "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3",
-  "sha256": "0p7x5s6sr9d7v633hqkp36iq601323vkr07402c563rs3a7anarx",
+  "commit": "3126dac37def07fcaa667a325ee79349fb80d285",
+  "sha256": "0jagkxhk7yr5hl6gfxknhk86nghyxm2wp89252r3d0mzf0p6gpsf",
   "fetcher": "github",
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240710,
-    2125
+    20240819,
+    2250
    ],
    "deps": [
     "compat",
-    "dash"
+    "dash",
+    "seq"
    ],
-   "commit": "804c623cf6fa50a291273f582e3355fde408239b",
-   "sha256": "0ml7vg70c7yqn3qy4zjx17psk0cfxp8nj8ck90y9piq6a1kpxwdg"
+   "commit": "6234c35d80e994ce93a98a958be99c367dc10171",
+   "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild"
   },
   "stable": {
    "version": [
-    3,
-    3,
+    4,
+    0,
     0
    ],
    "deps": [
-    "dash"
+    "compat",
+    "dash",
+    "seq"
    ],
-   "commit": "f44f6c14500476d918e9c01de8449edb20af4113",
-   "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn"
+   "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1",
+   "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k"
   }
  },
  {
@@ -75182,26 +75399,26 @@
   "repo": "magit/magit-tbdiff",
   "unstable": {
    "version": [
-    20220527,
-    2213
+    20240811,
+    1938
    ],
    "deps": [
     "magit"
    ],
-   "commit": "55e6443710def357f3f78eea27d5bbe023d868f5",
-   "sha256": "0ypkawcp964r9rx8bl3hppcvkkngljyhy1kpfvfxmqalgy2wr9ig"
+   "commit": "03cb872f00dd7fc868de0c8d7661803b5d011aa0",
+   "sha256": "1xmkdd8fg3rw5xhxhrilll5fqzhb2xr15qrjrcbblpnzn9zl5rvk"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "magit"
    ],
-   "commit": "ae9345d867539a4c5c635be04df2e26468444da8",
-   "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3"
+   "commit": "e8219d2db176bfccb1aa485c9ae91743c33ada0e",
+   "sha256": "1jh6wspb6ijmkqvyaswqj60ixpgjj2ijcf0b53q48pfs5dwc97p4"
   }
  },
  {
@@ -75900,25 +76117,25 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20240710,
-    953
+    20240813,
+    701
    ],
    "deps": [
     "compat"
    ],
-   "commit": "40534231fd2805aa17ba3c59fd57e6a34b5a526b",
-   "sha256": "0jvd8vjhwvjv9f2h16dqc3c8ax3mdcfak5lik0p8m8kfzrb4grl1"
+   "commit": "c34fdacce64168cb20d710a87e66cc9d1f795a82",
+   "sha256": "11d1rf0yanknf85vrn0qp6flfrscx82zz3j0czypbgdqxcqjj08y"
   },
   "stable": {
    "version": [
     1,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc",
-   "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0"
+   "commit": "7a7f3363d042d1bf43ae697f4401638ed18230a5",
+   "sha256": "1y79fhki7wbfaw24n5n5w80yvchj1ncz74yvfbgf7sna2ngz4yih"
   }
  },
  {
@@ -76042,11 +76259,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20240626,
-    826
+    20240716,
+    249
    ],
-   "commit": "8aab017f4790f7a1e0d8403239cce989c88412f6",
-   "sha256": "11922fkzsglvmfqzz0vzkg6w7q83qb0fkv2q7xlp1xi995041wqp"
+   "commit": "8a7773f87733866a961ea4c518a4a2f283f21970",
+   "sha256": "0nm6s8bw390zynwx4agc11gzqj515sxpzjqyih22lxlf4mmwmqqy"
   },
   "stable": {
    "version": [
@@ -76387,28 +76604,28 @@
   "repo": "martianh/mastodon.el",
   "unstable": {
    "version": [
-    20240701,
-    1604
+    20240816,
+    709
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
-   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
+   "commit": "3443b49c55f65ae8e0b07e93e1e0299ce1bf8ed6",
+   "sha256": "0564nylzj5ysjma3vnphga6ngds2s9x4410qg3yqgy5caxkpz321"
   },
   "stable": {
    "version": [
     1,
     0,
-    24
+    25
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
-   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
+   "commit": "45903de823d3c6b46c4aa694112e9f5429e1a3f9",
+   "sha256": "02ykj4hyddd5p0idl8gvgl9q770vni69xsza99y3rpyilc2a8r66"
   }
  },
  {
@@ -76442,16 +76659,16 @@
   "repo": "matsievskiysv/math-preview",
   "unstable": {
    "version": [
-    20240519,
-    740
+    20240801,
+    513
    ],
    "deps": [
     "dash",
     "json",
     "s"
    ],
-   "commit": "7c12235c7f8bb1af0e712a8bfa77f1f2635d964a",
-   "sha256": "0ia9ca9nlq7wjzwk7h1q0kw00avifmc86v0yimn04p21zv3bg45n"
+   "commit": "a2ca3c175468ceaf02bab6cdfd8ef016bda2b98d",
+   "sha256": "0hdd8fdgmnz3lyy1kfycb5lsy9pzdw3zp8z9arw6n7cwlzcz9fd3"
   },
   "stable": {
    "version": [
@@ -76898,11 +77115,11 @@
   "repo": "jojojames/media-thumbnail",
   "unstable": {
    "version": [
-    20220827,
-    2325
+    20240816,
+    458
    ],
-   "commit": "14e626fe7ee714ab45c9e636d00a26e89aa2832a",
-   "sha256": "09h491hkpisk8nsi96v58glfxi1iidv1ajfy86fx7zrbwcwkfh9g"
+   "commit": "190632c1d6cc2ab94031d57e0c24412a4698faf0",
+   "sha256": "1bj4l8yb383m2b43i514044yjpgh27v69gvm71a08n7r4hhdhbpr"
   }
  },
  {
@@ -77132,11 +77349,11 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20240712,
-    2221
+    20240809,
+    1843
    ],
-   "commit": "369014fd92e44f4cec54a78fa9be11d35b44f277",
-   "sha256": "0aj3hhdff5vbp97j09ch5ajdhdmnvr0gbj0f2xibqxyb8k1pp9jk"
+   "commit": "0611eba87ae3e86d19e2c4f50988ff2ec935f830",
+   "sha256": "1my99kfidqvdnd4b2jckwsrwh7lx513zbd8g06lqy6gfqf5qxksg"
   },
   "stable": {
    "version": [
@@ -77682,8 +77899,8 @@
   "repo": "danielsz/meyvn-el",
   "unstable": {
    "version": [
-    20240628,
-    2350
+    20240818,
+    2247
    ],
    "deps": [
     "cider",
@@ -77694,13 +77911,13 @@
     "projectile",
     "s"
    ],
-   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
-   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
+   "commit": "c72e41cff7b03e263fc2b850b7e0b6ddbf2267b0",
+   "sha256": "13b3nvw1f7cb2cxbp94f8il7j01kkjh4jmv0hz0p26zzqabn8x8g"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "cider",
@@ -77711,8 +77928,8 @@
     "projectile",
     "s"
    ],
-   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
-   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
+   "commit": "62802ab42ee021f89f980bd3de3e1336ad760944",
+   "sha256": "0821sk0mq1602mk3hp7igcafp8fpfg586nk41iz9syc06xbh0if7"
   }
  },
  {
@@ -77777,11 +77994,11 @@
   "repo": "ROCKTAKEY/mic",
   "unstable": {
    "version": [
-    20230725,
-    1139
+    20240806,
+    1655
    ],
-   "commit": "95dcc9fa306f579e8de6e417839841efe88ae1fc",
-   "sha256": "19v6q0knrkzchis3bax4h9szbiqxfk0fm83sy0zvd1gqh8jlpfh7"
+   "commit": "f552ddf397e899e9c2b96ef4e56a08cc8804a1c5",
+   "sha256": "0j8dpsj5i519i5imsg5s4bs25r050ha5b1db3r8rx7d6xa4325dn"
   },
   "stable": {
    "version": [
@@ -77935,14 +78152,14 @@
   "repo": "countvajhula/mindstream",
   "unstable": {
    "version": [
-    20240519,
-    1715
+    20240803,
+    126
    ],
    "deps": [
     "magit"
    ],
-   "commit": "ae8b10b077d71de5e8ad966e03527e8d55b3e18d",
-   "sha256": "17f68h5ibn3klcfj570fprx7n9q59x8wjwdbzzhry2c7g9ay94nl"
+   "commit": "6a7d7b4fe496ff6bec27d52addd23947f81cb843",
+   "sha256": "05gpmaqb54xxy38lxaarh6l6i2hnyg1mh2ycsh8bxaiklslavzm6"
   },
   "stable": {
    "version": [
@@ -77997,15 +78214,15 @@
   "repo": "liuyinz/mini-echo.el",
   "unstable": {
    "version": [
-    20240612,
-    1328
+    20240816,
+    2131
    ],
    "deps": [
     "dash",
     "hide-mode-line"
    ],
-   "commit": "802321f0658b364d4e9d90a4ac43959d46048015",
-   "sha256": "1jkv1bhgiznxaj1jy8si505k86179wdnwipcqr2bgqckpr5dg7rk"
+   "commit": "3f97d443554a7e98b68e541e2886f8a64f54d8b2",
+   "sha256": "0pjpa7cf372ps680isrqpnfz0ayzp88gikgm4a8grsx6wf9qgd3s"
   },
   "stable": {
    "version": [
@@ -78228,26 +78445,26 @@
   "repo": "tarsius/minions",
   "unstable": {
    "version": [
-    20240618,
-    1732
+    20240805,
+    1422
    ],
    "deps": [
     "compat"
    ],
-   "commit": "4566325917791b878430526f42349a644b03089d",
-   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
+   "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a",
+   "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "4566325917791b878430526f42349a644b03089d",
-   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
+   "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a",
+   "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya"
   }
  },
  {
@@ -78750,20 +78967,20 @@
   "repo": "DCsunset/modaled",
   "unstable": {
    "version": [
-    20240511,
-    1540
+    20240728,
+    1414
    ],
-   "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932",
-   "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702"
+   "commit": "9a60234760b937728ebdec42b378edf99f29a484",
+   "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj"
   },
   "stable": {
    "version": [
     0,
-    8,
-    4
+    9,
+    1
    ],
-   "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932",
-   "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702"
+   "commit": "9a60234760b937728ebdec42b378edf99f29a484",
+   "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj"
   }
  },
  {
@@ -78851,26 +79068,26 @@
   "repo": "tarsius/mode-line-debug",
   "unstable": {
    "version": [
-    20240618,
-    1733
+    20240805,
+    1423
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
-   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
+   "commit": "a88406d1a999107610a765550c3bc4d64850f8a0",
+   "sha256": "07mbq8psd5mzsqigdvjk5hdc8kbppfghg976p5nqq4xfy3p6n0v9"
   },
   "stable": {
    "version": [
     1,
     4,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
-   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
+   "commit": "a88406d1a999107610a765550c3bc4d64850f8a0",
+   "sha256": "07mbq8psd5mzsqigdvjk5hdc8kbppfghg976p5nqq4xfy3p6n0v9"
   }
  },
  {
@@ -78881,11 +79098,11 @@
   "repo": "ideasman42/emacs-mode-line-idle",
   "unstable": {
    "version": [
-    20240421,
-    623
+    20240801,
+    1318
    ],
-   "commit": "3bc67905ea3349ec20d4c537a0c5f2e833b9e905",
-   "sha256": "03z1940h3p5hlmgl0n82im4hn04rcmw4xwq3ygmqg999l10dcr2c"
+   "commit": "f1224688be854183ebe939876f6ac8372d3e9679",
+   "sha256": "1042ma7c6hbb2shi2m834c7aajk2qbygxdl4fhnp20ipf1gqchbw"
   }
  },
  {
@@ -79025,11 +79242,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20240709,
-    638
+    20240811,
+    502
    ],
-   "commit": "a9f709e3448ff3def66328db74f5ca41366da957",
-   "sha256": "1ybhq9xpm3p7h9nk2a9069b7sw8v0qvwjjk1447gf26p5ah39dgl"
+   "commit": "3002f6fb64e147ece4284880ffa93c6c3baa0e75",
+   "sha256": "15sv711y34h6w5lzbkyvvbyh5j02288p5iqj3jngl1qsdz7xb79m"
   },
   "stable": {
    "version": [
@@ -79049,11 +79266,11 @@
   "repo": "kuanyui/moe-theme.el",
   "unstable": {
    "version": [
-    20240430,
-    1601
+    20240716,
+    854
    ],
-   "commit": "6df0d99a1a2006b218282f15d84609b88478ca7a",
-   "sha256": "1rshp0n9nhnapp2glds6zrnp2l4nv93s0kxb8iqjr5n6a9x6m68y"
+   "commit": "4b3642157bfe9a9268310d321cfe67c8c236b5e1",
+   "sha256": "1smhp76aimy192s930d5pxpz4awbp1y0400vdzhqd5ii3q69ssb3"
   },
   "stable": {
    "version": [
@@ -79387,26 +79604,26 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20240618,
-    1736
+    20240805,
+    1425
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
-   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
+   "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e",
+   "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
-   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
+   "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e",
+   "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp"
   }
  },
  {
@@ -79417,11 +79634,11 @@
   "repo": "takaxp/moom",
   "unstable": {
    "version": [
-    20230722,
-    2037
+    20240802,
+    800
    ],
-   "commit": "54750aa2e3e9476375a32ef94714e22ece6e4039",
-   "sha256": "119jzkf3ccqrxrjxx5x32rgpl7nip9c333ypmssy4pmylpcqls73"
+   "commit": "b90adeff532b39568a84f04f72a1eb60dbe4b175",
+   "sha256": "1flsbrw431jd2gqnhw3hddgy5vgp1vm7vqr4617rr6hdiscgx6kd"
   },
   "stable": {
    "version": [
@@ -79514,26 +79731,26 @@
   "repo": "tarsius/morlock",
   "unstable": {
    "version": [
-    20240618,
-    1737
+    20240805,
+    1424
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
-   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
+   "commit": "b75fe54906eaf70143526c3d74930c811c819aa0",
+   "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
-   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
+   "commit": "b75fe54906eaf70143526c3d74930c811c819aa0",
+   "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga"
   }
  },
  {
@@ -79806,21 +80023,21 @@
   "repo": "google/mozc",
   "unstable": {
    "version": [
-    20240209,
-    1327
+    20240729,
+    1542
    ],
-   "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50",
-   "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj"
+   "commit": "5e6abfe1853b080766def432b746a9bed79e54b0",
+   "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf"
   },
   "stable": {
    "version": [
     2,
-    29,
-    5374,
+    30,
+    5544,
     102
    ],
-   "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50",
-   "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj"
+   "commit": "5e6abfe1853b080766def432b746a9bed79e54b0",
+   "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf"
   }
  },
  {
@@ -81268,11 +81485,11 @@
   "repo": "kenranunderscore/emacs-naga-theme",
   "unstable": {
    "version": [
-    20240607,
-    1946
+    20240715,
+    1925
    ],
-   "commit": "84b28f3f5dcdd03205d5ff4764704806019ff332",
-   "sha256": "14816rkx6xws5gx9az4g3dk06cg8wpa3zc2iixyr4q6qc9xbp6yq"
+   "commit": "cca6f1913cc899efaa59df52b8f09dd1a0768e20",
+   "sha256": "0a3fyzrv34k0q8df9iq4wqjsyqqxpvswndslakki6mkg3xl35f64"
   }
  },
  {
@@ -81940,14 +82157,14 @@
   "repo": "jaypei/emacs-neotree",
   "unstable": {
    "version": [
-    20230815,
-    219
+    20240721,
+    233
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2b0cb8285352202c62b1e46a8aa265a5e4f9d966",
-   "sha256": "1ar32yv9mrvg2q0wdi3da9hzk70ml5jj7wjrcnnmhdmi4sigzjpg"
+   "commit": "599bd049a5d9cfab8a0d7ab7bec99d58b4581751",
+   "sha256": "0xa9kz5rhqidhfcpjp9m7l4pgprhwd3wfps0y9wfgddb61rh5klp"
   },
   "stable": {
    "version": [
@@ -81970,11 +82187,11 @@
   "repo": "rainstormstudio/nerd-icons.el",
   "unstable": {
    "version": [
-    20240524,
-    311
+    20240816,
+    1555
    ],
-   "commit": "3dac80b712fb3043ec2bd7510f587548074484a3",
-   "sha256": "1nf6hjjkp6r9cnf6gzb2hsxp1z638b04h4yl5gsl0knby3zpip1x"
+   "commit": "c3d641d8e14bd11b5f98372da34ee5313636e363",
+   "sha256": "0dmi01x8vk165i8161scqg3vmaspfih6pblr3iaw8ksp5ps1hnlf"
   },
   "stable": {
    "version": [
@@ -81994,14 +82211,15 @@
   "repo": "rainstormstudio/nerd-icons-completion",
   "unstable": {
    "version": [
-    20230430,
-    1611
+    20240731,
+    1213
    ],
    "deps": [
+    "compat",
     "nerd-icons"
    ],
-   "commit": "5cfee6ff1b9647c783bae944402d60440ce04cbb",
-   "sha256": "1kqjd2yvcnhivr0daj78ppxnz5cxb9cgrmnlxy1fighqp715g78d"
+   "commit": "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420",
+   "sha256": "03kkyxc9v38v1fc69xqc70gwvsq4pr8bgsk8f6is9z2w7p4y08sm"
   }
  },
  {
@@ -82581,11 +82799,11 @@
   "repo": "mrcnski/nimbus-theme",
   "unstable": {
    "version": [
-    20231227,
-    1644
+    20240819,
+    14
    ],
-   "commit": "09e6dcdd491c7aa5aa355e441a03492991830ad1",
-   "sha256": "1zi90ixnmgiwzclgji5l1w4qh9ib3lv2qkmjh2p2xrkivlq553b3"
+   "commit": "f184a3eaf61616a23c27147700bac883c4237fc4",
+   "sha256": "01711zjyfj21gjb7l9vwypfzk8gvkf1lx86ay2mkpb2r6xv8xnxm"
   },
   "stable": {
    "version": [
@@ -82804,6 +83022,24 @@
    "sha256": "01cc86wvlwl5sy758vcjhwwh1has4ng6sqyrsd5y610qahs8cbib"
   }
  },
+ {
+  "ename": "nixfmt",
+  "commit": "acc471786956d364ffd04630161e8c05e5cb98c5",
+  "sha256": "1b901cyn2q3zmgzldjwm0ymw7491kcdakbqp6lvhczyd4v2ww05p",
+  "fetcher": "github",
+  "repo": "purcell/emacs-nixfmt",
+  "unstable": {
+   "version": [
+    20240724,
+    1531
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "9c8a1c12320247a3fe643191b7574a3674fba317",
+   "sha256": "0jmficjx9hl7048pjwz72lj8344amlhndd1d6c3hjbjs6w19jl8i"
+  }
+ },
  {
   "ename": "nixos-options",
   "commit": "6846c7d86e70a9dd8300b89b61435aa7e146be96",
@@ -83017,14 +83253,14 @@
   "repo": "ranmaru22/no-clown-fiesta-theme.el",
   "unstable": {
    "version": [
-    20240708,
-    1611
+    20240725,
+    2030
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "857c6261b6047855c9ccb4e9af3ba6b456566fd5",
-   "sha256": "12d7fzax3nkn2mnhaq980zkfmwzy5spa2shgam7pq5y5ay0bi754"
+   "commit": "d97f521d4e29181af59412ac32de34ca487345d8",
+   "sha256": "0nf57jasppbnp0df968ikdqyk094qaxlsxwkcinq4572175lgq9h"
   }
  },
  {
@@ -83050,26 +83286,26 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20240624,
-    1447
+    20240812,
+    1522
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f45335ede7c1246f922816610139face112e236b",
-   "sha256": "010ldsn75xrbjj82115gxib150knj9q76k1jwpz1rd1alx0l16qj"
+   "commit": "d80f442c15a1e81ce939891bbb4497a0559831b9",
+   "sha256": "0mxy4gz53885kz4z4irni7hjigcmw16672fwwha33lyrd3822a4g"
   },
   "stable": {
    "version": [
     1,
     7,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9078334e44393696c78c6acb4484480fd4cf4b5d",
-   "sha256": "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4"
+   "commit": "8658ff9a6f27512218fdbf7bba328917a27d5a47",
+   "sha256": "1ldsyzdnc79byg07j2fckh6m48iq8ffp19y6chhhi2dci35zard7"
   }
  },
  {
@@ -83519,11 +83755,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20240619,
-    1038
+    20240816,
+    2039
    ],
-   "commit": "b526c5ef0e1ae78380e68e5a24170542b884cbe3",
-   "sha256": "0is93vccnhz1gliiz6xh35xxwr2ginvgr094dkz5r920lhvc5s61"
+   "commit": "2355ff274d3694fc79c655bb45c61245fb9a9302",
+   "sha256": "0xipy48rpalnqp24dh424xl6d8vh8f6r5b31rwq5n5f23m9hz300"
   },
   "stable": {
    "version": [
@@ -83537,34 +83773,34 @@
  },
  {
   "ename": "notmuch-addr",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "1whfz41z60jw0v1kfg73b6myjqknff76i1ialqc1schpgm9lgnkc",
-  "fetcher": "sourcehut",
+  "commit": "a4d051294c52a3648e5555d007fafb166c8cb60b",
+  "sha256": "03h4ij4nqvlzmr72zzzx3sb7ckn24bgip056p7p3gs3f3n1icfr8",
+  "fetcher": "github",
   "repo": "tarsius/notmuch-addr",
   "unstable": {
    "version": [
-    20240618,
-    1830
+    20240805,
+    1915
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
-   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
+   "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b",
+   "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
-    3
+    0
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
-   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
+   "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b",
+   "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7"
   }
  },
  {
@@ -83629,68 +83865,68 @@
  },
  {
   "ename": "notmuch-maildir",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "0jl89a7524mn15m59z8hiblwxwly3k5l0vjrqh015qschm89cf46",
-  "fetcher": "sourcehut",
+  "commit": "763ce547a4d60099f9e0ba770e47c1b4e6e49389",
+  "sha256": "0v43r5820s8vgjinaicgxwy9vrbykap42nkbixiwp1rbjdmb8grr",
+  "fetcher": "github",
   "repo": "tarsius/notmuch-maildir",
   "unstable": {
    "version": [
-    20240618,
-    1831
+    20240805,
+    1916
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
-   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
+   "commit": "f723dd29c836e1288abb99958376a086b9f6197a",
+   "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
-    3
+    0
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
-   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
+   "commit": "f723dd29c836e1288abb99958376a086b9f6197a",
+   "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j"
   }
  },
  {
   "ename": "notmuch-transient",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "1xxwj8awlsdw05dr9x4vcvp5yw88dghb55frgrx7682zfr44z8h8",
-  "fetcher": "sourcehut",
+  "commit": "1cb71793a8fe81abd7c50155468494a361fa33fd",
+  "sha256": "1lwx95vvk0c25228xc5szzmcm65fwvybw3j2cjsjc056n6nmx2as",
+  "fetcher": "github",
   "repo": "tarsius/notmuch-transient",
   "unstable": {
    "version": [
-    20240618,
-    1832
+    20240805,
+    1916
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
-   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
+   "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240",
+   "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
-    2
+    0
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
-   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
+   "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240",
+   "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l"
   }
  },
  {
@@ -83701,14 +83937,14 @@
   "url": "https://depp.brause.cc/nov.el.git",
   "unstable": {
    "version": [
-    20240407,
-    1219
+    20240421,
+    2149
    ],
    "deps": [
     "esxml"
    ],
-   "commit": "9b7bef950d68c2518710c480729d6bb6026e9489",
-   "sha256": "10lxy18zs8bkld0ql75kdxdmbmr8h68lsk8a960iy3j1jg1rz1sn"
+   "commit": "66820c2c5bec54b080c9d7ed9e777611bae70776",
+   "sha256": "0vjpq9z7xckrgrwxzidhzy8y7kprc9x7m9fdj5gj3ygp86hhxs2c"
   },
   "stable": {
    "version": [
@@ -84488,14 +84724,26 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240213,
-    1729
+    20240814,
+    938
    ],
    "deps": [
     "chatgpt-shell"
    ],
-   "commit": "2657079cb4d83d4fdcc0de4d5d225ed7e960ac9b",
-   "sha256": "0rm4mvd08vijw61ambbs9k0gc334iy5n2iaw886zpkyj5g4gngp5"
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "chatgpt-shell"
+   ],
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
   }
  },
  {
@@ -84649,14 +84897,26 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20231129,
-    130
+    20240814,
+    938
    ],
    "deps": [
     "dall-e-shell"
    ],
-   "commit": "f27fc3ff5d01db4bae3e5c22c4ec208e387b7af1",
-   "sha256": "17jra66ffa8slzm0y6n64nxxns6a1m3sbd4azrzrlyqx81qh26dz"
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "dall-e-shell"
+   ],
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
   }
  },
  {
@@ -85159,10 +85419,10 @@
  },
  {
   "ename": "ob-lurk",
-  "commit": "cda18b6b3759d6cb39fd83782635f6380d04ec0a",
-  "sha256": "19x4ajjamql1w483lwvim47rr5mpimyiv81m22mknly3piw9z8l9",
+  "commit": "8399712211a0fb927970917aec906a97488d00fb",
+  "sha256": "0ajy98lzgq2k4dz4m03qlxndy38xqyr4whhd33v97mqwgzsdrf7c",
   "fetcher": "github",
-  "repo": "lurk-lab/lurk-emacs",
+  "repo": "argumentcomputer/lurk-emacs",
   "unstable": {
    "version": [
     20221122,
@@ -85329,11 +85589,11 @@
   "repo": "rkiggen/ob-powershell",
   "unstable": {
    "version": [
-    20221227,
-    1106
+    20240718,
+    1429
    ],
-   "commit": "e514efa7fbbdac80082761580ed23fd5ae3abc5d",
-   "sha256": "1rkgrylcz07y1b5iyp0xh3bmckacwkm4x399lzl97i4cnpfl67s0"
+   "commit": "3f00ffdca27e52e0bac64d6616a4a3054f74a711",
+   "sha256": "154jmhdfnb1wwzxdp30ln3xza2cqq6y4j7cvchgs1banp36ddgnd"
   }
  },
  {
@@ -86157,26 +86417,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20240513,
-    956
+    20240808,
+    1328
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f",
-   "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k"
+   "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9",
+   "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6"
   },
   "stable": {
    "version": [
     4,
-    24,
-    7
+    25,
+    0
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f",
-   "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k"
+   "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9",
+   "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6"
   }
  },
  {
@@ -86221,36 +86481,36 @@
  },
  {
   "ename": "ol-notmuch",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "0hfqkx1mwszrk8ak27igh830hkcb47z12zghzzary7mi15fq9vbp",
-  "fetcher": "sourcehut",
+  "commit": "c13d67c87248b9af8f9d6265a8626a330f9d478c",
+  "sha256": "1vxi5i2pmvbdqzpa1ksavp7ngpnki0x6svah686k528h1rky8zlv",
+  "fetcher": "github",
   "repo": "tarsius/ol-notmuch",
   "unstable": {
    "version": [
-    20240618,
-    1833
+    20240805,
+    1917
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
-   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
+   "commit": "437aab56192ea86a52738fa5e9216c006df80bd0",
+   "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w"
   },
   "stable": {
    "version": [
     2,
     0,
-    2
+    3
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
-   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
+   "commit": "437aab56192ea86a52738fa5e9216c006df80bd0",
+   "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w"
   }
  },
  {
@@ -86333,20 +86593,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20240519,
-    914
+    20240727,
+    431
    ],
-   "commit": "683a13adc4197af632b35484d2b58bdb1d6c9b5e",
-   "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1"
+   "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc",
+   "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1"
   },
   "stable": {
    "version": [
     2,
     0,
-    5
+    6
    ],
-   "commit": "c5ca99bcffd3f92444c182622ff2c7f161a01fcf",
-   "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1"
+   "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc",
+   "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1"
   }
  },
  {
@@ -87048,11 +87308,14 @@
   "repo": "oantolin/orderless",
   "unstable": {
    "version": [
-    20240711,
-    2002
+    20240717,
+    758
    ],
-   "commit": "178b0c55f2cb49f27cd972f731ea45e5d3aea262",
-   "sha256": "1pm4xaf7394gbjg5g9vwdn99ii7swvna88g40h1safhbbbc60ga6"
+   "deps": [
+    "compat"
+   ],
+   "commit": "49d1fdfb80b55699a00b11bc916ad29c0447039b",
+   "sha256": "0i18n5s52c98z1gjy7hd403f5bkdykifzpvfnchh90rgi24harng"
   },
   "stable": {
    "version": [
@@ -87204,14 +87467,14 @@
   "repo": "rksm/org-ai",
   "unstable": {
    "version": [
-    20240710,
-    155
+    20240806,
+    1340
    ],
    "deps": [
     "websocket"
    ],
-   "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
-   "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
+   "commit": "0184f063484cfd8079aa9aa30fa171a7a47f465e",
+   "sha256": "18y9c86zj88kijl205h34ra6kqqb5bljshng6sfr51833yjd4vc7"
   },
   "stable": {
    "version": [
@@ -87324,26 +87587,26 @@
   "repo": "awth13/org-appear",
   "unstable": {
    "version": [
-    20231127,
-    1052
+    20240716,
+    1413
    ],
    "deps": [
     "org"
    ],
-   "commit": "81eba5d7a5b74cdb1bad091d85667e836f16b997",
-   "sha256": "1jh2rdp7rx1hnsfky5di1amz8rc5jf0qlc5ykr09m5f9fpz9m9x6"
+   "commit": "32ee50f8fdfa449bbc235617549c1bccb503cb09",
+   "sha256": "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    1
    ],
    "deps": [
     "org"
    ],
-   "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f",
-   "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6"
+   "commit": "32ee50f8fdfa449bbc235617549c1bccb503cb09",
+   "sha256": "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4"
   }
  },
  {
@@ -87469,6 +87732,24 @@
    "sha256": "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl"
   }
  },
+ {
+  "ename": "org-autoexport",
+  "commit": "7945b20761a1cfaf35876825c505c26d42178a6d",
+  "sha256": "01s2a0l243wlg0gc2mmx8z2w2n0mjd06281w280qrg4xsqprdglj",
+  "fetcher": "sourcehut",
+  "repo": "zondo/org-autoexport",
+  "unstable": {
+   "version": [
+    20240817,
+    623
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "effe8d6a90e3ab26a7da65e21593e721784b1be7",
+   "sha256": "16h3rlyxlh09d0j42nk1p1kklb1kgi16767j86nz9xqamfjz90kl"
+  }
+ },
  {
   "ename": "org-autolist",
   "commit": "ca8e2cdb282674b20881bf6b4fc49af42a5d09a7",
@@ -87752,14 +88033,14 @@
   "repo": "dengste/org-caldav",
   "unstable": {
    "version": [
-    20240525,
-    2231
+    20240714,
+    1732
    ],
    "deps": [
     "org"
    ],
-   "commit": "f406828d3945c434de13e8aa9f7707d3466aee1b",
-   "sha256": "05j098b74zkkibhl4h5pplnqf584py90lccsg7alnx0isgld28bx"
+   "commit": "9f4db50f06e787737581e9134164837216848fa6",
+   "sha256": "14vnnnysnqacsfpd6288s8x4g9vr90giy00vfp03gfbq5ni43v2k"
   },
   "stable": {
    "version": [
@@ -88102,14 +88383,14 @@
   "url": "https://repo.or.cz/org-contacts.git",
   "unstable": {
    "version": [
-    20240609,
-    1058
+    20240807,
+    733
    ],
    "deps": [
     "org"
    ],
-   "commit": "d0cb221502c9e104b6e3c358128b28761ffddb55",
-   "sha256": "12a5lmmblx644sav0jbhffqhw0ylqjwvy4p90wfy5ha4m4gkm279"
+   "commit": "f0a430442b2ae60035dcd74fc6a76299875694f3",
+   "sha256": "1xs8693dhji2fa8gn3j3fr4qvp1zad0g71f9qlrd3ynkhgdai2r3"
   }
  },
  {
@@ -88168,29 +88449,29 @@
   "url": "https://git.spwhitton.name/org-d20",
   "unstable": {
    "version": [
-    20230616,
-    754
+    20240726,
+    255
    ],
    "deps": [
     "dash",
     "s",
     "seq"
    ],
-   "commit": "5993e2b83831c1937eb70ef23629008218210d22",
-   "sha256": "131p7641n8v237nwvs84agvfl1h5nz53smq89k6fpl3ifkkicl6f"
+   "commit": "ad399cde0ee21adc67ed0c95ae20900fa936f008",
+   "sha256": "0l3814b0f3s35cspyim5q639f0jp6mw3ri2hqb1in6r2igacaq7d"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
    "deps": [
     "dash",
     "s",
     "seq"
    ],
-   "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595",
-   "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b"
+   "commit": "ad399cde0ee21adc67ed0c95ae20900fa936f008",
+   "sha256": "0l3814b0f3s35cspyim5q639f0jp6mw3ri2hqb1in6r2igacaq7d"
   }
  },
  {
@@ -89341,16 +89622,16 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20240713,
-    844
+    20240818,
+    400
    ],
    "deps": [
     "fb2-reader",
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "73b74b9e5006934f1ef302142512f51396ae2761",
-   "sha256": "0cm33d57hygwk4rlvvzaqkkz4hz35i1pgs8apsymsf482hx3w0az"
+   "commit": "950095639fdac279022464e1f1efc602e704d1f0",
+   "sha256": "18fl3l5b69ar5sgj2mds5wvy31jzl0wha10cwks1pg4zs0drw0m8"
   },
   "stable": {
    "version": [
@@ -89510,20 +89791,20 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20240129,
-    2327
+    20240818,
+    243
    ],
-   "commit": "9d4584651d89806b79d5993b286d32d6f70499a9",
-   "sha256": "0zvzb6gbls3zv0qkm5x1vjx0mp4fpg0qy049lq35gqvdw1haxlsp"
+   "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb",
+   "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp"
   },
   "stable": {
    "version": [
     0,
     3,
-    2
+    3
    ],
-   "commit": "cc00afcf0291633324364c1c83bfe2833cfdc1bf",
-   "sha256": "1w5z9irzk918mj75z5m0j2h8mms8v27x50kp7r3b01wblf0jd2zc"
+   "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb",
+   "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp"
   }
  },
  {
@@ -89605,25 +89886,25 @@
   "repo": "minad/org-modern",
   "unstable": {
    "version": [
-    20240708,
-    2157
+    20240803,
+    1952
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bf2cec740dcf41fe8b4cc1ecc537c4fc4c7e9403",
-   "sha256": "15lh3hlf9hgc2xjzr6p5myp512a9arfma3p9hlh7m10bhfpabxgb"
+   "commit": "e306c7df4985f77e5c4e2146900259a23a76c974",
+   "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m"
   },
   "stable": {
    "version": [
     1,
-    3
+    5
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0b7af08548e586c0d3b0ca4a683253da407220d1",
-   "sha256": "0bk8mz3va5vwkkvgvq761bnm9id8sb70rnf3ydq62ap27k0ab967"
+   "commit": "e306c7df4985f77e5c4e2146900259a23a76c974",
+   "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m"
   }
  },
  {
@@ -90490,28 +90771,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20240430,
-    1155
+    20240808,
+    1244
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "ceb5420fd5200c3b4165ffc71360d5388dba7d29",
-   "sha256": "1ibdcjma6km680ckygd55plwjn5aagf1bfw1sa4374715k4r7722"
+   "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072",
+   "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn"
   },
   "stable": {
    "version": [
     3,
-    28,
-    2
+    32,
+    0
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0",
-   "sha256": "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b"
+   "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072",
+   "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn"
   }
  },
  {
@@ -90669,8 +90950,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20240610,
-    1833
+    20240802,
+    1213
    ],
    "deps": [
     "avy",
@@ -90686,8 +90967,8 @@
     "request",
     "s"
    ],
-   "commit": "7ab51359954648c20753f66039a33d3b4993eeed",
-   "sha256": "08y302fb5xbcg5sfxsf8xk956lr8qrvwmj5kfvbn9x0mc7v1jgmp"
+   "commit": "fd178abf12a85f8e12005d1df683564bdc534124",
+   "sha256": "0rdi1n4vay93xs7gwxxmivg3lq13sk10f0g505z0hagzcv2f48w7"
   },
   "stable": {
    "version": [
@@ -90763,15 +91044,15 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20240619,
-    1307
+    20240802,
+    1519
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
-   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
+   "commit": "d029e2263de23b19ed89f9757ad69b7cb33bda32",
+   "sha256": "08fh2qmzig3zw5106hhq55847b5cz9l2pl82cqsqbwf93ndflygk"
   },
   "stable": {
    "version": [
@@ -90835,8 +91116,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20240703,
-    1856
+    20240715,
+    1750
    ],
    "deps": [
     "dash",
@@ -90844,8 +91125,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "6644cb27a902b2ceeca89e83fde31e6ad01be79e",
-   "sha256": "05l15xfv1cdyqmqw2y6m1rb68y4h0g8f6lv6qzqlxim7w17ja10c"
+   "commit": "3e186a85520f02c1672150f62eb921bcad5d2c2d",
+   "sha256": "1sih11zgfjvy61pgd8x8cjqkwxyarh1wpn2r5z18ii6a3fmjhpj7"
   },
   "stable": {
    "version": [
@@ -90904,8 +91185,8 @@
   "repo": "ahmed-shariff/org-roam-ql",
   "unstable": {
    "version": [
-    20240503,
-    1845
+    20240721,
+    306
    ],
    "deps": [
     "magit-section",
@@ -90914,8 +91195,8 @@
     "s",
     "transient"
    ],
-   "commit": "f628fef081394f159f196f4350132aecb3edb8cc",
-   "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5"
+   "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec",
+   "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry"
   },
   "stable": {
    "version": [
@@ -90941,8 +91222,8 @@
   "repo": "ahmed-shariff/org-roam-ql",
   "unstable": {
    "version": [
-    20240503,
-    1845
+    20240721,
+    306
    ],
    "deps": [
     "org-ql",
@@ -90951,8 +91232,8 @@
     "s",
     "transient"
    ],
-   "commit": "f628fef081394f159f196f4350132aecb3edb8cc",
-   "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5"
+   "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec",
+   "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry"
   },
   "stable": {
    "version": [
@@ -91266,8 +91547,8 @@
   "repo": "ndwarshuis/org-sql",
   "unstable": {
    "version": [
-    20220621,
-    2252
+    20240819,
+    2145
    ],
    "deps": [
     "dash",
@@ -91275,14 +91556,14 @@
     "org-ml",
     "s"
    ],
-   "commit": "43376abf46b897a9a862cfcc1c087f4b8688634c",
-   "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha"
+   "commit": "3dbf11d692cf0d5e64235ad4041ed0b5a6775064",
+   "sha256": "0vfjj0854csra816040ihhlrsnxlaqnw3aqc18448ga7wbirrxs5"
   },
   "stable": {
    "version": [
-    3,
+    4,
     0,
-    4
+    0
    ],
    "deps": [
     "dash",
@@ -91290,8 +91571,8 @@
     "org-ml",
     "s"
    ],
-   "commit": "ea000131a6bfe2e22f3d9a65c0b0aeeab34434e3",
-   "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha"
+   "commit": "80bea9996de7fa8bc7ff891a91cfaff91111dcd8",
+   "sha256": "0vfjj0854csra816040ihhlrsnxlaqnw3aqc18448ga7wbirrxs5"
   }
  },
  {
@@ -91364,11 +91645,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20240124,
-    1550
+    20240727,
+    718
    ],
-   "commit": "6459a46bd40abbfe21095504d229db0f66494e86",
-   "sha256": "061xnx36j1bapq60vsvi47a1619ndg0kg0yvfqm9d8g4a1mvay1p"
+   "commit": "34c9a60a00bce7ad70e7c6b28696edec5affcf06",
+   "sha256": "0g0y8w2i0hs9dywdpxv307gkqnpgyibzmi1sbbqxqj9m8gcib90k"
   },
   "stable": {
    "version": [
@@ -91417,8 +91698,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20240630,
-    18
+    20240715,
+    1639
    ],
    "deps": [
     "compat",
@@ -91428,8 +91709,8 @@
     "s",
     "ts"
    ],
-   "commit": "17954dc4b064d7fb09719222045d31feae8aa923",
-   "sha256": "0bha2mfvfyz57lv02pkn0lk92qq7vmvxdpd43jfmcynzipia1b9p"
+   "commit": "05a710065af5ee4b3982f9619f864f7af12ca1d3",
+   "sha256": "1cy82dqamjxfr8clwk3r3pimvvmn7gkhxvzrnqdkbypzm7hpyd30"
   },
   "stable": {
    "version": [
@@ -91607,13 +91888,13 @@
   "unstable": {
    "version": [
     20240712,
-    439
+    443
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "52f09a8c363b75dd8554285e61025aeb9c0d945c",
-   "sha256": "1146x53j9yl38w1j04q2zxyk8ca2q4v4z8akxgd0vcxcalicyg4l"
+   "commit": "cda8ffcfaa2619dd40cfd4dbe93a74a0f3326aae",
+   "sha256": "1y581d7cpyxm1s1za1619i2adz6pp4i21qgrzgjcw8rn3rzd4vi0"
   }
  },
  {
@@ -92265,28 +92546,28 @@
   "repo": "p-snow/org-web-track",
   "unstable": {
    "version": [
-    20240628,
-    1032
+    20240720,
+    904
    ],
    "deps": [
     "enlive",
     "request"
    ],
-   "commit": "bca3a6e159b1b939906f9fc033c7a93e6be3c41c",
-   "sha256": "0wgv5ikgdp7m6lx2y0p6cxb7zcqdflr99ymk9fz105f2adnv7c6c"
+   "commit": "bd96a755ff7c76142d27d6da319252dde9a4c7d6",
+   "sha256": "0f3n06s1nqw5fvms9xcq23m4s7wzwpklbh77lmbhrw6hg883lgi5"
   },
   "stable": {
    "version": [
     0,
     0,
-    2
+    3
    ],
    "deps": [
     "enlive",
     "request"
    ],
-   "commit": "ee15faf47c308f37bfcfffe38e8f4ee55661af3e",
-   "sha256": "0g86fqn08lgxz71snfnbgmyihnfl50m0zr7ysh25w4b4bla234jy"
+   "commit": "eff66fc207411d5a5265d4ee5232f13d268f252f",
+   "sha256": "18san6d7acfgz4fsjsv3w9bsbf41svf8p08jrc7rkqjp07h7hnwk"
   }
  },
  {
@@ -92402,14 +92683,14 @@
   "repo": "ymherklotz/org-zettelkasten",
   "unstable": {
    "version": [
-    20240708,
-    1242
+    20240716,
+    2114
    ],
    "deps": [
     "org"
    ],
-   "commit": "ab31cf4436fabc7e44addf60f383a2ee6a4558e3",
-   "sha256": "06hn6j3rk279ys9k7izvm2176xm82y3j6hl3r4dqfg7ak3k52amp"
+   "commit": "b6ee54071f9653fb95a33491e2c0152efc3c61c8",
+   "sha256": "1cw54bads6bfir5rslmq8bffx7ks6cdhhhhq7lrn1s0p1v2fnvx6"
   },
   "stable": {
    "version": [
@@ -92600,11 +92881,11 @@
   "repo": "kostafey/organic-green-theme",
   "unstable": {
    "version": [
-    20231225,
-    149
+    20240731,
+    2058
    ],
-   "commit": "9b669465c875edd86289d017731880172dc08b9d",
-   "sha256": "0s0bdghcqddgi3a4cldldgw8rqqsax6smpsk198g5gmfnyaj1yfb"
+   "commit": "8ea2fea0aea27d67448440f22b4ccdf6f9e6e8f6",
+   "sha256": "0fz3qp6yqsjdn16siw73vjgc3m9ld536yrn0l8j1s0bkhby13xil"
   }
  },
  {
@@ -92683,21 +92964,21 @@
   "repo": "magit/orgit",
   "unstable": {
    "version": [
-    20240415,
-    1546
+    20240808,
+    1945
    ],
    "deps": [
     "compat",
     "magit",
     "org"
    ],
-   "commit": "ca3bf7aa20074e25fee37b71cfef127b93a3dde7",
-   "sha256": "1ml64ddahk6szbynzrjm4zglkxhv9lgmaipm6fysalx48nxqvshh"
+   "commit": "59d21fdb21f84238c3172d37fdd2446b753e98dc",
+   "sha256": "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408"
   },
   "stable": {
    "version": [
-    1,
-    9,
+    2,
+    0,
     0
    ],
    "deps": [
@@ -92705,8 +92986,8 @@
     "magit",
     "org"
    ],
-   "commit": "4a585029875a1dbbe96d8ac157bd2fd02875f289",
-   "sha256": "00fkj88yddan80q8zbx0jy66d958srkm06jiy1nraamxqr15mmyz"
+   "commit": "59d21fdb21f84238c3172d37fdd2446b753e98dc",
+   "sha256": "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408"
   }
  },
  {
@@ -92717,8 +92998,8 @@
   "repo": "magit/orgit-forge",
   "unstable": {
    "version": [
-    20240415,
-    1546
+    20240808,
+    1947
    ],
    "deps": [
     "compat",
@@ -92727,14 +93008,14 @@
     "org",
     "orgit"
    ],
-   "commit": "7b010465ab96bea6d380ae1cfbd7999d528f1de9",
-   "sha256": "0xqwzb7jmh7mlq4b6wk7kkhgwjwb399bv215bx2n3iq9bi2x6mv8"
+   "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d",
+   "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w"
   },
   "stable": {
    "version": [
-    0,
     1,
-    4
+    0,
+    0
    ],
    "deps": [
     "compat",
@@ -92743,8 +93024,8 @@
     "org",
     "orgit"
    ],
-   "commit": "8ba92a54aee9693b1bf03baf14f83550a7c89b18",
-   "sha256": "0b7266k8n2wby5qc6kdi4b9850mnf646bp6q8n8wbsss1mnwaf6z"
+   "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d",
+   "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w"
   }
  },
  {
@@ -92755,30 +93036,30 @@
   "repo": "tarsius/orglink",
   "unstable": {
    "version": [
-    20240618,
-    1835
+    20240805,
+    1431
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
-   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
+   "commit": "bc6135ef091c871b40e9fecd3126a177aed93e17",
+   "sha256": "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba"
   },
   "stable": {
    "version": [
     1,
     2,
-    3
+    4
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
-   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
+   "commit": "bc6135ef091c871b40e9fecd3126a177aed93e17",
+   "sha256": "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba"
   }
  },
  {
@@ -92848,11 +93129,11 @@
   "repo": "Artawower/orgnote.el",
   "unstable": {
    "version": [
-    20240516,
-    1842
+    20240814,
+    2021
    ],
-   "commit": "0b6ab72bede2fa757758016ae69db2cc8332fa2d",
-   "sha256": "0g05x2ns54c4vyx1rxspi8x7b1q5z8cib4k7qlm5wnbblccmbvk3"
+   "commit": "d2d0c8d16ea2dbcc29b79f9d4a48e03e90c3f57d",
+   "sha256": "02i54x889714ma1r5pifb8pbcr850rd2vz0ssd923rip5iljs5xz"
   },
   "stable": {
    "version": [
@@ -93104,25 +93385,25 @@
   "repo": "minad/osm",
   "unstable": {
    "version": [
-    20240708,
-    2157
+    20240723,
+    2207
    ],
    "deps": [
     "compat"
    ],
-   "commit": "17dfc017cdb0cf21325a9e636fd23e912aea84b3",
-   "sha256": "17zk9mrh7w1bj0z0a95rfa41zp2a1lygf6khls77z58gfvffqfjk"
+   "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691",
+   "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30",
-   "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx"
+   "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691",
+   "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8"
   }
  },
  {
@@ -93386,6 +93667,30 @@
    "sha256": "09649ahqjp8kgi89s93qfqz3f27sf28qdmd8nyramz1yppklfia2"
   }
  },
+ {
+  "ename": "outline-indent",
+  "commit": "330f86638778f4f104808bddc3e4d09d2ab18372",
+  "sha256": "1lfz87hhfqrva2g4hbsc9n8783zbvq6m1w6jf6ll9wi3v32lva0z",
+  "fetcher": "github",
+  "repo": "jamescherti/outline-indent.el",
+  "unstable": {
+   "version": [
+    20240817,
+    1840
+   ],
+   "commit": "4cc2a57e1125104cd94430524d3b4e2b4701d78b",
+   "sha256": "17a2qgda5nv650hx9rf8zfj264aqnb1k3x80lgn7ks98pwjdgrh4"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    5
+   ],
+   "commit": "69de157db109b9af94241f6b15c67d834e944361",
+   "sha256": "1mnkspl01hqsb5x5z2frhvk632l63c27h8g8bdrlapf7h7r4h7kd"
+  }
+ },
  {
   "ename": "outline-magic",
   "commit": "a98ad2ef680eef541ee82e8a65ed73e524df98a1",
@@ -93409,26 +93714,26 @@
   "repo": "tarsius/outline-minor-faces",
   "unstable": {
    "version": [
-    20240628,
-    2016
+    20240809,
+    2322
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8f1b8ab4c49b30d0a58b55666463ed2318150178",
-   "sha256": "0zw7qmrq2sh01av4871gkybn24nh5j64g04h5axvhls6znyv7pxq"
+   "commit": "5f227d165ca002d692fa80a71e727956b59568b6",
+   "sha256": "05gf4wvs3q0spjb5mw0dgqy234zgfc50s4z239d35r4nkal9ckwy"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "4a264ffed9dae7d04ce1c72b07c9566b4bb8b6a6",
-   "sha256": "14h7idc160w38h82r4q1cq9rcbaw73dpqrxmp905wvnkvbncwhdk"
+   "commit": "8884f1bc4c3f6fa4d40dd1ba728e84c8312391d6",
+   "sha256": "1g0l7c06gjb799h5whvh6y4wdalxs1261k7i8nhsacjjii1xzwwg"
   }
  },
  {
@@ -94237,24 +94542,6 @@
    "sha256": "0sh8l18lc2hngbmb1vv99xb8cp4sfy90j9cbf7b09l82jmnlqmk1"
   }
  },
- {
-  "ename": "ox-pukiwiki",
-  "commit": "cd4043336e54c6ae3976068a1af5cfe58713e408",
-  "sha256": "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a",
-  "fetcher": "github",
-  "repo": "yashi/org-pukiwiki",
-  "unstable": {
-   "version": [
-    20150124,
-    1716
-   ],
-   "deps": [
-    "org"
-   ],
-   "commit": "b53920abf698fa6682623d671108393e92c68bd7",
-   "sha256": "031xl8wry4frbc3d5d0nq7bca6y4plij9v8v8p8rg5ms3sh2fhjq"
-  }
- },
  {
   "ename": "ox-qmd",
   "commit": "e71826e8a8c30b0eb535cce7a379740011b79534",
@@ -94826,14 +95113,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20240628,
-    1901
+    20240718,
+    1333
    ],
    "deps": [
     "compat"
    ],
-   "commit": "33221b6a0aaf4d7648b50afbc66b5691d90b6924",
-   "sha256": "0321sx2va3r3paivv72s45pnw26n02silhk8f43hkw0il46d07vl"
+   "commit": "6148407e9dfa6c92e067bcda86b25d15e3cbe8d3",
+   "sha256": "0zhbabja8rzqbnj9xbzg0xdvpndscxg1jd83y3gi72f85ajadys7"
   },
   "stable": {
    "version": [
@@ -95504,26 +95791,26 @@
   "repo": "tarsius/paren-face",
   "unstable": {
    "version": [
-    20240618,
-    1837
+    20240805,
+    1433
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
-   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
+   "commit": "9d369e6da2638702ce617a4ae4cf8d05cdc50d0b",
+   "sha256": "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa"
   },
   "stable": {
    "version": [
     1,
     1,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
-   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
+   "commit": "9d369e6da2638702ce617a4ae4cf8d05cdc50d0b",
+   "sha256": "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa"
   }
  },
  {
@@ -95558,14 +95845,14 @@
   "repo": "justinbarclay/parinfer-rust-mode",
   "unstable": {
    "version": [
-    20240625,
-    740
+    20240726,
+    1640
    ],
    "deps": [
     "track-changes"
    ],
-   "commit": "7f7fa030e3ca51eb0a060df2694cbab2eb3b27b7",
-   "sha256": "1rdwzsgwv50dy4rqnydwlaihvv6fdg2sysig571f0sh049in8iqq"
+   "commit": "0d16bd75ad36d881194b58c572562023aa04eb58",
+   "sha256": "1z6ghxbib7lx1iliv3zcn85frav1aay9nn8mf7c1akz49mm295q9"
   },
   "stable": {
    "version": [
@@ -95806,36 +96093,6 @@
    "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p"
   }
  },
- {
-  "ename": "passmm",
-  "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6",
-  "sha256": "17rd9pgi9p9w9m9grpnhn1d4mrx3bfrzl04z37mf4gd8qzzzqvqs",
-  "fetcher": "github",
-  "repo": "pjones/passmm",
-  "unstable": {
-   "version": [
-    20221204,
-    1927
-   ],
-   "deps": [
-    "password-store"
-   ],
-   "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8",
-   "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n"
-  },
-  "stable": {
-   "version": [
-    1,
-    0,
-    0
-   ],
-   "deps": [
-    "password-store"
-   ],
-   "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8",
-   "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n"
-  }
- },
  {
   "ename": "password-generator",
   "commit": "fd591276073bf87fd9debdffc396f650790d566a",
@@ -96677,11 +96934,11 @@
   "repo": "mpwang/perfect-margin",
   "unstable": {
    "version": [
-    20240512,
-    1120
+    20240731,
+    1133
    ],
-   "commit": "d2973b0dc44b086353a2920a66fec0fcc1b3b60a",
-   "sha256": "15m60851pzfm4kiql0w1l7h8y5cyhcxmfzan86wswcxhssyi7673"
+   "commit": "3281c5648d854f77450c1268dbb31f5a872900a5",
+   "sha256": "12zgzysljlq1vrl1c0s4bab5qf3ly257scby3fs56vnr4szhwla4"
   }
  },
  {
@@ -96726,19 +96983,19 @@
   "repo": "bram85/emacs-persist-state",
   "unstable": {
    "version": [
-    20240703,
-    2100
+    20240720,
+    1725
    ],
-   "commit": "2d3d81717fbb2fac26362e8308f33d589818d7f0",
-   "sha256": "0kv05j8zi8msnx9ibw923c03z9bx8ckhvxf7sxazdlmf2clxyfkz"
+   "commit": "99e22bd6dd7b768c617596da952a5b8e53d16ecb",
+   "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf"
   },
   "stable": {
    "version": [
     0,
-    3
+    4
    ],
-   "commit": "d57cc443cc0fd9f8a7418045be2387ee72955bd4",
-   "sha256": "16qph2j5gwn9d43sig22g604gmpk55sh0v2i4aqvzkn1cl3188br"
+   "commit": "99e22bd6dd7b768c617596da952a5b8e53d16ecb",
+   "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf"
   }
  },
  {
@@ -96852,20 +97109,20 @@
   "repo": "Bad-ptr/persp-mode.el",
   "unstable": {
    "version": [
-    20231010,
-    1804
+    20240730,
+    1353
    ],
-   "commit": "345baaa520ab2d62205f85cc5f29d57d6063c141",
-   "sha256": "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr"
+   "commit": "40e9993a9711cba5fb56dfec81a507fabeba9668",
+   "sha256": "0fi07h5q0srjasjxn7rzzd8zahl15agspm6q9hs2rzd0m8x3zp52"
   },
   "stable": {
    "version": [
-    2,
-    9,
+    3,
+    0,
     8
    ],
-   "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c",
-   "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"
+   "commit": "345baaa520ab2d62205f85cc5f29d57d6063c141",
+   "sha256": "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr"
   }
  },
  {
@@ -97079,16 +97336,16 @@
   "repo": "wyuenho/emacs-pet",
   "unstable": {
    "version": [
-    20240713,
-    1406
+    20240715,
+    1616
    ],
    "deps": [
     "f",
     "map",
     "seq"
    ],
-   "commit": "a3c74988c2ae89695026e6d314b5eb27c35fbc3a",
-   "sha256": "0dsyr2w5md86w8kpf8y2qk5rgsy58abza4wm1fb6k7rxfbds16p2"
+   "commit": "e5e3f9f0326ea1cc6edef017f0ee34cc42754b08",
+   "sha256": "1xdlqsybzhjfbi8icp22438pc51ybxnxg11ixpvhbr4c8jdwiwva"
   },
   "stable": {
    "version": [
@@ -97137,25 +97394,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20240710,
-    2114
+    20240814,
+    1214
    ],
    "deps": [
     "peg"
    ],
-   "commit": "614becd4182d2411e17acf4f88918d7c5df75548",
-   "sha256": "0bi2sh6901ylwgy9znv10j5vd3hgryvx3hc3yijs67n41qf4zryi"
+   "commit": "93e3fe31c0cd5d31a046fa7c4feb4e3371ac4a8a",
+   "sha256": "1pc3j0yqgiskr8hk3jagwsp8hc88qics9wh72q1iw8sjn2yalrgy"
   },
   "stable": {
    "version": [
     0,
-    37
+    39
    ],
    "deps": [
     "peg"
    ],
-   "commit": "3d16f2e30e3dc2ec5c283d80f58730bc8ef4d6cf",
-   "sha256": "04zhy0wp6rk5x55ja5danyf3rpb59k35lpw7b07bn25rngmqjmid"
+   "commit": "69ca40a4206eff0b1c40e423ea8b815fdbcd438d",
+   "sha256": "1b5dg04pd5s5pq71yc3isl312y1fw88pjvnk8bgjc1f06xhjlrj4"
   }
  },
  {
@@ -97464,26 +97721,26 @@
   "repo": "OVYA/php-cs-fixer",
   "unstable": {
    "version": [
-    20220516,
-    1008
+    20240814,
+    2249
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a",
-   "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj"
+   "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61",
+   "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    1
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a",
-   "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj"
+   "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61",
+   "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz"
   }
  },
  {
@@ -98026,11 +98283,11 @@
   "repo": "Anoncheg1/pinyin-isearch",
   "unstable": {
    "version": [
-    20240224,
-    709
+    20240328,
+    2110
    ],
-   "commit": "bb956213c6ccd3067d5e3c33d7695bdc5ba58133",
-   "sha256": "1yphxa4f7q2rlrgk3l9dr6yx2fha474phiz04cz863aqylwcxfw4"
+   "commit": "bc69e38e25e623a321c5c37959fb175334cf9e1a",
+   "sha256": "0vmsl4b8hv9hdass8w4j7gyrhp9acrnyyc30hqfflsb61p69h770"
   },
   "stable": {
    "version": [
@@ -98839,7 +99096,7 @@
   "unstable": {
    "version": [
     20240713,
-    1324
+    1529
    ],
    "deps": [
     "dash",
@@ -98847,8 +99104,8 @@
     "plz",
     "s"
    ],
-   "commit": "21f69179ad254ab64cb876115719e5d7d043f88d",
-   "sha256": "1hh987aflyjjddinx790g09c6l5yfd2wbihh83pvmrair6pj68rd"
+   "commit": "f05f80645d8101518eed13b2da81400fe9b50918",
+   "sha256": "141zrc4w1np3a4j5xb0q1fw4xygjj0qg3bgsmrk0mmbdhk3hj6f4"
   },
   "stable": {
    "version": [
@@ -99129,23 +99386,24 @@
   "repo": "mavit/poly-ansible",
   "unstable": {
    "version": [
-    20240626,
-    1320
+    20240803,
+    1612
    ],
    "deps": [
     "ansible",
     "ansible-doc",
     "jinja2-mode",
     "polymode",
+    "systemd",
     "yaml-mode"
    ],
-   "commit": "24a17c6b965a085c737bee857eff919dfd0f961d",
-   "sha256": "0k36pydhrrhzs46vcn5lsqxvz66j7nws5vfhwlh60vshkic2rfhx"
+   "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315",
+   "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972"
   },
   "stable": {
    "version": [
     0,
-    4,
+    5,
     1
    ],
    "deps": [
@@ -99153,10 +99411,11 @@
     "ansible-doc",
     "jinja2-mode",
     "polymode",
+    "systemd",
     "yaml-mode"
    ],
-   "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57",
-   "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8"
+   "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315",
+   "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972"
   }
  },
  {
@@ -99189,6 +99448,25 @@
    "sha256": "118x9qrays54n6ksnln51ps5c298zs8ih7k49mn6aq6lpvwy5wjr"
   }
  },
+ {
+  "ename": "poly-gams",
+  "commit": "b9c2722629821642466fd0c29a5bea150b953793",
+  "sha256": "0fp9kwg6x97m277hq4haqi3qy894r59zbxv202dzvp8dgpd13g2b",
+  "fetcher": "github",
+  "repo": "ShiroTakeda/poly-gams",
+  "unstable": {
+   "version": [
+    20240812,
+    1540
+   ],
+   "deps": [
+    "gams-mode",
+    "polymode"
+   ],
+   "commit": "e3abb2a195077750c89146900607894ed6239cb4",
+   "sha256": "0bvjj2zdryxsacz8xmbi65psky3x0ni60pdigjwirl96kbyrb22m"
+  }
+ },
  {
   "ename": "poly-markdown",
   "commit": "3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d",
@@ -100223,15 +100501,15 @@
   "repo": "LaurenceWarne/prefab.el",
   "unstable": {
    "version": [
-    20220828,
-    2015
+    20240720,
+    1858
    ],
    "deps": [
     "f",
     "transient"
    ],
-   "commit": "328c763d67cd53875d729af0bcb89d412455cf60",
-   "sha256": "16kz5yvqbzdyxcwsic9sdjckgyb74cfb96f2kgp6zpf7k5bbx7ry"
+   "commit": "51da6c214f095a44f3d2223bcf079a3073923115",
+   "sha256": "0jns5xlrhhhpmy918l4w0z9qax34244qxcccr269lmfk6385hd19"
   },
   "stable": {
    "version": [
@@ -100270,19 +100548,20 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240226,
-    204
+    20240803,
+    2320
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -100574,15 +100853,15 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20240611,
-    305
+    20240807,
+    147
    ],
    "deps": [
     "compat",
     "dash"
    ],
-   "commit": "73deba1a4a719f740827c000cf46bfecacb44adb",
-   "sha256": "1p0v2rd9wiz13ckwkj77v8bpzg01cjsgfqkqqyrf1hkv7b0ki2z9"
+   "commit": "25df8494ee92c65bf66194e0e2663de487f9296b",
+   "sha256": "0xy8xpwnskk5w9wgw2qlxcqxb360qq5ilib827h480xyf6qkkcri"
   },
   "stable": {
    "version": [
@@ -100915,20 +101194,20 @@
   "repo": "jabbo/project-butler",
   "unstable": {
    "version": [
-    20240520,
-    943
+    20240718,
+    1920
    ],
-   "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9",
-   "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr"
+   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
+   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
   },
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
-   "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9",
-   "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr"
+   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
+   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
   }
  },
  {
@@ -101138,11 +101417,11 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20240212,
-    1100
+    20240814,
+    1854
    ],
-   "commit": "0163b335a18af0f077a474d4dc6b36e22b5e3274",
-   "sha256": "0sy187ryln3jjnkwjxphdnfa20isv570js8ch3r3zrjl6c6d9xl8"
+   "commit": "01fb6a5ef023bcfc52b209586dcb4fd13db00218",
+   "sha256": "1frg36xicvivhlp3b4m86hg7gsg5b04lkkfymb18d1yzcwc40xwk"
   },
   "stable": {
    "version": [
@@ -101403,8 +101682,8 @@
   "repo": "mohkale/projection",
   "unstable": {
    "version": [
-    20240707,
-    1857
+    20240803,
+    1636
    ],
    "deps": [
     "compat",
@@ -101412,8 +101691,8 @@
     "project",
     "s"
    ],
-   "commit": "9ee93e65d987cfaecaf87e74a6716d84154a698c",
-   "sha256": "148gdrjv6swi8garawjb9w5mnif2agl4j5w3glrz13jmagxmmpb8"
+   "commit": "1ed2ff94ffbf5b619e34e02baca324a580751723",
+   "sha256": "0s8vp39y8kpavx2m7b92mz8p8fsmy7rhh3zbf4k5zha7chv6wjmy"
   }
  },
  {
@@ -101443,15 +101722,15 @@
   "repo": "mohkale/projection",
   "unstable": {
    "version": [
-    20240517,
-    2021
+    20240803,
+    1509
    ],
    "deps": [
     "compile-multi",
     "projection"
    ],
-   "commit": "68f2387219f2627506f5e345e9be04bd11aa0e65",
-   "sha256": "0785a47xirwk7q2159gmlibg3rkl54z211xykr0bld2jj73g0jyc"
+   "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080",
+   "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg"
   }
  },
  {
@@ -101462,15 +101741,15 @@
   "repo": "mohkale/projection",
   "unstable": {
    "version": [
-    20231008,
-    937
+    20240803,
+    1509
    ],
    "deps": [
     "compile-multi-embark",
     "projection"
    ],
-   "commit": "928602ddd3003913cfefe343b5f057bfa360c0fe",
-   "sha256": "08p8igrlbzvw6h8j066nh7yvxgqzi9csjzbjhv34csasfd14mznx"
+   "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080",
+   "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg"
   }
  },
  {
@@ -101750,10 +102029,10 @@
   "stable": {
    "version": [
     27,
-    2
+    3
    ],
-   "commit": "63def39e881afa496502d9c410f4ea948e59490d",
-   "sha256": "0rbbwydw97gxbbq9gm32lp9rn44safqzywk4jjdmbrq19asdxazm"
+   "commit": "7cc670c1809e704ebeba90fb430d50e009f36727",
+   "sha256": "14aywn2llf3vg7qp57n085183rl06d8dyg7d4xawv7n0d0s536r5"
   }
  },
  {
@@ -103302,11 +103581,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20240520,
-    1744
+    20240804,
+    1207
    ],
-   "commit": "5279a81ecaa9fc535915c58336c96baf3f2aa8b1",
-   "sha256": "0vhi7rlpd696244xl2kvlmqkq94cqwrhd6cvg8hfz6b4v1bbdf4r"
+   "commit": "6acfce561ed9b655c548d230eb990ad863a015ea",
+   "sha256": "1wyahxv1sckigwy4sd45lgpkdlhd0c90kwgffrl98xslh6ajlr3a"
   },
   "stable": {
    "version": [
@@ -103326,16 +103605,16 @@
   "repo": "wbolster/emacs-python-pytest",
   "unstable": {
    "version": [
-    20240704,
-    1054
+    20240810,
+    809
    ],
    "deps": [
     "dash",
     "s",
     "transient"
    ],
-   "commit": "1ecfb4461615374aac7786a07359c2d3d561f3c7",
-   "sha256": "1crdx42rdqyczccl5wqxnblqrs9ijskh5zj970800lk3xhsr4kql"
+   "commit": "bfcd28829076836904fed12a39c829970bcb6bb0",
+   "sha256": "07rrx6x8y58kah2h0imb4100qpwlmcnhsvm3dd49mbrs0827hddk"
   },
   "stable": {
    "version": [
@@ -103474,11 +103753,11 @@
   "repo": "erickgnavar/pythontest.el",
   "unstable": {
    "version": [
-    20240610,
-    2226
+    20240813,
+    1322
    ],
-   "commit": "5b46552a7afdd91070ac528909e032d0df5aa2da",
-   "sha256": "13x8gjc4zg7fwi8a7z3cwa1v5slwfw14wynkv1hdp8rmm4j5zvz3"
+   "commit": "4bb4f330c13ef82bb6e4a4b15c47cb3fede83523",
+   "sha256": "1ib8hlq2qhnvdi84qc03bl6la6h2xvz78qbzc8mj1lvgklk5zjap"
   }
  },
  {
@@ -104061,11 +104340,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20240621,
-    1647
+    20240813,
+    1641
    ],
-   "commit": "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7",
-   "sha256": "0g57p95zqyxcryrzcc16q6w5xv9i9y4dncqb4h7ixdgw6bcvlhqk"
+   "commit": "3cb49c513d56cc615e4b932bb08406dec93471a7",
+   "sha256": "0ynah71mr8b6d9fnffz5k8d33jfdw14py6i01yc88c2m925jbk0d"
   }
  },
  {
@@ -104490,20 +104769,20 @@
   "repo": "ybiquitous/rbs-mode",
   "unstable": {
    "version": [
-    20210430,
-    135
+    20240806,
+    56
    ],
-   "commit": "ad36bb138cec7396f029821d0cf755a8bc663260",
-   "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7"
+   "commit": "d382032cb276d452fdd512c1f1f1b9f95153b356",
+   "sha256": "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h"
   },
   "stable": {
    "version": [
     0,
     3,
-    1
+    2
    ],
-   "commit": "ad36bb138cec7396f029821d0cf755a8bc663260",
-   "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7"
+   "commit": "d382032cb276d452fdd512c1f1f1b9f95153b356",
+   "sha256": "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h"
   }
  },
  {
@@ -104793,6 +105072,30 @@
    "sha256": "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6"
   }
  },
+ {
+  "ename": "ready-player",
+  "commit": "f715bbd2109d4d283c5ed0e57e15a158d6919c05",
+  "sha256": "18yk9grj1ahnci21kph0541m4xpnh7ndi9gss6gxpkpqcad0nm41",
+  "fetcher": "github",
+  "repo": "xenodium/ready-player",
+  "unstable": {
+   "version": [
+    20240818,
+    1104
+   ],
+   "commit": "4da641ef345bf03ad4e2bd4c6b45d134ed96d08b",
+   "sha256": "0m19diwp2cr4r2n93dgyfv7yq3h0drv93vypyg34jlvj0bpskzsl"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    4
+   ],
+   "commit": "9fa93956e2fbe57856081f91a3635a21c3f03e8d",
+   "sha256": "011ikdx8gafdgyf1mxnv599fhdda49wgrkyag1l9qgyj0a9c4xnp"
+  }
+ },
  {
   "ename": "real-auto-save",
   "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
@@ -105459,17 +105762,16 @@
   "repo": "thanhvg/emacs-reddigg",
   "unstable": {
    "version": [
-    20240107,
-    235
+    20240730,
+    2339
    ],
    "deps": [
     "ht",
     "org",
-    "promise",
-    "request"
+    "promise"
    ],
-   "commit": "633c628d4544616cd023ca540819b784a6986426",
-   "sha256": "1lrb8fn31wc51yf8znaf51r2771jsv89qbjankwpnsf78yfb57b7"
+   "commit": "4d22e06a6e2523fe6d83c0280847d3bde19fabb5",
+   "sha256": "05i5nh2hr4janlhj4vqjnkabfq2y6py1vs5s1x9wpb8aaknhiww6"
   }
  },
  {
@@ -106627,14 +106929,14 @@
   "repo": "a13/reverse-im.el",
   "unstable": {
    "version": [
-    20240315,
-    1320
+    20240815,
+    1055
    ],
    "deps": [
     "seq"
    ],
-   "commit": "bcd70b49b16abab53165cb464d0a9a5f95bf946b",
-   "sha256": "17br84xaxy1am01fdqi6742wwfp9aig1a71fmhvncpdi1plsxkca"
+   "commit": "dfb169b08e09be6ab113a7d423f79b1775a9334f",
+   "sha256": "1r4pvpn7fzj9w5d28mh8v80ml22cx6zpywb77sbnaq8lfb0jssfc"
   },
   "stable": {
    "version": [
@@ -106926,17 +107228,17 @@
  },
  {
   "ename": "ride-mode",
-  "commit": "07536aeb9581da1ffbe25cc4e7d6d5d056062cf7",
-  "sha256": "0yhqg5qnkl4rz2b524md7z8x5b80ck2mgcdhwh5dr5wfqc72sbnl",
-  "fetcher": "github",
+  "commit": "e0713d480f6c5932561217f5fe9f48f189d4d534",
+  "sha256": "0v25w3snpq7p56ivkh71vvqrlhlyg2nfhhmfy6qdlz98hl955wli",
+  "fetcher": "codeberg",
   "repo": "deadblackclover/ride-mode",
   "unstable": {
    "version": [
-    20240511,
-    1623
+    20240727,
+    456
    ],
-   "commit": "b693e5c33090530d2ea9d792fa148ea983f8607f",
-   "sha256": "1iwb941ld1rfshdq11km561xr75a3n63cw70h6x8wyb6iqdwbwk3"
+   "commit": "f1b826fc9b14007aefca8d5748549b9a720b0684",
+   "sha256": "1p5zz63ifgvb08gb8p0jx52sqh42mh0cpkj2gd64h6g7vlrj8zsb"
   }
  },
  {
@@ -107310,11 +107612,11 @@
   "repo": "kopoli/robot-mode",
   "unstable": {
    "version": [
-    20240711,
-    2007
+    20240721,
+    1023
    ],
-   "commit": "03bd436ff88c41e9c4d6b1df865d5abb062f5e37",
-   "sha256": "056n3jwpnb3fgczn38hsg0vs6969rjz11dma38mip8icr20ysllb"
+   "commit": "7c8d7adfa37b7bd15d61cbb78a02e0e1596c453c",
+   "sha256": "05pngpaq0ap8v85axvslzknvxg5dcws82jjdvb3b17rz9iyi4a5l"
   },
   "stable": {
    "version": [
@@ -108291,8 +108593,8 @@
   "repo": "emacs-rustic/rustic",
   "unstable": {
    "version": [
-    20240708,
-    2105
+    20240819,
+    1214
    ],
    "deps": [
     "dash",
@@ -108306,8 +108608,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "c1893528ad6b8e8ca795b547f326ec52dacf8728",
-   "sha256": "001iv1ymiz0bgq14nzysyzamw46zgiap0vgkj9a3rfi68cky524w"
+   "commit": "319a4ace84ae59bca44224eb93f440acfb105197",
+   "sha256": "0cm80y8s2qn7wsidn8jq4qv2ni5agrv5m5zqcvrismvqv4x0d6l7"
   },
   "stable": {
    "version": [
@@ -108381,11 +108683,11 @@
   "repo": "Kungsgeten/ryo-modal",
   "unstable": {
    "version": [
-    20221221,
-    1355
+    20240819,
+    1740
    ],
-   "commit": "b9e6a0f33b9e2aeb6088accd23ed312083d8f707",
-   "sha256": "1kk3szdiqk3860wfjdfzv8l0fc303gr8gqnj2ynplpq0jp16lviw"
+   "commit": "b47b953811b4f18f8f11f2e247d947d0c4c72785",
+   "sha256": "0nr513gsq5ihxiw6hrv7scdk5v8r60wrz6gnz8kmqklxaan9jrn8"
   }
  },
  {
@@ -108631,14 +108933,15 @@
   "repo": "thapakrish/samskritam.el",
   "unstable": {
    "version": [
-    20220912,
-    255
+    20240723,
+    1609
    ],
    "deps": [
-    "google-translate"
+    "google-translate",
+    "popper"
    ],
-   "commit": "93566481023b2645ca1f1dfcc5440712c2ec843b",
-   "sha256": "1sd6gq0sjjz3ym6p4avjfmw480yk6ww3rghq8i1aycfna7z1bz96"
+   "commit": "c1ff0ff27d37312549c7345b58593ab0a6083e31",
+   "sha256": "0rr8snrmgr1vadr6ivczz3zk0h2zyxrqqq9fs3kps3hwidpi6gcf"
   }
  },
  {
@@ -108781,11 +109084,11 @@
   "repo": "nicolaisingh/saveplace-pdf-view",
   "unstable": {
    "version": [
-    20240209,
-    505
+    20240816,
+    1351
    ],
-   "commit": "ee95460cd934080338f03a16f95b549577425216",
-   "sha256": "00cqk1qvmdw07vmmyxc843m2qgx1n9ivwzp73r27v4jxx1i38vx2"
+   "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef",
+   "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc"
   }
  },
  {
@@ -108920,11 +109223,11 @@
   "repo": "hvesalai/emacs-scala-mode",
   "unstable": {
    "version": [
-    20240113,
-    1743
+    20240729,
+    420
    ],
-   "commit": "4c6d636b86e3bb1d95de819dc48dda92abdfbcf4",
-   "sha256": "0d3x0fk09a2bl2f7sy6k28164r8s2hvshh20p5kp1rg75y0syksa"
+   "commit": "bd0638c32ab0f2eadacf2809329abf5388211760",
+   "sha256": "1cn16cgh51am3skd081xz2di6fybn4c589f0g3qi5w73c5fmzq1d"
   },
   "stable": {
    "version": [
@@ -108959,11 +109262,11 @@
   "repo": "KaranAhlawat/scala-ts-mode",
   "unstable": {
    "version": [
-    20240630,
-    1733
+    20240812,
+    1639
    ],
-   "commit": "8c4ace721fb525d1a790121a8625bc2623c9f207",
-   "sha256": "100zx8f57f8gdi8wmkcj38nannyzgpybc63jzs466c61f7li5wjg"
+   "commit": "3580c0c724df06af23dff986f0a7a400cbc58cb8",
+   "sha256": "02rm7gmlgxrpidvbj1s3gkqby5jrwvw8gfxg2i4fa9n1m00yyikg"
   }
  },
  {
@@ -109479,15 +109782,28 @@
   "repo": "sdm-lang/emacs-sdml-mode",
   "unstable": {
    "version": [
-    20240708,
-    1403
+    20240801,
+    1458
    ],
    "deps": [
     "tree-sitter",
     "tree-sitter-indent"
    ],
-   "commit": "33e44bfe8fddefc16538407d55da3ca85cfc1a6d",
-   "sha256": "1nv97ffwvaqgh2vycm0cgn1nra6qyajl25fwx1kl0psfb3k7kfiv"
+   "commit": "65e5bbd6e2e1a7c1e5795e20839a83ec9ddf48f5",
+   "sha256": "11avwv4nny33sdzj789ypkzgq06xangskr0s6k2zpfwpg7bq5d1y"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    8
+   ],
+   "deps": [
+    "tree-sitter",
+    "tree-sitter-indent"
+   ],
+   "commit": "105c0fd42269ba8a5c29fa71e617644fa385f68f",
+   "sha256": "1axpf0cs4sk9aa23dhpxal1vwfpff2k10fg54iiqqbw4yvlckp8y"
   }
  },
  {
@@ -109750,11 +110066,14 @@
   "repo": "captainflasmr/selected-window-accent-mode",
   "unstable": {
    "version": [
-    20240709,
-    1942
+    20240815,
+    1934
    ],
-   "commit": "0c09d2aeb778ac3a03f2c3d99dfada9ba67e40ae",
-   "sha256": "0mqjgdym0nqlzrjwjmm6qzbmd51kv0z7mxxacsl3fzbwyj364g19"
+   "deps": [
+    "transient"
+   ],
+   "commit": "8a49af37909779cb47d53ea41922deec2d87fe29",
+   "sha256": "1r09mchbqdq0rc3kxynl3djaf8v2w9wgid8br4sw3x1x5m9c73ix"
   },
   "stable": {
    "version": [
@@ -109824,27 +110143,28 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240226,
-    204
+    20240803,
+    2320
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -110074,15 +110394,15 @@
   "repo": "twlz0ne/separedit.el",
   "unstable": {
    "version": [
-    20240119,
-    633
+    20240727,
+    848
    ],
    "deps": [
     "dash",
     "edit-indirect"
    ],
-   "commit": "bfd0902d771f9f0160e4f16a7b6e8c29ce3447fe",
-   "sha256": "0qripg4hzyfldb39w44sp1iyg9c0nys9bny83rswxmqkha1f3904"
+   "commit": "89bfc60c9ed2a606643f9966df39998c973694ec",
+   "sha256": "11rzga8zbkzy0jx6w3maqian9nn7ijn0sxkq6qc5896yasg8zwbs"
   },
   "stable": {
    "version": [
@@ -110684,11 +111004,20 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240623,
-    1713
+    20240814,
+    938
    ],
-   "commit": "f3307e7ffac399e36cb70d7663181dd53caf712a",
-   "sha256": "1i0w4izfzggnhr99wy6nb9zkc5p31pfxn2s962kkba6r2zvv435y"
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d",
+   "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc"
   }
  },
  {
@@ -111011,11 +111340,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20240712,
-    215
+    20240819,
+    38
    ],
-   "commit": "3c8530d29e54b64023d8c038e5046e085b052fa8",
-   "sha256": "1160a99djlixcxx1sh3jhpxxx96k9v2jnx7b67ar1rn5s2qc7dzb"
+   "commit": "7a669b232cbb840ef8c8a893e7ea672e7eacf3f9",
+   "sha256": "07hqw5w5h767kdf07wyqjgscsf1vw63l0apl13b5l69jaizrbx6i"
   }
  },
  {
@@ -111216,15 +111545,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20240622,
-    712
+    20240812,
+    653
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "a684fda3485684714a87b637c76b843fc15cecbb",
-   "sha256": "0x0x4plkmphz2qwxsv3vrgvhy2hcqbgs0aa03iqvxnyg22ih6pjk"
+   "commit": "71b17066edc8b49d11571ec94e339a93ab2f189c",
+   "sha256": "0yqwjjmzc0vv1x12vjffciwqzr1birpkr5nfihvaynwcc9z2iskp"
   },
   "stable": {
    "version": [
@@ -112101,8 +112430,8 @@
   "repo": "magit/sisyphus",
   "unstable": {
    "version": [
-    20240506,
-    1558
+    20240713,
+    1929
    ],
    "deps": [
     "compat",
@@ -112110,8 +112439,8 @@
     "llama",
     "magit"
    ],
-   "commit": "db9b36065faf149fef214248bdba1d90492cd2e9",
-   "sha256": "0czzvnchviwszgdpq1s3j2m9881a7dxh7hdd7hg7ay9ab18j0f1i"
+   "commit": "3caff966ef5cdaf4ee4ecfb36d0fc87e8840ce73",
+   "sha256": "0v2ipikqpwfvylmix8wm82qmjkcvq0diqjcr8y0ly2zagdg6hkwp"
   },
   "stable": {
    "version": [
@@ -112425,14 +112754,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20240705,
-    2255
+    20240731,
+    1518
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "eb30f9f7bae4f8eed27a060390ff8aadcf69174e",
-   "sha256": "09wz5pdgdq2md0m1z6c47sab3xxvwl897mci1axw44ny8g914f9z"
+   "commit": "3fca003ac639df989af3cfbfc8112bd34ea1a042",
+   "sha256": "0n8lj44c5s9c1x7xydc8mfz46pzfm4kabl342ipqs53ppvhd715l"
   },
   "stable": {
    "version": [
@@ -112573,14 +112902,11 @@
   "repo": "nilclass/slint-mode",
   "unstable": {
    "version": [
-    20230922,
-    1143
+    20240429,
+    1333
    ],
-   "deps": [
-    "lsp-mode"
-   ],
-   "commit": "1ef68ca9cf0cffd2c863c3135f96202a19cf8182",
-   "sha256": "17gz8yw7sqz1lh79v9nqqz0c3p4hbmrh532rkxbbljz58y2fip7i"
+   "commit": "168a6cfb90b5e36360074c83f80d5bbac2f0287e",
+   "sha256": "1bshm2rim7jifpy5xl42xdwzgrnkiq1jdjwpfzgzd0ljq7kw1vv8"
   }
  },
  {
@@ -112672,6 +112998,21 @@
    "sha256": "16cdrmwz0drydfyx9ghsm714x3zi3rsvzrajyv6xl789464q72n8"
   }
  },
+ {
+  "ename": "slurpbarf",
+  "commit": "f04f3351fde50e02dbf673c84c2b90a45afa6b05",
+  "sha256": "07d52g9iaxlr7bs833fc5z3qwajxdzqlpbp5hran9gy0dcdk530k",
+  "fetcher": "codeberg",
+  "repo": "vilij/slurpbarf-elcute",
+  "unstable": {
+   "version": [
+    20240717,
+    2213
+   ],
+   "commit": "e85451da4a73e461f3ee2f62200cd241a72638ca",
+   "sha256": "0cjbx14f01fl0akc6xqf6cmvc8j4i4j1fy0j58avd04c3dxq62f2"
+  }
+ },
  {
   "ename": "sly",
   "commit": "28d1f6bc44ef8ab731b37c3eb6bdc29b68465e50",
@@ -112680,11 +113021,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20240501,
-    1118
+    20240809,
+    2119
    ],
-   "commit": "ba40c8f054ec3b7040a6c36a1ef3e9596b936421",
-   "sha256": "0qhnn09pinrdjbkgl89xhgbrji2gagq05rrknklybklyvik851l6"
+   "commit": "742355f7554ab6c46e5c1c9bdb89068f55359eaa",
+   "sha256": "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451"
   },
   "stable": {
    "version": [
@@ -113536,20 +113877,20 @@
   "repo": "microamp/smmry.el",
   "unstable": {
    "version": [
-    20161024,
-    901
+    20240718,
+    947
    ],
-   "commit": "b7ee765337fa627a6c59eb4f2a91df5d280ac6df",
-   "sha256": "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"
+   "commit": "d3473b139430d221b4c4587dae685cd67a02c099",
+   "sha256": "0f9in9sx7nvxhzlwib6fasdcv3xdipcan00anz1ak26yw0sc7yhk"
   },
   "stable": {
    "version": [
     0,
     0,
-    3
+    4
    ],
-   "commit": "b7ee765337fa627a6c59eb4f2a91df5d280ac6df",
-   "sha256": "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"
+   "commit": "d3473b139430d221b4c4587dae685cd67a02c099",
+   "sha256": "0f9in9sx7nvxhzlwib6fasdcv3xdipcan00anz1ak26yw0sc7yhk"
   }
  },
  {
@@ -113810,15 +114151,15 @@
   "repo": "SpringHan/sniem",
   "unstable": {
    "version": [
-    20240423,
-    858
+    20240814,
+    931
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "1791011310fe8d48fc8c5b79b32cb5cf586fb081",
-   "sha256": "0jdsyfj83y1i9dfc7d8d840brgz5q02cyxp4iqkq3a065gsajrwr"
+   "commit": "e57e3b2afdabfa3ed02307f2f8839c822d680f92",
+   "sha256": "1nk6q0a2ssbdqcidfbbq54alhpb7w1i4l00c8y3690n1i2q1r2rx"
   }
  },
  {
@@ -114024,14 +114365,14 @@
   "repo": "hlissner/emacs-solaire-mode",
   "unstable": {
    "version": [
-    20240407,
-    1751
+    20240716,
+    1852
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "8ccdceeb9298b3c4e35f630914f467bf164f39ad",
-   "sha256": "164qqzmj1321rkvpiwpr5xnm1nbniibjkymfw5az32m2acdwk52j"
+   "commit": "c9334666bd208f3322e6118d30eba1b2438e2bb9",
+   "sha256": "05a1m2ljczj5fayr2kncfi8p55j2gwa2qpzjmzg63admdr87yp5g"
   },
   "stable": {
    "version": [
@@ -114054,11 +114395,11 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20231204,
-    713
+    20240725,
+    1617
    ],
-   "commit": "922b5956a9e2e474f1595bad7b2b35f148b4df3f",
-   "sha256": "18z36nzyh4dsd8igys37x0r3lnav77fvjrkxv48v3yjsrwli19gl"
+   "commit": "80ee6b99b022b20c27ffb44fb146f5878c9b5776",
+   "sha256": "0cb12zwndvlilhfnhq0yh0ygp86xhb04fgb807a1rwf3mgzrw57n"
   },
   "stable": {
    "version": [
@@ -114700,11 +115041,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20240623,
-    2202
+    20240815,
+    2134
    ],
-   "commit": "7b06ef8fb26825e0035c70c81ac130b930d81bbc",
-   "sha256": "0idlbwnf4zk1sf0jqbx9r1m3j9bjsl1gzxmbsziz4xjp769y1z5b"
+   "commit": "d02edec79404e807445b62d0d2fc1a6fbcc10c71",
+   "sha256": "15ychqqc05ajwd4nq5w360ayravbywdlm9lxbv6kchn2lm8y0fqp"
   },
   "stable": {
    "version": [
@@ -114843,11 +115184,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20240629,
-    106
+    20240815,
+    107
    ],
-   "commit": "70aa416c65bb8487f3cee6dd170b451fc489e902",
-   "sha256": "1kzvav066mp5i4f5y8wc6c1zy6aa3zfhhamzlw7d26j378wcb5vv"
+   "commit": "65f4459dc2368d037417247b380d03708f7b8fc0",
+   "sha256": "1pmbfmmwd2vzxswlv1984c2qxi5fjdzzmzy018n25dyfkx552nvn"
   }
  },
  {
@@ -115327,20 +115668,20 @@
   "repo": "sequoia-pgp/sqel",
   "unstable": {
    "version": [
-    20220717,
-    2039
+    20240721,
+    933
    ],
-   "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e",
-   "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d"
+   "commit": "096c641fe2ac1efeb8ba09d1244ef95bf25ae1bb",
+   "sha256": "19qgyd45kpgd79ilc9r6pjndn70qymrwz8zk4niv6gqd5hfxv7fa"
   },
   "stable": {
    "version": [
     0,
-    1,
-    2
+    2,
+    0
    ],
-   "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e",
-   "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d"
+   "commit": "096c641fe2ac1efeb8ba09d1244ef95bf25ae1bb",
+   "sha256": "19qgyd45kpgd79ilc9r6pjndn70qymrwz8zk4niv6gqd5hfxv7fa"
   }
  },
  {
@@ -115464,29 +115805,6 @@
    "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify"
   }
  },
- {
-  "ename": "sqlite",
-  "commit": "949556b57cea0fbbfc98b95d894de95257dfe1e5",
-  "sha256": "1c5dprdl8q09yd0kvpkm19z60m9rhkilj5zmj938wlj5bmdlydv8",
-  "fetcher": "gitlab",
-  "repo": "cnngimenez/sqlite.el",
-  "unstable": {
-   "version": [
-    20201227,
-    1822
-   ],
-   "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188",
-   "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188",
-   "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l"
-  }
- },
  {
   "ename": "sqlite-mode-extras",
   "commit": "5c109bdc19547ac1483b07c54a81934458b525f5",
@@ -115633,11 +115951,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20240507,
-    58
+    20240813,
+    1909
    ],
-   "commit": "7d3584b0b887a3bedebe5fd829fa7623c1d730fc",
-   "sha256": "13652cn287d17jfvj37a14iy3awisibmrm7dglivm8hcjlkaj9fg"
+   "commit": "3dac6e04eb2ed797a617abf6b3288808e83d66b4",
+   "sha256": "1xd2dib5xhx0z3cdf0p21swialwaz4wc1vswy0mnpicvj9hrnqbz"
   },
   "stable": {
    "version": [
@@ -115910,32 +116228,34 @@
   "repo": "daanturo/starhugger.el",
   "unstable": {
    "version": [
-    20240523,
-    326
+    20240731,
+    347
    ],
    "deps": [
     "compat",
     "dash",
+    "request",
     "s",
     "spinner"
    ],
-   "commit": "17c3847566447e2a860d5837d35380160276bed6",
-   "sha256": "0cx256mxn6s0nz7cgmc7iadqshj3flmhzc78v61ci21r999j3kpz"
+   "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3",
+   "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7"
   },
   "stable": {
    "version": [
     0,
-    4,
-    2
+    5,
+    0
    ],
    "deps": [
     "compat",
     "dash",
+    "request",
     "s",
     "spinner"
    ],
-   "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79",
-   "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d"
+   "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3",
+   "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7"
   }
  },
  {
@@ -116105,20 +116425,20 @@
   "repo": "stacked-git/stgit",
   "unstable": {
    "version": [
-    20240505,
-    2218
+    20240817,
+    2126
    ],
-   "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6",
-   "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d"
+   "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21",
+   "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz"
   },
   "stable": {
    "version": [
     2,
     4,
-    7
+    10
    ],
-   "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6",
-   "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d"
+   "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21",
+   "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz"
   }
  },
  {
@@ -116345,11 +116665,11 @@
   "repo": "akicho8/string-inflection",
   "unstable": {
    "version": [
-    20220910,
-    1306
+    20240816,
+    523
    ],
-   "commit": "50ad54970b3cc79b6b83979bde9889ad9a9e1a9c",
-   "sha256": "1xjm3m929wigycv8z7859l4pyb363hbqff8si6xig7p5ya4ksal5"
+   "commit": "4cc92e1ecd3d165b55235b51ae65ac09a0364958",
+   "sha256": "10jiabaxzvcpnqskai0jacj5n9h4ni5yr0rc8j2w0q35wfi78vmn"
   },
   "stable": {
    "version": [
@@ -117362,11 +117682,11 @@
   "repo": "rechsteiner/swift-ts-mode",
   "unstable": {
    "version": [
-    20240603,
-    735
+    20240811,
+    853
    ],
-   "commit": "5e198d306bd4d49e4dddab39195fe99e1caf8892",
-   "sha256": "1amxdcy7f8ixs7wq5jrmd8kca5a5vdijfv9jlz6ffvl3wqb01c3k"
+   "commit": "e094c17022e5a3fc27cc504fef6138cdde14ad00",
+   "sha256": "1qrlxw0v9skj318vfllnalz7013bxdmmqp4cdv2hmdl6jnmzcz13"
   }
  },
  {
@@ -117753,8 +118073,8 @@
   "repo": "drym-org/symex.el",
   "unstable": {
    "version": [
-    20240627,
-    419
+    20240721,
+    2333
    ],
    "deps": [
     "evil",
@@ -117767,8 +118087,8 @@
     "tree-sitter",
     "tsc"
    ],
-   "commit": "6ef879ca83c111a0863c71dea29461138ae6331d",
-   "sha256": "0ypsk3k3s3y302zygm0im2g2cr7l753yn5ymr99rkzli629framz"
+   "commit": "fe45b0bb13a6a906cc6ac7d836a4021ee4a82421",
+   "sha256": "170nz5938bv3908lp6wqfh7bn1kj0f8aj45fqrlnabnwy06p6x1y"
   },
   "stable": {
    "version": [
@@ -118055,16 +118375,16 @@
   "repo": "vapniks/syslog-mode",
   "unstable": {
    "version": [
-    20210910,
-    1952
+    20240818,
+    2215
    ],
    "deps": [
     "hide-lines",
     "hsluv",
     "ov"
    ],
-   "commit": "072664784dae41a573a9de8d178bf577b7526b82",
-   "sha256": "04ddpn6il6mh1f992x3fxl6yljryghi51q4845lx08cbc74wnfz0"
+   "commit": "3972f7e6697c052b293a8b090f08a94bf7296729",
+   "sha256": "1bhksmfrbzq2mirx8rqh3ccp0946rj53lh4218vg88pbvb9dh1v2"
   },
   "stable": {
    "version": [
@@ -118216,11 +118536,11 @@
   "repo": "fritzgrabo/tab-bar-echo-area",
   "unstable": {
    "version": [
-    20221115,
-    1953
+    20240809,
+    1442
    ],
-   "commit": "3ab62ca7db3c1d83f96b7971ea4b3b0101b51ae9",
-   "sha256": "0grapqwfqjbi9yzcirgd8gmkg4zkplagwvdyal4jd4aajnnx6sh8"
+   "commit": "9ccff3b93385796bec1cd435674807c3907436dd",
+   "sha256": "0kn9ccsmqf10v3vnvdp0dh9qiqryrgkwly879z7v5mkzd6jp4ngr"
   }
  },
  {
@@ -118448,14 +118768,14 @@
   "repo": "mclear-tools/tabspaces",
   "unstable": {
    "version": [
-    20240415,
-    1838
+    20240713,
+    2215
    ],
    "deps": [
     "project"
    ],
-   "commit": "c21f28b96b63926a530babe50d2c4de81ebaaa18",
-   "sha256": "0pxmhh0pga7cq8pkbyj0hjmpbabhb3322gy33z9nahy3m616m6hy"
+   "commit": "7ca3131835da6eae52af723ec8a951801b2376f5",
+   "sha256": "1zfk9h82hlh46gzi02wgm3alpcympzjapx8kjrma41yd0nmdpi21"
   }
  },
  {
@@ -118845,16 +119165,16 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20240527,
-    606
+    20240818,
+    929
    ],
    "deps": [
     "rainbow-identifiers",
     "transient",
     "visual-fill-column"
    ],
-   "commit": "58b4963b292ceb723d665df100b519eb5a99c676",
-   "sha256": "1q3ydbm0jhrsyvvdn0mpmxvskq0l53jkh40a5hlx7i3qkinbhbry"
+   "commit": "d86d943beca37b9270060e9acca65e8fe3f322f3",
+   "sha256": "0jwdv8pi7g1s44jvasq0apkmdfi2x8vk3ffznp3pm5mmrch661vn"
   },
   "stable": {
    "version": [
@@ -118934,14 +119254,14 @@
   "repo": "caramelhooves/teleport.el",
   "unstable": {
    "version": [
-    20240712,
-    1820
+    20240718,
+    652
    ],
    "deps": [
     "dash"
    ],
-   "commit": "bfdeb5c5e89665cbce24a1d04fc6cf62835bd18f",
-   "sha256": "1as20k8fg4wspa4icfpx1mc76j9lgqdh7qvb0jwaikq9cm7s8ls7"
+   "commit": "929f87990a6ee83dfcb7ebf9f8580828f1281ebb",
+   "sha256": "03l7g5cjsi6cnmd119fpkvhnc2arid467s9f7i4sh36l6xw5q5li"
   }
  },
  {
@@ -118985,25 +119305,25 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20240708,
-    2120
+    20240723,
+    2206
    ],
    "deps": [
     "compat"
    ],
-   "commit": "51eff558b986aa80e816bb00fbaf310f03f017c0",
-   "sha256": "18rbkzvd0c6dnbgggy6lvgv0baznkzviz2738ixa3y3b8mws4333"
+   "commit": "317c0e41d542721db11a7a8a1c6b78762959259b",
+   "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr"
   },
   "stable": {
    "version": [
     1,
-    1
+    2
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6",
-   "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5"
+   "commit": "317c0e41d542721db11a7a8a1c6b78762959259b",
+   "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr"
   }
  },
  {
@@ -119286,14 +119606,14 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20240602,
-    2356
+    20240811,
+    2337
    ],
    "deps": [
     "dash"
    ],
-   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
-   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
+   "commit": "fbf64768902cded6d75261515bd4aafe7cf56111",
+   "sha256": "05awn9fmm29jrrf8jflr0xy2c983lhx2r8xw7dkaimf4655pcy41"
   },
   "stable": {
    "version": [
@@ -119417,21 +119737,6 @@
    "sha256": "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d"
   }
  },
- {
-  "ename": "terminal-focus-reporting",
-  "commit": "19e7149a0a2db7df7f890a2c1ad22266e97694d7",
-  "sha256": "0iwq0rabq0sdn4apa5ibfp912j76w7hzg3q5lbxp7fspfwwynvg2",
-  "fetcher": "github",
-  "repo": "veelenga/terminal-focus-reporting.el",
-  "unstable": {
-   "version": [
-    20180830,
-    719
-   ],
-   "commit": "8b84bf18f4c5f1b59a11692eb706f13c3598d9a5",
-   "sha256": "0bbcl0mq62f22n2aipgzx93164x81bgybfd0x7gvsfva76qs8pc4"
-  }
- },
  {
   "ename": "terminal-here",
   "commit": "f8df6f7e23476eb52e7fdfbf9de277d3b44db978",
@@ -119579,25 +119884,30 @@
   "repo": "TxGVNN/terraform-doc",
   "unstable": {
    "version": [
-    20240328,
-    802
+    20240714,
+    418
    ],
    "deps": [
     "org",
     "promise",
     "request"
    ],
-   "commit": "32e65a46d1c31d1524002cc50b33082a84045173",
-   "sha256": "0bvd1drvgfkz8as134f0xdwvsa56l0hl59i66d77yryix3mmlg1f"
+   "commit": "26a6674fcf6f16e4865ff5e6600bb273fdc77779",
+   "sha256": "1180kaj9cc16n2glpc04pnzbia17daxk7dawc7l1hba7mk9vq1wm"
   },
   "stable": {
    "version": [
-    1,
     2,
-    0
+    0,
+    1
    ],
-   "commit": "16179e57ce290190c222b27961900657a1981330",
-   "sha256": "1p77m2babfw544cl9vpfjlnmga79hxfwv13hhczywapfqxzki8y6"
+   "deps": [
+    "org",
+    "promise",
+    "request"
+   ],
+   "commit": "26a6674fcf6f16e4865ff5e6600bb273fdc77779",
+   "sha256": "1180kaj9cc16n2glpc04pnzbia17daxk7dawc7l1hba7mk9vq1wm"
   }
  },
  {
@@ -119608,15 +119918,15 @@
   "repo": "hcl-emacs/terraform-mode",
   "unstable": {
    "version": [
-    20240321,
-    2136
+    20240801,
+    921
    ],
    "deps": [
     "dash",
     "hcl-mode"
    ],
-   "commit": "a645c32a8f0f0d04034262ae5fea330d5c7a33c6",
-   "sha256": "17zb4adh8j333nc4w4ywnw4kvljbanrnkmf0k7m6nv71rp1v56fr"
+   "commit": "abfc10f5e313c4bb99de136a14636e9bc6df74f6",
+   "sha256": "0rlzx80dx1gv0hcpkjnlvabhf124l442pfish1vii1jaqm5b07ps"
   },
   "stable": {
    "version": [
@@ -119713,30 +120023,6 @@
    "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw"
   }
  },
- {
-  "ename": "test-kitchen",
-  "commit": "420d18c76f593338fb28807fcbe3b884be5b1634",
-  "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0",
-  "fetcher": "github",
-  "repo": "jjasghar/test-kitchen-el",
-  "unstable": {
-   "version": [
-    20171129,
-    2035
-   ],
-   "commit": "0fc0ca4808425f03fbeb8125246043723e2a179a",
-   "sha256": "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k"
-  },
-  "stable": {
-   "version": [
-    0,
-    3,
-    0
-   ],
-   "commit": "ddbcb964ac4700973eaf30ae366f086e3319e51f",
-   "sha256": "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8"
-  }
- },
  {
   "ename": "test-simple",
   "commit": "a4b76e053faee299f5b770a0e41aa615bf5fbf10",
@@ -120195,21 +120481,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20240707,
-    1631
+    20240818,
+    2324
    ],
-   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
-   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
+   "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26",
+   "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf"
   },
   "stable": {
    "version": [
     2024,
-    7,
     8,
+    19,
     0
    ],
-   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
-   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
+   "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26",
+   "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf"
   }
  },
  {
@@ -120987,11 +121273,11 @@
   "repo": "avillafiorita/todotxt-mode",
   "unstable": {
    "version": [
-    20200228,
-    952
+    20240802,
+    604
    ],
-   "commit": "8b616ce1cf3e18a60757450a0acf22996abb9b79",
-   "sha256": "1frvksra8s004xknlizs5gz5rhy9xbis5r353pzsybmn1bxa40wk"
+   "commit": "ca4310cfcce4d1f3a6670b31412a9b56462e5b5d",
+   "sha256": "0pjjc9saa08f0xmb06bisg03pmv0nbgsnqmdjz6pph8ilwc1x3hx"
   }
  },
  {
@@ -121035,11 +121321,11 @@
   "repo": "justinlime/toggle-term.el",
   "unstable": {
    "version": [
-    20240616,
-    722
+    20240804,
+    117
    ],
-   "commit": "d17596b8ed52e6a2f0c7f6754ee6fa233d28c146",
-   "sha256": "041p36p0g0qpdfhwh9b1zy0lp2m1w8f3zk9z7m8cpdj87ddqva45"
+   "commit": "54605ed1d03dbfd324d9bec4ee314ab764a2a8dd",
+   "sha256": "15cmn2zwcypx17zxii3m39a7jwb4fsxm9ix8ykbmnxnjfl7kzxha"
   }
  },
  {
@@ -121196,11 +121482,11 @@
   "repo": "jamescherti/tomorrow-night-deepblue-theme.el",
   "unstable": {
    "version": [
-    20240712,
-    1635
+    20240727,
+    51
    ],
-   "commit": "5359e32f641ba4f2d596999d32a702182a1add73",
-   "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp"
+   "commit": "6e970e273ca3e4228145e968401497b38f0c9760",
+   "sha256": "0cpb8blskri1347csi29vicxiim5lzqdz5q8dndi111vv0i4lz9h"
   },
   "stable": {
    "version": [
@@ -121668,34 +121954,34 @@
  },
  {
   "ename": "transient",
-  "commit": "af5c1593052d63146e850683c461a760ab166033",
-  "sha256": "11a2m4vdccn2yfn5aj2g5smiml69vidir9ss8c70pld17z1wzx07",
+  "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7",
+  "sha256": "1a7q41wn950nj3l19mrlp415svix0v1794f4dx3aja4f8shkzvb1",
   "fetcher": "github",
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20240629,
-    1508
+    20240819,
+    1250
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "32b7a99bf25fbf43fcc6efb9712a2c0888edd3eb",
-   "sha256": "0xjasyipbw1sx1yy81ywdqmz8pmngmyc50n1pacyys771zd96dxq"
+   "commit": "042291c530f71ea778b40a43552ec7263da24e8a",
+   "sha256": "0iddjpzw9hbhpzq81fyc5qsgbiky93acz2gm57hfr9jj54807s1w"
   },
   "stable": {
    "version": [
     0,
     7,
-    2
+    4
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "2d6fae0ca232c2423facbbbf8ece18c856e7d31d",
-   "sha256": "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989"
+   "commit": "b2cb4e578f2362a0354c4a31a6bd89d6c4b63d63",
+   "sha256": "0ad0qkcvc9w6ry8f4b6xrdy52vlxm8nrp67k2p97w6prhyfxbp7p"
   }
  },
  {
@@ -121965,34 +122251,34 @@
  },
  {
   "ename": "tray",
-  "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
-  "sha256": "1zr6v7kypm9icjgxj6hn0gw44cxbnx1w3lfgyr1zjngvj9n94h36",
-  "fetcher": "sourcehut",
+  "commit": "e11a2781aeca4a66c715913872406160ef535d0a",
+  "sha256": "0w9jhi55ya7ggsajghd61b7lzf962zafm2lqc5vk3jhd53iqf0rc",
+  "fetcher": "github",
   "repo": "tarsius/tray",
   "unstable": {
    "version": [
-    20240618,
-    1838
+    20240811,
+    29
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
-   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
+   "commit": "fca0ed0010473a61be135b2791426ae5463fe9ea",
+   "sha256": "14kasydd09aff3jn5zkyk4wp4q97741slin1389673l3l04hha1q"
   },
   "stable": {
    "version": [
     0,
     1,
-    3
+    4
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
-   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
+   "commit": "988afc5967237ed9acfd6d9a53c631e476fccc62",
+   "sha256": "117ddayip71gmn62v179jkqd28d4zjrdl2pz8cnfwmlxaf7236pi"
   }
  },
  {
@@ -122150,26 +122436,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20240707,
-    727
+    20240818,
+    1702
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
-   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
+   "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f",
+   "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n"
   },
   "stable": {
    "version": [
     0,
     12,
-    204
+    212
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
-   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
+   "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f",
+   "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n"
   }
  },
  {
@@ -122246,8 +122532,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240613,
-    2014
+    20240815,
+    1227
    ],
    "deps": [
     "ace-window",
@@ -122259,8 +122545,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "54ef590b7621032a76f8f3e307032fc13c802371",
-   "sha256": "116qwsyvb105in31f62an3zvsfah8ncl8bwh2hw0kwbvnrm387vk"
+   "commit": "488dfc0a3aa7c1d35802d4f89be058e761578663",
+   "sha256": "01gljyihn9wyishd39vxav8rdzy19wsp0jyd0kr7w7xv83rbm57n"
   },
   "stable": {
    "version": [
@@ -122608,11 +122894,11 @@
   "repo": "erickgnavar/treesit-ispell.el",
   "unstable": {
    "version": [
-    20240611,
-    117
+    20240816,
+    145
    ],
-   "commit": "56740dccd5a72277fa05f19491e032e0c4701ad2",
-   "sha256": "162q3i1c8v6k8zzbwfm7h6yn4w0r1xvw9039pn3z7widpcz5mczw"
+   "commit": "9e06b5a37945f3ff96a5cfbb79ea3e4c2986bd6a",
+   "sha256": "1fq5j8rx1crwdjxsg18i8l83m0fql9z2rnkfjgjxwc75p83b77hi"
   }
  },
  {
@@ -123219,20 +123505,20 @@
  },
  {
   "ename": "twtxt",
-  "commit": "5490cd1e9008185e1c587fccf70f796e5a4da296",
-  "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l",
-  "fetcher": "github",
+  "commit": "32ad9cfa9ce6471b368488c3048052668c48a616",
+  "sha256": "08001bdqa3q6klirad26skqigp6dv04w9992m1my1smvbbvjyppq",
+  "fetcher": "codeberg",
   "repo": "deadblackclover/twtxt-el",
   "unstable": {
    "version": [
-    20220628,
-    309
+    20240730,
+    151
    ],
    "deps": [
     "request"
    ],
-   "commit": "eb9efa19086fcae343353f6a5e88c3377fd06dd4",
-   "sha256": "142kjwh5ya237j10hj6kvm28d22l8vmhbaahpn87bl70lcpqv3fb"
+   "commit": "d6a0fc57bcc7dd4a4a76a0836beb33900878ea0b",
+   "sha256": "1s5xzi1zqvl6395ynyrlq89d8cisnwzsdj1hgyw6zzd2vz4xy65z"
   }
  },
  {
@@ -123266,20 +123552,20 @@
   "repo": "KeyWeeUsr/typewriter-roll-mode",
   "unstable": {
    "version": [
-    20240225,
-    1412
+    20240817,
+    928
    ],
-   "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069",
-   "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a"
+   "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3",
+   "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
-   "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069",
-   "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a"
+   "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3",
+   "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql"
   }
  },
  {
@@ -123635,6 +123921,21 @@
    "sha256": "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz"
   }
  },
+ {
+  "ename": "ulisp-mode",
+  "commit": "569af2df55b728a965bcc27f81c777917d1e7b4a",
+  "sha256": "0h6x4lsy0vd8dk6j32yzx2v4v7bnz5x9ph5rklhz628jnq8npjmp",
+  "fetcher": "codeberg",
+  "repo": "deadblackclover/ulisp-mode",
+  "unstable": {
+   "version": [
+    20240807,
+    1000
+   ],
+   "commit": "7f52f030e5bf6e98ba9eee75631a6e2b95f90583",
+   "sha256": "0iqkwrqmbcblnh00w0lsgnf79mcqdb52wrdx41mvq6hx31zgrcjp"
+  }
+ },
  {
   "ename": "uml-mode",
   "commit": "d2dbf909ca733aef6a3da6c48165aa3d2e9dc186",
@@ -123794,11 +124095,11 @@
   "repo": "ideasman42/emacs-undo-fu-session",
   "unstable": {
    "version": [
-    20240709,
-    1418
+    20240713,
+    1427
    ],
-   "commit": "ae94c87b3f6f0ac0639005f506762866e65dcf9a",
-   "sha256": "1irqs9sl0lsjkwxknv54nkwcrq788hz1h4jmh2xx1xn25gfh7nmw"
+   "commit": "beb0e285d074145eaf481a959c903b77c19ae91e",
+   "sha256": "02wvdnzc229aga5pjb5sqbpi22afjqn6q5v8qay901bgc6r6f9pl"
   }
  },
  {
@@ -124664,20 +124965,20 @@
   "repo": "ursalang/ursa-ts-mode",
   "unstable": {
    "version": [
-    20231119,
-    1545
+    20240721,
+    732
    ],
-   "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64",
-   "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr"
+   "commit": "3ef802532520c31ba7a4101748bac516325890b5",
+   "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq"
   },
   "stable": {
    "version": [
     1,
     3,
-    5
+    6
    ],
-   "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64",
-   "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr"
+   "commit": "3ef802532520c31ba7a4101748bac516325890b5",
+   "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq"
   }
  },
  {
@@ -125743,11 +126044,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20240708,
-    2311
+    20240808,
+    2150
    ],
-   "commit": "8a2d425ea7b2287090d6464c05f24b8894cfd09b",
-   "sha256": "1v9hsqnfah87zgxpl21867k1lh9ljazjsrdid60qr6s4hxjjn97m"
+   "commit": "ae0c111ab00eb3bc2657fa0f0e1ffb455103ceb0",
+   "sha256": "08dp2j1mdm5gz2s652w4lca3v7pqavv5qfp2vlgp2iv0dzs0na30"
   },
   "stable": {
    "version": [
@@ -125804,8 +126105,8 @@
   "repo": "gmlarumbe/verilog-ext",
   "unstable": {
    "version": [
-    20240407,
-    1352
+    20240729,
+    1502
    ],
    "deps": [
     "ag",
@@ -125820,8 +126121,8 @@
     "verilog-ts-mode",
     "yasnippet"
    ],
-   "commit": "1454457a85c9fb10145f45f80e1d3baa065017e5",
-   "sha256": "1rngn0w88a18hy1cba8qlc71zh3k5611rx4zgvnx8n0b8n6j1758"
+   "commit": "de2f4af5ff669d2006eb84ef4bbf9f6a30cfb478",
+   "sha256": "0lvklhrwx66i4snr50daiadlpmp2ip798l8jap7v11z6zbmr681q"
   },
   "stable": {
    "version": [
@@ -125854,11 +126155,11 @@
   "repo": "gmlarumbe/verilog-ts-mode",
   "unstable": {
    "version": [
-    20240406,
-    2147
+    20240729,
+    1918
    ],
-   "commit": "f2dda1b25a06661569e393b04902be6a8e992b90",
-   "sha256": "18bmp1al4wsz7pcal39qbgb0q2zmib1xvjxz78ylwimpd8x81i7l"
+   "commit": "aa2dd2217006d414e4637cf69515508978fb8bc0",
+   "sha256": "17ff6j9a5qpccjfwvq6mz8l0jkz1pid70x8f4xmbc2zfrbpajk8g"
   },
   "stable": {
    "version": [
@@ -125956,25 +126257,25 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20240708,
-    2157
+    20240726,
+    2131
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c971c5106b2ce001b0d263683aa51eaaf7606e10",
-   "sha256": "0pllcx67l5wmb8iyj6ilam3m26qdm9x7cpb7qygsdda3am3grn6h"
+   "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005",
+   "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p"
   },
   "stable": {
    "version": [
     1,
-    8
+    9
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1def56a1e678ff9a8eeafafda9c474a5fbb097c4",
-   "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr"
+   "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005",
+   "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p"
   }
  },
  {
@@ -125985,29 +126286,30 @@
   "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20240505,
-    2249
+    20240803,
+    2320
    ],
    "deps": [
     "compat",
     "prescient",
     "vertico"
    ],
-   "commit": "0765418e4362099db8788fcb745ce9b7602aa001",
-   "sha256": "1194racjqb6m2npsdyzbyf77ajrw8qkaq87ciy2z9fxxmzgwj84w"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   },
   "stable": {
    "version": [
     6,
-    3
+    3,
+    1
    ],
    "deps": [
     "compat",
     "prescient",
     "vertico"
    ],
-   "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5",
-   "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4"
+   "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c",
+   "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j"
   }
  },
  {
@@ -126062,8 +126364,8 @@
   "repo": "gmlarumbe/vhdl-ext",
   "unstable": {
    "version": [
-    20240407,
-    1353
+    20240808,
+    1543
    ],
    "deps": [
     "ag",
@@ -126075,14 +126377,14 @@
     "ripgrep",
     "vhdl-ts-mode"
    ],
-   "commit": "bd5f97d811f4444ab523a5faace8e599a90d972d",
-   "sha256": "1x72kmwzyhwkxrqx4ijajz8wsxm389mj48ba2y9z1vpsiijvp7i6"
+   "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92",
+   "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb"
   },
   "stable": {
    "version": [
     0,
     5,
-    0
+    1
    ],
    "deps": [
     "ag",
@@ -126094,8 +126396,8 @@
     "ripgrep",
     "vhdl-ts-mode"
    ],
-   "commit": "08fc11c16c1e4425fe1dcc352e005c193112c1d7",
-   "sha256": "1q474h728zf6fv7zkh6fhfb81icqmyn48g6df79106z28vvfqdz7"
+   "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92",
+   "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb"
   }
  },
  {
@@ -126139,20 +126441,20 @@
   "repo": "gmlarumbe/vhdl-ts-mode",
   "unstable": {
    "version": [
-    20240406,
-    2155
+    20240808,
+    1032
    ],
-   "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39",
-   "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck"
+   "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27",
+   "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz"
   },
   "stable": {
    "version": [
     0,
     1,
-    2
+    3
    ],
-   "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39",
-   "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck"
+   "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27",
+   "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz"
   }
  },
  {
@@ -126253,20 +126555,20 @@
   "repo": "jamescherti/vim-tab-bar.el",
   "unstable": {
    "version": [
-    20240710,
-    1928
+    20240714,
+    2213
    ],
-   "commit": "1fec194e7890135c5e06b61a31c78612eec3b546",
-   "sha256": "0gg6wc4cz6g49h356l3ks3hgx3pvlbf976gvl0585c88f4rwvg4p"
+   "commit": "b0846f214602a96a0c812029b10494749eb373a2",
+   "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir"
   },
   "stable": {
    "version": [
     1,
     0,
-    5
+    6
    ],
-   "commit": "ba0d914f725db86c67ddf0469d3f34fdd0f4f2aa",
-   "sha256": "0nahsm1pynsipq0ym2p73rxc90i0sxsj86an207h8d2ag7j37kc6"
+   "commit": "b0846f214602a96a0c812029b10494749eb373a2",
+   "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir"
   }
  },
  {
@@ -126703,11 +127005,11 @@
   "repo": "emacs-vs/vs-dark-theme",
   "unstable": {
    "version": [
-    20240605,
-    134
+    20240729,
+    2203
    ],
-   "commit": "351300bad1a28f5e86f39f6fae9ca5d8a0cfb24d",
-   "sha256": "1jhczlfnw00iqkyb0952fj330wn0ipa9hiyhjc7a3g1c2swp9mql"
+   "commit": "54f887bea8a5846b96febd1faf93c5910b8ac10b",
+   "sha256": "0rs1ppx82bhvnjakn4k12ycfxlia8v0gzbv8wgmyxr4gkl8c1n2g"
   },
   "stable": {
    "version": [
@@ -126726,11 +127028,11 @@
   "repo": "emacs-vs/vs-light-theme",
   "unstable": {
    "version": [
-    20240605,
-    133
+    20240729,
+    2203
    ],
-   "commit": "5eeb6e5df24172497c844da750697b2ca3b750fe",
-   "sha256": "19kizkrqpw7m18pmfr4gi3pzxmkf9vc900z10079crrdw90lqjs4"
+   "commit": "e07fdeb808763b65dd918d7ae936744bc60d49fa",
+   "sha256": "0c4djxj5wzp394rdn3q425qcdpgzm5qla7s4dykpn9ysj0dsj71w"
   },
   "stable": {
    "version": [
@@ -126795,6 +127097,21 @@
    "sha256": "168hvmj3nlbi1p7w5m424sn6shn12kbgjd9spyj60pj1867jq7r1"
   }
  },
+ {
+  "ename": "vsh-mode",
+  "commit": "9a1a2389ac6878bda016186a6741f4296b845615",
+  "sha256": "1wkcl9shpzvgzqpbs9wqjwhf0y8nbysyimq3wwiinxxmvpxybgnd",
+  "fetcher": "github",
+  "repo": "hardenedapple/vsh",
+  "unstable": {
+   "version": [
+    20240730,
+    2036
+   ],
+   "commit": "0d98be666ccc59f9b31521d20dda8d0e07dd53cd",
+   "sha256": "0l7m8i40hfhnd4jrvkjn4n18nfbigmh4sdbc0086mgn9xn23shv5"
+  }
+ },
  {
   "ename": "vterm",
   "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99",
@@ -126965,8 +127282,8 @@
   "repo": "d12frosted/vulpea",
   "unstable": {
    "version": [
-    20240712,
-    1635
+    20240716,
+    1704
    ],
    "deps": [
     "dash",
@@ -126974,8 +127291,8 @@
     "org-roam",
     "s"
    ],
-   "commit": "c9eadce7fc85eb170d6319088d021a07f1218521",
-   "sha256": "14c2dkwh3q4nkdk8g22hs0ija22546gx9gwi13mj6nmrc34dyba6"
+   "commit": "f10da46d16af259aba7d703551b4aea42be8bad9",
+   "sha256": "085cqrx7w4lcx6m1bgwkgy3g2zhwyfpwm131c6qwg07v3ryilhp7"
   },
   "stable": {
    "version": [
@@ -127645,11 +127962,11 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20240413,
-    1455
+    20240804,
+    821
    ],
-   "commit": "005aa62d6f41fbf9bc045cac3b3b772716ee8ba7",
-   "sha256": "15bd89dwpvsfgc2m0jnnmmwqfqzrd2z9nv2qjdac339ddivm2lp8"
+   "commit": "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2",
+   "sha256": "0lvixg4c5apwrpqljj11b3yrq8nklz4ky4njnh8y6h1j5bisx40p"
   },
   "stable": {
    "version": [
@@ -128276,15 +128593,14 @@
   "repo": "SalOrak/whaler.el",
   "unstable": {
    "version": [
-    20240609,
-    1850
+    20240714,
+    1833
    ],
    "deps": [
-    "f",
-    "ivy"
+    "f"
    ],
-   "commit": "18791f9b5cfa05f7eabd686d572fa37f210ebe85",
-   "sha256": "0gjc9hqq1wz2npk2gw8nfkg2ikfhl3bcmlc0d3jzlpizc9mk6w7f"
+   "commit": "6909cc2280b9c0846255ca98b9f6420ec37efbc3",
+   "sha256": "1nrdyxfh7jidl9826gx20xvawmk63hqla80vgkyw0ab212sbv9k8"
   }
  },
  {
@@ -129128,32 +129444,32 @@
  },
  {
   "ename": "with-editor",
-  "commit": "af5c1593052d63146e850683c461a760ab166033",
-  "sha256": "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb",
+  "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7",
+  "sha256": "10vj9b0m52k0f89mbmlgzx7y04k6g5zjp6i143vb6h3y66b0qpax",
   "fetcher": "github",
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20240702,
-    1952
+    20240817,
+    1959
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6c9a51b72fa7f454a5a123f738a6a067972eca4e",
-   "sha256": "0y7k3qb53mcy24z3hdmkvnmy0fhnkmsli1b686bx605w2ilqqdif"
+   "commit": "8c550d9e799a0baedb2164471e7ed19fc15d9196",
+   "sha256": "1k9g1hrf6bdslbj1hkc71brj4sh45n837g1a128prxb70lkf6g2m"
   },
   "stable": {
    "version": [
     3,
-    3,
-    4
+    4,
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "322ee26d3a7d3d67840293041837b7e70cffa8d1",
-   "sha256": "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b"
+   "commit": "78c303a0181f2132e2254f965176b549044d74f2",
+   "sha256": "1hnc0jbjdpjr7xzh8gmhxkcbpw6mbla9vg8vy6py6mdk7ap1zqj8"
   }
  },
  {
@@ -129967,14 +130283,14 @@
   "repo": "jobbflykt/x509-mode",
   "unstable": {
    "version": [
-    20231215,
-    850
+    20240801,
+    719
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b19260d9863f1f7e310154fef71b1f3bd0871241",
-   "sha256": "1angyjpr28zjsw5blsjrqn7vfvlz02pkqxx9ckrjjq14mx2yi125"
+   "commit": "d62e83f1041680df8de7bbfe19aaaa0f2dfa79b6",
+   "sha256": "0dbi5fwid24ilrvagj0s9v9gn1737889swycm20vggkdcij8fzh8"
   }
  },
  {
@@ -130191,15 +130507,28 @@
   "repo": "akirak/xmind-org-el",
   "unstable": {
    "version": [
-    20220907,
-    1310
+    20240723,
+    1455
    ],
    "deps": [
     "dash",
     "org-ml"
    ],
-   "commit": "79f0b1d95af2a1b8436cee2d3d6c6115d9c6483d",
-   "sha256": "0khq7zm04pgj7a9alr2yl5s4q6xxyg5zyr90gkixbbc1g3xg59qh"
+   "commit": "01055f0b9a53d40c9ce6a7b1c259a3a73b4ff413",
+   "sha256": "0z2fchg19jqjalhkd64yx7l3s5rpgb04kvbgcg6s9ld70w8y94gr"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "dash",
+    "org-ml"
+   ],
+   "commit": "01055f0b9a53d40c9ce6a7b1c259a3a73b4ff413",
+   "sha256": "0z2fchg19jqjalhkd64yx7l3s5rpgb04kvbgcg6s9ld70w8y94gr"
   }
  },
  {
@@ -131109,14 +131438,14 @@
   "repo": "elken/yasnippet-capf",
   "unstable": {
    "version": [
-    20240420,
-    1531
+    20240716,
+    1054
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "ea2bbf4f1c5c133ca7105a5cda2bc01c8e378ef5",
-   "sha256": "07aqjni44hick55mphz4xq6rap7m3p5nbbc7x63984r0aa25ckac"
+   "commit": "4c2e33d70cd1d95cf1e08d134b058a6dd90a99c9",
+   "sha256": "0zqwrk1sssivjl9mjj9wm8s8c83hn23r3gxv13hg6dzh97rxllk8"
   }
  },
  {
@@ -132260,19 +132589,19 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240704,
-    910
+    20240812,
+    1148
    ],
-   "commit": "225d2628025195283170908e81341e3a8d49b022",
-   "sha256": "0x0cc42r56mfwi9cbyaxlnjpjv7hpkhcvn4whx545hzyr51hr53v"
+   "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca",
+   "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7"
   },
   "stable": {
    "version": [
     0,
-    6
+    7
    ],
-   "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5",
-   "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p"
+   "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c",
+   "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs"
   }
  },
  {
@@ -132283,27 +132612,27 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240102,
-    1405
+    20240812,
+    1148
    ],
    "deps": [
     "zk",
     "zk-index"
    ],
-   "commit": "82f636c1edda416794c7115757ecded64f22afbf",
-   "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i"
+   "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca",
+   "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7"
   },
   "stable": {
    "version": [
     0,
-    6
+    7
    ],
    "deps": [
     "zk",
     "zk-index"
    ],
-   "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5",
-   "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p"
+   "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c",
+   "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs"
   }
  },
  {
@@ -132314,25 +132643,25 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240704,
-    1102
+    20240819,
+    1355
    ],
    "deps": [
     "zk"
    ],
-   "commit": "9a2ece35d2ecec20cc11e2888413a86d03beb40b",
-   "sha256": "14lxs2r8awp92k5ijsvw1fwiz95vc3p5md913cqka4l7hvw9x2cv"
+   "commit": "7d3ef8524d35d0e431ef91b14f1a1af5ca08e36d",
+   "sha256": "06cjr1nkbj667rwx3pp8cq7nd677h0v6i48b206dmpnghckj63gz"
   },
   "stable": {
    "version": [
     0,
-    6
+    7
    ],
    "deps": [
     "zk"
    ],
-   "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5",
-   "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p"
+   "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c",
+   "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs"
   }
  },
  {
@@ -132343,15 +132672,15 @@
   "repo": "localauthor/zk-luhmann",
   "unstable": {
    "version": [
-    20240102,
-    1406
+    20240812,
+    1143
    ],
    "deps": [
     "zk",
     "zk-index"
    ],
-   "commit": "836943c5f6c6cdb932762385bbdf79e8bcfef3d7",
-   "sha256": "14wcqq6p7m1gq382y638fjcdvpd7206lrcrh5abnrprsyjxlr3l7"
+   "commit": "55eef9712984deab320fb1a952c0624af2988128",
+   "sha256": "11dj42pvfyqa0i6a31n2iicxrrh0psvvsiqq0pbrwk90hz7map34"
   }
  },
  {
@@ -132377,26 +132706,26 @@
   "repo": "nnicandro/emacs-zmq",
   "unstable": {
    "version": [
-    20230608,
-    1856
+    20240716,
+    2000
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9d5679c54f361f518a426586b51686674fd3b0fa",
-   "sha256": "1bg4c26f8n1jy6z9dr2c9fz79myy9lbb5z67797qp1cbx8k6p3n7"
+   "commit": "1d9d5a3b46cfd1a90a45ff777f200eb4d5d6fd9e",
+   "sha256": "0brdnp5fp4gxiq2dz3szb9fdmbs88i1qfqzv03lqzr7arqwn9svk"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9d5679c54f361f518a426586b51686674fd3b0fa",
-   "sha256": "1bg4c26f8n1jy6z9dr2c9fz79myy9lbb5z67797qp1cbx8k6p3n7"
+   "commit": "37d42dc37506234aa4b35bec6c98500e6f648363",
+   "sha256": "171cm487jbdqi73lk7vc9dsrzhxqic0yvy1vvxwk3b9qx1m2ab6v"
   }
  },
  {
@@ -132882,21 +133211,6 @@
    "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j"
   }
  },
- {
-  "ename": "zweilight-theme",
-  "commit": "0dccf5900100571b3a17003dd471991463137c38",
-  "sha256": "1caqjq1ijjbnpa1jjs5am1vp9kpcfg17dbyswdfw64q698c50j3x",
-  "fetcher": "github",
-  "repo": "vexx9/Zweilight-Theme-for-Emacs",
-  "unstable": {
-   "version": [
-    20170113,
-    605
-   ],
-   "commit": "890f27c939d8a358c9ef0f402fc3314f475ec874",
-   "sha256": "0pl254c61405n6sgr01qj4z42vqdvbmf59nz55cl23l2q7kdbfdv"
-  }
- },
  {
   "ename": "zygospore",
   "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",

From 1b04022ea7cfe7ddd2488f4d5ecda78dc97f317d Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 20 Aug 2024 23:19:17 +0800
Subject: [PATCH 224/235] nongnu-packages: updated 2024-08-20 (from overlay)

---
 .../emacs/elisp-packages/nongnu-generated.nix | 1242 +++++++----------
 1 file changed, 489 insertions(+), 753 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 1534ee9c4c3e..832fc2c9b16f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -3,7 +3,6 @@
   adoc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -15,9 +14,9 @@
         url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar";
         sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/adoc-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/adoc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -25,7 +24,6 @@
   afternoon-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -37,9 +35,9 @@
         url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar";
         sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/afternoon-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/afternoon-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -47,7 +45,6 @@
   alect-themes = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -59,9 +56,9 @@
         url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar";
         sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/alect-themes.html";
+        homepage = "https://elpa.nongnu.org/nongnu/alect-themes.html";
         license = lib.licenses.free;
       };
     }
@@ -82,7 +79,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ample-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ample-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -103,7 +100,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/annotate.html";
+        homepage = "https://elpa.nongnu.org/nongnu/annotate.html";
         license = lib.licenses.free;
       };
     }
@@ -124,7 +121,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -132,7 +129,6 @@
   anzu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -144,9 +140,9 @@
         url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
         sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/anzu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/anzu.html";
         license = lib.licenses.free;
       };
     }
@@ -167,7 +163,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/apache-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/apache-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -188,7 +184,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/apropospriate-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -196,7 +192,6 @@
   arduino-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       spinner,
@@ -209,12 +204,9 @@
         url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
         sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
       };
-      packageRequires = [
-        emacs
-        spinner
-      ];
+      packageRequires = [ spinner ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/arduino-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/arduino-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -235,7 +227,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers.html";
         license = lib.licenses.free;
       };
     }
@@ -244,7 +236,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -256,12 +247,9 @@
         url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
         sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/autothemer.html";
+        homepage = "https://elpa.nongnu.org/nongnu/autothemer.html";
         license = lib.licenses.free;
       };
     }
@@ -269,7 +257,6 @@
   base32 = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -281,9 +268,9 @@
         url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar";
         sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/base32.html";
+        homepage = "https://elpa.nongnu.org/nongnu/base32.html";
         license = lib.licenses.free;
       };
     }
@@ -291,7 +278,6 @@
   bash-completion = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -303,9 +289,9 @@
         url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar";
         sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bash-completion.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bash-completion.html";
         license = lib.licenses.free;
       };
     }
@@ -326,7 +312,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/beancount.html";
+        homepage = "https://elpa.nongnu.org/nongnu/beancount.html";
         license = lib.licenses.free;
       };
     }
@@ -334,7 +320,6 @@
   better-jumper = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -346,9 +331,9 @@
         url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar";
         sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/better-jumper.html";
+        homepage = "https://elpa.nongnu.org/nongnu/better-jumper.html";
         license = lib.licenses.free;
       };
     }
@@ -356,7 +341,6 @@
   bind-map = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -368,9 +352,9 @@
         url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
         sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bind-map.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bind-map.html";
         license = lib.licenses.free;
       };
     }
@@ -391,7 +375,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/bison-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/bison-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -399,7 +383,6 @@
   blow = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -411,9 +394,9 @@
         url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar";
         sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/blow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/blow.html";
         license = lib.licenses.free;
       };
     }
@@ -421,7 +404,6 @@
   blueprint-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -433,9 +415,9 @@
         url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar";
         sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -457,7 +439,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/boxquote.html";
+        homepage = "https://elpa.nongnu.org/nongnu/boxquote.html";
         license = lib.licenses.free;
       };
     }
@@ -465,7 +447,6 @@
   buttercup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -477,9 +458,9 @@
         url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar";
         sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/buttercup.html";
+        homepage = "https://elpa.nongnu.org/nongnu/buttercup.html";
         license = lib.licenses.free;
       };
     }
@@ -487,7 +468,6 @@
   camera = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -499,9 +479,9 @@
         url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar";
         sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/camera.html";
+        homepage = "https://elpa.nongnu.org/nongnu/camera.html";
         license = lib.licenses.free;
       };
     }
@@ -509,7 +489,6 @@
   caml = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -521,9 +500,9 @@
         url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar";
         sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/caml.html";
+        homepage = "https://elpa.nongnu.org/nongnu/caml.html";
         license = lib.licenses.free;
       };
     }
@@ -544,7 +523,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cdlatex.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cdlatex.html";
         license = lib.licenses.free;
       };
     }
@@ -553,7 +532,6 @@
     {
       clojure-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       parseedn,
@@ -573,7 +551,6 @@
       };
       packageRequires = [
         clojure-mode
-        emacs
         parseedn
         queue
         seq
@@ -582,7 +559,7 @@
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cider.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cider.html";
         license = lib.licenses.free;
       };
     }
@@ -590,7 +567,6 @@
   clojure-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -602,9 +578,9 @@
         url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
         sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/clojure-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/clojure-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -612,7 +588,6 @@
   clojure-ts-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -624,9 +599,9 @@
         url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar";
         sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/clojure-ts-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -635,7 +610,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -647,12 +621,9 @@
         url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar";
         sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/coffee-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -683,7 +654,6 @@
     {
       consult,
       elpaBuild,
-      emacs,
       fetchurl,
       flycheck,
       lib,
@@ -698,11 +668,10 @@
       };
       packageRequires = [
         consult
-        emacs
         flycheck
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/consult-flycheck.html";
+        homepage = "https://elpa.nongnu.org/nongnu/consult-flycheck.html";
         license = lib.licenses.free;
       };
     }
@@ -711,7 +680,6 @@
     {
       corfu,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       popon,
@@ -726,11 +694,10 @@
       };
       packageRequires = [
         corfu
-        emacs
         popon
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
+        homepage = "https://elpa.nongnu.org/nongnu/corfu-terminal.html";
         license = lib.licenses.free;
       };
     }
@@ -738,7 +705,6 @@
   crux = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -750,9 +716,9 @@
         url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar";
         sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/crux.html";
+        homepage = "https://elpa.nongnu.org/nongnu/crux.html";
         license = lib.licenses.free;
       };
     }
@@ -761,7 +727,6 @@
     {
       csv-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -773,12 +738,9 @@
         url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
         sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
       };
-      packageRequires = [
-        csv-mode
-        emacs
-      ];
+      packageRequires = [ csv-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
+        homepage = "https://elpa.nongnu.org/nongnu/csv2ledger.html";
         license = lib.licenses.free;
       };
     }
@@ -799,7 +761,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cyberpunk-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -807,7 +769,6 @@
   cycle-at-point = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       recomplete,
@@ -820,12 +781,9 @@
         url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar";
         sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z";
       };
-      packageRequires = [
-        emacs
-        recomplete
-      ];
+      packageRequires = [ recomplete ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/cycle-at-point.html";
+        homepage = "https://elpa.nongnu.org/nongnu/cycle-at-point.html";
         license = lib.licenses.free;
       };
     }
@@ -833,21 +791,20 @@
   d-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "d-mode";
       ename = "d-mode";
-      version = "202003130913";
+      version = "202408131340";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar";
-        sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s";
+        url = "https://elpa.nongnu.org/nongnu/d-mode-202408131340.tar";
+        sha256 = "19dgc0yd2fmc9xbrajc1l98p7p2wiwg43ajq4gssxdshb5vi5mn9";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/d-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/d-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -855,7 +812,6 @@
   dart-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -867,9 +823,9 @@
         url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar";
         sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dart-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dart-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -878,7 +834,6 @@
     {
       denote,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -890,12 +845,9 @@
         url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar";
         sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0";
       };
-      packageRequires = [
-        denote
-        emacs
-      ];
+      packageRequires = [ denote ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/denote-refs.html";
+        homepage = "https://elpa.nongnu.org/nongnu/denote-refs.html";
         license = lib.licenses.free;
       };
     }
@@ -903,7 +855,6 @@
   devhelp = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -915,9 +866,9 @@
         url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar";
         sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devhelp.html";
+        homepage = "https://elpa.nongnu.org/nongnu/devhelp.html";
         license = lib.licenses.free;
       };
     }
@@ -925,7 +876,6 @@
   devil = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -937,9 +887,9 @@
         url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar";
         sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/devil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/devil.html";
         license = lib.licenses.free;
       };
     }
@@ -947,7 +897,6 @@
   diff-ansi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -959,9 +908,9 @@
         url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar";
         sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/diff-ansi.html";
+        homepage = "https://elpa.nongnu.org/nongnu/diff-ansi.html";
         license = lib.licenses.free;
       };
     }
@@ -969,7 +918,6 @@
   doc-show-inline = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -981,9 +929,9 @@
         url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar";
         sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/doc-show-inline.html";
+        homepage = "https://elpa.nongnu.org/nongnu/doc-show-inline.html";
         license = lib.licenses.free;
       };
     }
@@ -991,7 +939,6 @@
   dockerfile-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1003,9 +950,9 @@
         url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
         sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dockerfile-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1013,7 +960,6 @@
   dracula-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1025,9 +971,9 @@
         url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar";
         sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dracula-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dracula-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -1042,14 +988,14 @@
     elpaBuild {
       pname = "drupal-mode";
       ename = "drupal-mode";
-      version = "0.7.4";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
-        sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609";
+        url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.8.1.tar";
+        sha256 = "0f3dd2647g964grzq95d73iznhpmrr9w7fmkifjk3ivz0rgdgjsq";
       };
       packageRequires = [ php-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/drupal-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1057,7 +1003,6 @@
   dslide = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1069,9 +1014,9 @@
         url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
         sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/dslide.html";
+        homepage = "https://elpa.nongnu.org/nongnu/dslide.html";
         license = lib.licenses.free;
       };
     }
@@ -1080,7 +1025,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1092,12 +1036,9 @@
         url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar";
         sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/eat.html";
+        homepage = "https://elpa.nongnu.org/nongnu/eat.html";
         license = lib.licenses.free;
       };
     }
@@ -1105,7 +1046,6 @@
   edit-indirect = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1117,9 +1057,9 @@
         url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar";
         sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/edit-indirect.html";
+        homepage = "https://elpa.nongnu.org/nongnu/edit-indirect.html";
         license = lib.licenses.free;
       };
     }
@@ -1127,7 +1067,6 @@
   editorconfig = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       nadvice,
@@ -1140,12 +1079,9 @@
         url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar";
         sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv";
       };
-      packageRequires = [
-        emacs
-        nadvice
-      ];
+      packageRequires = [ nadvice ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/editorconfig.html";
+        homepage = "https://elpa.nongnu.org/nongnu/editorconfig.html";
         license = lib.licenses.free;
       };
     }
@@ -1153,7 +1089,6 @@
   elixir-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1165,9 +1100,9 @@
         url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar";
         sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/elixir-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1175,7 +1110,6 @@
   elpher = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1187,9 +1121,30 @@
         url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
         sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/elpher.html";
+        homepage = "https://elpa.nongnu.org/nongnu/elpher.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emacsql = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "emacsql";
+      ename = "emacsql";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.1.tar";
+        sha256 = "0098ixlx70vx4mxlcyddkij9aj4sgcf7p699cii0pz51lg9bymc0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/emacsql.html";
         license = lib.licenses.free;
       };
     }
@@ -1211,7 +1166,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/engine-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/engine-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1232,7 +1187,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil.html";
         license = lib.licenses.free;
       };
     }
@@ -1258,7 +1213,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-anzu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-anzu.html";
         license = lib.licenses.free;
       };
     }
@@ -1280,7 +1235,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-args.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-args.html";
         license = lib.licenses.free;
       };
     }
@@ -1289,7 +1244,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1304,11 +1258,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-escape.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-escape.html";
         license = lib.licenses.free;
       };
     }
@@ -1334,7 +1287,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-exchange.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-exchange.html";
         license = lib.licenses.free;
       };
     }
@@ -1342,7 +1295,6 @@
   evil-goggles = callPackage (
     {
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1355,12 +1307,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar";
         sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch";
       };
-      packageRequires = [
-        emacs
-        evil
-      ];
+      packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-goggles.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-goggles.html";
         license = lib.licenses.free;
       };
     }
@@ -1386,7 +1335,7 @@
         iedit
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-iedit-state.html";
         license = lib.licenses.free;
       };
     }
@@ -1412,7 +1361,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-indent-plus.html";
         license = lib.licenses.free;
       };
     }
@@ -1440,7 +1389,7 @@
         smartparens
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-lisp-state.html";
         license = lib.licenses.free;
       };
     }
@@ -1448,7 +1397,6 @@
   evil-matchit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1460,9 +1408,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar";
         sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-matchit.html";
         license = lib.licenses.free;
       };
     }
@@ -1470,7 +1418,6 @@
   evil-nerd-commenter = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1482,9 +1429,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar";
         sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter.html";
         license = lib.licenses.free;
       };
     }
@@ -1492,7 +1439,6 @@
   evil-numbers = callPackage (
     {
       elpaBuild,
-      emacs,
       evil,
       fetchurl,
       lib,
@@ -1505,12 +1451,9 @@
         url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar";
         sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i";
       };
-      packageRequires = [
-        emacs
-        evil
-      ];
+      packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-numbers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-numbers.html";
         license = lib.licenses.free;
       };
     }
@@ -1532,7 +1475,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-surround.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-surround.html";
         license = lib.licenses.free;
       };
     }
@@ -1558,7 +1501,7 @@
         evil
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1580,7 +1523,7 @@
       };
       packageRequires = [ evil ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/evil-visualstar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/evil-visualstar.html";
         license = lib.licenses.free;
       };
     }
@@ -1588,7 +1531,6 @@
   exec-path-from-shell = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1600,9 +1542,9 @@
         url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar";
         sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html";
+        homepage = "https://elpa.nongnu.org/nongnu/exec-path-from-shell.html";
         license = lib.licenses.free;
       };
     }
@@ -1624,7 +1566,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flx.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flx.html";
         license = lib.licenses.free;
       };
     }
@@ -1650,7 +1592,7 @@
         flx
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flx-ido.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flx-ido.html";
         license = lib.licenses.free;
       };
     }
@@ -1658,7 +1600,6 @@
   flycheck = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1670,9 +1611,9 @@
         url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar";
         sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flycheck.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flycheck.html";
         license = lib.licenses.free;
       };
     }
@@ -1680,7 +1621,6 @@
   flymake-guile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       flymake ? null,
       lib,
@@ -1693,12 +1633,9 @@
         url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar";
         sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k";
       };
-      packageRequires = [
-        emacs
-        flymake
-      ];
+      packageRequires = [ flymake ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-guile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-guile.html";
         license = lib.licenses.free;
       };
     }
@@ -1706,7 +1643,6 @@
   flymake-kondor = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1718,9 +1654,9 @@
         url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar";
         sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-kondor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-kondor.html";
         license = lib.licenses.free;
       };
     }
@@ -1728,7 +1664,6 @@
   flymake-popon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       flymake ? null,
       lib,
@@ -1744,13 +1679,12 @@
         sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s";
       };
       packageRequires = [
-        emacs
         flymake
         popon
         posframe
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/flymake-popon.html";
         license = lib.licenses.free;
       };
     }
@@ -1759,7 +1693,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1771,12 +1704,9 @@
         url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
         sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/focus.html";
+        homepage = "https://elpa.nongnu.org/nongnu/focus.html";
         license = lib.licenses.free;
       };
     }
@@ -1797,7 +1727,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/forth-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/forth-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -1819,7 +1749,7 @@
       };
       packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/free-keys.html";
+        homepage = "https://elpa.nongnu.org/nongnu/free-keys.html";
         license = lib.licenses.free;
       };
     }
@@ -1827,7 +1757,6 @@
   gc-buffers = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -1839,9 +1768,9 @@
         url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar";
         sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gc-buffers.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gc-buffers.html";
         license = lib.licenses.free;
       };
     }
@@ -1849,7 +1778,6 @@
   geiser = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -1862,12 +1790,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
         sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
       };
-      packageRequires = [
-        emacs
-        project
-      ];
+      packageRequires = [ project ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser.html";
         license = lib.licenses.free;
       };
     }
@@ -1875,7 +1800,6 @@
   geiser-chez = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1888,12 +1812,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar";
         sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chez.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chez.html";
         license = lib.licenses.free;
       };
     }
@@ -1901,7 +1822,6 @@
   geiser-chibi = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1914,12 +1834,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar";
         sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chibi.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chibi.html";
         license = lib.licenses.free;
       };
     }
@@ -1927,7 +1844,6 @@
   geiser-chicken = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1940,12 +1856,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar";
         sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-chicken.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-chicken.html";
         license = lib.licenses.free;
       };
     }
@@ -1953,7 +1866,6 @@
   geiser-gambit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1966,12 +1878,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar";
         sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-gambit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-gambit.html";
         license = lib.licenses.free;
       };
     }
@@ -1979,7 +1888,6 @@
   geiser-gauche = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -1992,12 +1900,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar";
         sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-gauche.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-gauche.html";
         license = lib.licenses.free;
       };
     }
@@ -2005,7 +1910,6 @@
   geiser-guile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2014,18 +1918,17 @@
     elpaBuild {
       pname = "geiser-guile";
       ename = "geiser-guile";
-      version = "0.28.1";
+      version = "0.28.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar";
-        sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb";
+        url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.2.tar";
+        sha256 = "02s44dj6cr6fmiby6yljil7cgp00h31h3fs1a428lr3v51z1i38m";
       };
       packageRequires = [
-        emacs
         geiser
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-guile.html";
         license = lib.licenses.free;
       };
     }
@@ -2033,7 +1936,6 @@
   geiser-kawa = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2046,12 +1948,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar";
         sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-kawa.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-kawa.html";
         license = lib.licenses.free;
       };
     }
@@ -2059,7 +1958,6 @@
   geiser-mit = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2072,12 +1970,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar";
         sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-mit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-mit.html";
         license = lib.licenses.free;
       };
     }
@@ -2085,7 +1980,6 @@
   geiser-racket = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2098,12 +1992,9 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar";
         sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-racket.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-racket.html";
         license = lib.licenses.free;
       };
     }
@@ -2111,7 +2002,6 @@
   geiser-stklos = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       geiser,
       lib,
@@ -2124,42 +2014,39 @@
         url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar";
         sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s";
       };
-      packageRequires = [
-        emacs
-        geiser
-      ];
+      packageRequires = [ geiser ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/geiser-stklos.html";
+        homepage = "https://elpa.nongnu.org/nongnu/geiser-stklos.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   git-commit = callPackage (
     {
-      dash,
+      compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
+      seq,
       transient,
       with-editor,
     }:
     elpaBuild {
       pname = "git-commit";
       ename = "git-commit";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar";
-        sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx";
+        url = "https://elpa.nongnu.org/nongnu/git-commit-4.0.0.tar";
+        sha256 = "10fh8i3l07qxsfw23q2mkb7rxgc7n2chirzdjd9bnlqrxybrayli";
       };
       packageRequires = [
-        dash
-        emacs
+        compat
+        seq
         transient
         with-editor
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/git-commit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/git-commit.html";
         license = lib.licenses.free;
       };
     }
@@ -2168,24 +2055,48 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "git-modes";
       ename = "git-modes";
-      version = "1.4.3";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
-        sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
+        url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.4.tar";
+        sha256 = "161n8anh3i7aj9995nry879kkfvawm1dkzlxdqfwmzl85g8yqx58";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu/git-modes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnosis = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacsql,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "gnosis";
+      ename = "gnosis";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.1.tar";
+        sha256 = "1iqpssf3gxv54gig718529y3cfjybvvjcvndzhjsiyw5b33pkbby";
       };
       packageRequires = [
         compat
-        emacs
+        emacsql
+        transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/git-modes.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnosis.html";
         license = lib.licenses.free;
       };
     }
@@ -2206,7 +2117,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnu-apl-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2214,7 +2125,6 @@
   gnu-indent = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2226,9 +2136,9 @@
         url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar";
         sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnu-indent.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnu-indent.html";
         license = lib.licenses.free;
       };
     }
@@ -2236,7 +2146,6 @@
   gnuplot = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2248,9 +2157,9 @@
         url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
         sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gnuplot.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gnuplot.html";
         license = lib.licenses.free;
       };
     }
@@ -2258,7 +2167,6 @@
   go-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2270,9 +2178,9 @@
         url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar";
         sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/go-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/go-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2293,7 +2201,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/golden-ratio.html";
+        homepage = "https://elpa.nongnu.org/nongnu/golden-ratio.html";
         license = lib.licenses.free;
       };
     }
@@ -2301,7 +2209,6 @@
   gotham-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2313,9 +2220,9 @@
         url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar";
         sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gotham-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gotham-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2323,7 +2230,6 @@
   goto-chg = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2335,9 +2241,9 @@
         url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar";
         sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/goto-chg.html";
+        homepage = "https://elpa.nongnu.org/nongnu/goto-chg.html";
         license = lib.licenses.free;
       };
     }
@@ -2346,7 +2252,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       transient,
@@ -2361,11 +2266,10 @@
       };
       packageRequires = [
         compat
-        emacs
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gptel.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gptel.html";
         license = lib.licenses.free;
       };
     }
@@ -2373,7 +2277,6 @@
   graphql-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2385,9 +2288,9 @@
         url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
         sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/graphql-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2408,7 +2311,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gruber-darker-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2430,7 +2333,7 @@
       };
       packageRequires = [ autothemer ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/gruvbox-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2451,7 +2354,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/guru-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/guru-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2460,7 +2363,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2472,12 +2374,9 @@
         url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar";
         sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haml-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haml-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2485,7 +2384,6 @@
   haskell-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2497,9 +2395,9 @@
         url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar";
         sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haskell-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haskell-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2507,7 +2405,6 @@
   haskell-tng-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2519,9 +2416,9 @@
         url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar";
         sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/haskell-tng-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2547,7 +2444,7 @@
         wfnames
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/helm.html";
+        homepage = "https://elpa.nongnu.org/nongnu/helm.html";
         license = lib.licenses.free;
       };
     }
@@ -2556,7 +2453,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2568,12 +2464,9 @@
         url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
         sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/helm-core.html";
+        homepage = "https://elpa.nongnu.org/nongnu/helm-core.html";
         license = lib.licenses.free;
       };
     }
@@ -2581,7 +2474,6 @@
   hideshowvis = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2593,9 +2485,9 @@
         url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
         sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hideshowvis.html";
         license = lib.licenses.free;
       };
     }
@@ -2603,7 +2495,6 @@
   highlight-parentheses = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2615,9 +2506,9 @@
         url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar";
         sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html";
+        homepage = "https://elpa.nongnu.org/nongnu/highlight-parentheses.html";
         license = lib.licenses.free;
       };
     }
@@ -2625,7 +2516,6 @@
   hl-block-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2637,9 +2527,9 @@
         url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar";
         sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hl-block-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hl-block-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2647,7 +2537,6 @@
   hl-column = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2659,9 +2548,9 @@
         url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar";
         sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hl-column.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hl-column.html";
         license = lib.licenses.free;
       };
     }
@@ -2682,7 +2571,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/htmlize.html";
+        homepage = "https://elpa.nongnu.org/nongnu/htmlize.html";
         license = lib.licenses.free;
       };
     }
@@ -2691,7 +2580,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -2710,7 +2598,6 @@
       };
       packageRequires = [
         compat
-        emacs
         map
         persist
         plz
@@ -2718,7 +2605,7 @@
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/hyperdrive.html";
+        homepage = "https://elpa.nongnu.org/nongnu/hyperdrive.html";
         license = lib.licenses.free;
       };
     }
@@ -2726,7 +2613,6 @@
   idle-highlight-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2738,9 +2624,9 @@
         url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar";
         sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/idle-highlight-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2749,7 +2635,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       prop-menu,
@@ -2764,11 +2649,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         prop-menu
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/idris-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/idris-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2789,7 +2673,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/iedit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/iedit.html";
         license = lib.licenses.free;
       };
     }
@@ -2798,7 +2682,6 @@
     {
       clojure-mode,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2810,12 +2693,9 @@
         url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
         sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb";
       };
-      packageRequires = [
-        clojure-mode
-        emacs
-      ];
+      packageRequires = [ clojure-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inf-clojure.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inf-clojure.html";
         license = lib.licenses.free;
       };
     }
@@ -2823,7 +2703,6 @@
   inf-ruby = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2835,9 +2714,9 @@
         url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar";
         sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inf-ruby.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inf-ruby.html";
         license = lib.licenses.free;
       };
     }
@@ -2845,7 +2724,6 @@
   inkpot-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -2857,9 +2735,9 @@
         url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar";
         sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/inkpot-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/inkpot-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -2868,7 +2746,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -2883,11 +2760,10 @@
       };
       packageRequires = [
         compat
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/iwindow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/iwindow.html";
         license = lib.licenses.free;
       };
     }
@@ -2908,7 +2784,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/j-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/j-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2929,7 +2805,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jade-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/jade-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2950,7 +2826,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/jinja2-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/jinja2-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2971,7 +2847,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/julia-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/julia-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -2980,24 +2856,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "keycast";
       ename = "keycast";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
-        sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
+        url = "https://elpa.nongnu.org/nongnu/keycast-1.4.1.tar";
+        sha256 = "0xpdz6fqvmx6ha20c957r4psz393r0ag7ml971x21v035r3gfx8r";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/keycast.html";
+        homepage = "https://elpa.nongnu.org/nongnu/keycast.html";
         license = lib.licenses.free;
       };
     }
@@ -3005,7 +2877,6 @@
   kotlin-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3017,9 +2888,9 @@
         url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
         sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/kotlin-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3040,7 +2911,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html";
+        homepage = "https://elpa.nongnu.org/nongnu/lorem-ipsum.html";
         license = lib.licenses.free;
       };
     }
@@ -3048,7 +2919,6 @@
   lua-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3060,9 +2930,9 @@
         url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar";
         sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/lua-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/lua-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3088,67 +2958,71 @@
         compat
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/macrostep.html";
+        homepage = "https://elpa.nongnu.org/nongnu/macrostep.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   magit = callPackage (
     {
+      compat,
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       git-commit,
       lib,
       magit-section,
+      seq,
       transient,
       with-editor,
     }:
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar";
-        sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z";
+        url = "https://elpa.nongnu.org/nongnu/magit-4.0.0.tar";
+        sha256 = "0sii8gr69j29fzvcdyabnabldkvi6r5dpiamfs3bsmh66vf8wvjh";
       };
       packageRequires = [
+        compat
         dash
-        emacs
         git-commit
         magit-section
+        seq
         transient
         with-editor
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/magit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/magit.html";
         license = lib.licenses.free;
       };
     }
   ) { };
   magit-section = callPackage (
     {
+      compat,
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
+      seq,
     }:
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "3.3.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar";
-        sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny";
+        url = "https://elpa.nongnu.org/nongnu/magit-section-4.0.0.tar";
+        sha256 = "1dyw275qfnpz7fs1s952b9fl9vgfzfk8aiclznfhhl43nvxxglb7";
       };
       packageRequires = [
+        compat
         dash
-        emacs
+        seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/magit-section.html";
+        homepage = "https://elpa.nongnu.org/nongnu/magit-section.html";
         license = lib.licenses.free;
       };
     }
@@ -3156,7 +3030,6 @@
   markdown-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3168,9 +3041,9 @@
         url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar";
         sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/markdown-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3178,7 +3051,6 @@
   mastodon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       persist,
@@ -3187,18 +3059,17 @@
     elpaBuild {
       pname = "mastodon";
       ename = "mastodon";
-      version = "1.0.24";
+      version = "1.0.26";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
-        sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
+        url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.26.tar";
+        sha256 = "1p4nzgw8rf7zx4z17nn7bdh106qdhb54m20dkkz43wr4dgqp61bn";
       };
       packageRequires = [
-        emacs
         persist
         request
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mastodon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mastodon.html";
         license = lib.licenses.free;
       };
     }
@@ -3206,7 +3077,6 @@
   material-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3218,9 +3088,9 @@
         url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar";
         sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/material-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/material-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3229,7 +3099,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -3246,13 +3115,12 @@
       };
       packageRequires = [
         async
-        emacs
         seq
         url-scgi
         xml-rpc
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mentor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mentor.html";
         license = lib.licenses.free;
       };
     }
@@ -3260,7 +3128,6 @@
   meow = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3272,9 +3139,9 @@
         url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
         sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/meow.html";
+        homepage = "https://elpa.nongnu.org/nongnu/meow.html";
         license = lib.licenses.free;
       };
     }
@@ -3282,7 +3149,6 @@
   minibar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3294,9 +3160,9 @@
         url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar";
         sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/minibar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/minibar.html";
         license = lib.licenses.free;
       };
     }
@@ -3317,7 +3183,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/moe-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/moe-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3338,7 +3204,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/monokai-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/monokai-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3347,7 +3213,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       json ? null,
       lib,
@@ -3363,12 +3228,11 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         json
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/mpv.html";
+        homepage = "https://elpa.nongnu.org/nongnu/mpv.html";
         license = lib.licenses.free;
       };
     }
@@ -3389,7 +3253,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/multiple-cursors.html";
+        homepage = "https://elpa.nongnu.org/nongnu/multiple-cursors.html";
         license = lib.licenses.free;
       };
     }
@@ -3397,7 +3261,6 @@
   nasm-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3409,9 +3272,9 @@
         url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar";
         sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nasm-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nasm-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3432,7 +3295,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nginx-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nginx-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3440,7 +3303,6 @@
   nix-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit-section,
@@ -3455,12 +3317,11 @@
         sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g";
       };
       packageRequires = [
-        emacs
         magit-section
         transient
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/nix-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/nix-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3468,7 +3329,6 @@
   oblivion-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3480,9 +3340,9 @@
         url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar";
         sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/oblivion-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/oblivion-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -3490,7 +3350,6 @@
   opam-switch-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3502,9 +3361,9 @@
         url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar";
         sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/opam-switch-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3513,7 +3372,6 @@
     {
       async,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3525,12 +3383,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar";
         sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd";
       };
-      packageRequires = [
-        async
-        emacs
-      ];
+      packageRequires = [ async ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-auto-tangle.html";
         license = lib.licenses.free;
       };
     }
@@ -3538,7 +3393,6 @@
   org-contrib = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3551,12 +3405,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar";
         sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-contrib.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-contrib.html";
         license = lib.licenses.free;
       };
     }
@@ -3564,7 +3415,6 @@
   org-drill = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3580,13 +3430,12 @@
         sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg";
       };
       packageRequires = [
-        emacs
         org
         persist
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-drill.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-drill.html";
         license = lib.licenses.free;
       };
     }
@@ -3594,7 +3443,6 @@
   org-journal = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3607,12 +3455,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar";
         sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-journal.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-journal.html";
         license = lib.licenses.free;
       };
     }
@@ -3620,21 +3465,20 @@
   org-mime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "org-mime";
       ename = "org-mime";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
-        sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd";
+        url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.3.tar";
+        sha256 = "1ylsdfifa4ykrf5vncnnj6v2bgc3ixlskgxb1v7qggmkb5mzy2yv";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-mime.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-mime.html";
         license = lib.licenses.free;
       };
     }
@@ -3656,7 +3500,7 @@
       };
       packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-present.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-present.html";
         license = lib.licenses.free;
       };
     }
@@ -3664,7 +3508,6 @@
   org-superstar = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org,
@@ -3677,12 +3520,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
         sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g";
       };
-      packageRequires = [
-        emacs
-        org
-      ];
+      packageRequires = [ org ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-superstar.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-superstar.html";
         license = lib.licenses.free;
       };
     }
@@ -3690,7 +3530,6 @@
   org-transclusion-http = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       org-transclusion,
@@ -3705,12 +3544,11 @@
         sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
       };
       packageRequires = [
-        emacs
         org-transclusion
         plz
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-transclusion-http.html";
         license = lib.licenses.free;
       };
     }
@@ -3718,7 +3556,6 @@
   org-tree-slide = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3730,9 +3567,9 @@
         url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar";
         sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/org-tree-slide.html";
+        homepage = "https://elpa.nongnu.org/nongnu/org-tree-slide.html";
         license = lib.licenses.free;
       };
     }
@@ -3741,7 +3578,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       magit,
@@ -3750,19 +3586,18 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "1.9.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar";
-        sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll";
+        url = "https://elpa.nongnu.org/nongnu/orgit-2.0.0.tar";
+        sha256 = "16i702ziy5z9zrmgz55bky0nar2hy55mkllswf7pgk8x4aihlda0";
       };
       packageRequires = [
         compat
-        emacs
         magit
         org
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/orgit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/orgit.html";
         license = lib.licenses.free;
       };
     }
@@ -3783,7 +3618,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/p4-16-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/p4-16-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -3791,7 +3626,6 @@
   package-lint = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       let-alist,
       lib,
@@ -3804,12 +3638,9 @@
         url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar";
         sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg";
       };
-      packageRequires = [
-        emacs
-        let-alist
-      ];
+      packageRequires = [ let-alist ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/package-lint.html";
+        homepage = "https://elpa.nongnu.org/nongnu/package-lint.html";
         license = lib.licenses.free;
       };
     }
@@ -3818,7 +3649,6 @@
     {
       dash,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3830,12 +3660,9 @@
         url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar";
         sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9";
       };
-      packageRequires = [
-        dash
-        emacs
-      ];
+      packageRequires = [ dash ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pacmacs.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pacmacs.html";
         license = lib.licenses.free;
       };
     }
@@ -3843,7 +3670,6 @@
   page-break-lines = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3855,9 +3681,9 @@
         url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar";
         sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/page-break-lines.html";
+        homepage = "https://elpa.nongnu.org/nongnu/page-break-lines.html";
         license = lib.licenses.free;
       };
     }
@@ -3878,7 +3704,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/paredit.html";
+        homepage = "https://elpa.nongnu.org/nongnu/paredit.html";
         license = lib.licenses.free;
       };
     }
@@ -3886,7 +3712,6 @@
   parseclj = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3898,9 +3723,9 @@
         url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar";
         sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parseclj.html";
+        homepage = "https://elpa.nongnu.org/nongnu/parseclj.html";
         license = lib.licenses.free;
       };
     }
@@ -3908,7 +3733,6 @@
   parseedn = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       map,
@@ -3923,12 +3747,11 @@
         sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak";
       };
       packageRequires = [
-        emacs
         map
         parseclj
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/parseedn.html";
+        homepage = "https://elpa.nongnu.org/nongnu/parseedn.html";
         license = lib.licenses.free;
       };
     }
@@ -3936,7 +3759,6 @@
   pcmpl-args = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3948,9 +3770,9 @@
         url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
         sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pcmpl-args.html";
         license = lib.licenses.free;
       };
     }
@@ -3958,7 +3780,6 @@
   pcre2el = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -3970,9 +3791,9 @@
         url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar";
         sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pcre2el.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pcre2el.html";
         license = lib.licenses.free;
       };
     }
@@ -3980,7 +3801,6 @@
   pdf-tools = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       let-alist,
       lib,
@@ -3995,12 +3815,11 @@
         sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc";
       };
       packageRequires = [
-        emacs
         let-alist
         tablist
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/pdf-tools.html";
+        homepage = "https://elpa.nongnu.org/nongnu/pdf-tools.html";
         license = lib.licenses.free;
       };
     }
@@ -4008,7 +3827,6 @@
   php-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4020,9 +3838,9 @@
         url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar";
         sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/php-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/php-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4030,7 +3848,6 @@
   popon = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4042,9 +3859,9 @@
         url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar";
         sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/popon.html";
+        homepage = "https://elpa.nongnu.org/nongnu/popon.html";
         license = lib.licenses.free;
       };
     }
@@ -4052,7 +3869,6 @@
   popup = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4064,9 +3880,9 @@
         url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar";
         sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/popup.html";
+        homepage = "https://elpa.nongnu.org/nongnu/popup.html";
         license = lib.licenses.free;
       };
     }
@@ -4074,7 +3890,6 @@
   projectile = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4086,9 +3901,9 @@
         url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar";
         sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/projectile.html";
+        homepage = "https://elpa.nongnu.org/nongnu/projectile.html";
         license = lib.licenses.free;
       };
     }
@@ -4096,7 +3911,6 @@
   proof-general = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4108,9 +3922,9 @@
         url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar";
         sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/proof-general.html";
+        homepage = "https://elpa.nongnu.org/nongnu/proof-general.html";
         license = lib.licenses.free;
       };
     }
@@ -4119,7 +3933,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4131,12 +3944,9 @@
         url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar";
         sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw";
       };
-      packageRequires = [
-        cl-lib
-        emacs
-      ];
+      packageRequires = [ cl-lib ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/prop-menu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/prop-menu.html";
         license = lib.licenses.free;
       };
     }
@@ -4144,21 +3954,20 @@
   racket-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20240621.124732";
+      version = "1.0.20240813.124142";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
-        sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240813.124142.tar";
+        sha256 = "0arsrq5lp8a6s6gh2dwc4m43f7gmhrwlpgxn6xsglscpvhlrair8";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/racket-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/racket-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4179,7 +3988,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rainbow-delimiters.html";
         license = lib.licenses.free;
       };
     }
@@ -4187,7 +3996,6 @@
   raku-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4199,9 +4007,9 @@
         url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
         sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/raku-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/raku-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4209,7 +4017,6 @@
   recomplete = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4221,9 +4028,9 @@
         url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar";
         sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/recomplete.html";
+        homepage = "https://elpa.nongnu.org/nongnu/recomplete.html";
         license = lib.licenses.free;
       };
     }
@@ -4231,7 +4038,6 @@
   reformatter = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4243,9 +4049,9 @@
         url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar";
         sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/reformatter.html";
+        homepage = "https://elpa.nongnu.org/nongnu/reformatter.html";
         license = lib.licenses.free;
       };
     }
@@ -4253,7 +4059,6 @@
   request = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4265,9 +4070,9 @@
         url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
         sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/request.html";
+        homepage = "https://elpa.nongnu.org/nongnu/request.html";
         license = lib.licenses.free;
       };
     }
@@ -4275,7 +4080,6 @@
   rfc-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4287,9 +4091,9 @@
         url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar";
         sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rfc-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4297,7 +4101,6 @@
   rubocop = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4309,9 +4112,9 @@
         url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar";
         sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rubocop.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rubocop.html";
         license = lib.licenses.free;
       };
     }
@@ -4319,7 +4122,6 @@
   rust-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4331,9 +4133,9 @@
         url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar";
         sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/rust-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/rust-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4355,7 +4157,7 @@
       };
       packageRequires = [ haml-mode ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sass-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sass-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4364,7 +4166,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4376,12 +4177,9 @@
         url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
         sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scad-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scad-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4395,14 +4193,14 @@
     elpaBuild {
       pname = "scala-mode";
       ename = "scala-mode";
-      version = "0.23";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar";
-        sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2";
+        url = "https://elpa.nongnu.org/nongnu/scala-mode-1.1.0.tar";
+        sha256 = "1x3vw4fzy1z6gavnbsm4lnwzkp47zd8gasvxxvfk57qn09hpwixh";
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scala-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scala-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4410,7 +4208,6 @@
   scroll-on-drag = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4422,9 +4219,9 @@
         url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar";
         sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scroll-on-drag.html";
         license = lib.licenses.free;
       };
     }
@@ -4432,7 +4229,6 @@
   scroll-on-jump = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4444,9 +4240,9 @@
         url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar";
         sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html";
+        homepage = "https://elpa.nongnu.org/nongnu/scroll-on-jump.html";
         license = lib.licenses.free;
       };
     }
@@ -4454,7 +4250,6 @@
   sesman = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4466,9 +4261,9 @@
         url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar";
         sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sesman.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sesman.html";
         license = lib.licenses.free;
       };
     }
@@ -4476,7 +4271,6 @@
   shellcop = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4488,9 +4282,9 @@
         url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
         sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/shellcop.html";
+        homepage = "https://elpa.nongnu.org/nongnu/shellcop.html";
         license = lib.licenses.free;
       };
     }
@@ -4498,7 +4292,6 @@
   slime = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       macrostep,
@@ -4511,12 +4304,9 @@
         url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar";
         sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f";
       };
-      packageRequires = [
-        emacs
-        macrostep
-      ];
+      packageRequires = [ macrostep ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/slime.html";
+        homepage = "https://elpa.nongnu.org/nongnu/slime.html";
         license = lib.licenses.free;
       };
     }
@@ -4524,7 +4314,6 @@
   sly = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4536,9 +4325,9 @@
         url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
         sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sly.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sly.html";
         license = lib.licenses.free;
       };
     }
@@ -4559,7 +4348,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/smartparens.html";
+        homepage = "https://elpa.nongnu.org/nongnu/smartparens.html";
         license = lib.licenses.free;
       };
     }
@@ -4567,7 +4356,6 @@
   solarized-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4579,9 +4367,9 @@
         url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar";
         sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/solarized-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/solarized-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4589,7 +4377,6 @@
   spacemacs-theme = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4601,9 +4388,9 @@
         url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar";
         sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spacemacs-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/spacemacs-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4611,7 +4398,6 @@
   spell-fu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4623,9 +4409,9 @@
         url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar";
         sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/spell-fu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/spell-fu.html";
         license = lib.licenses.free;
       };
     }
@@ -4633,7 +4419,6 @@
   sqlite3 = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4645,9 +4430,9 @@
         url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar";
         sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sqlite3.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sqlite3.html";
         license = lib.licenses.free;
       };
     }
@@ -4668,7 +4453,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/stylus-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4689,7 +4474,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/subatomic-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/subatomic-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4697,7 +4482,6 @@
   subed = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4709,9 +4493,9 @@
         url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
         sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/subed.html";
+        homepage = "https://elpa.nongnu.org/nongnu/subed.html";
         license = lib.licenses.free;
       };
     }
@@ -4720,7 +4504,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4732,12 +4515,9 @@
         url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar";
         sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/sweeprolog.html";
+        homepage = "https://elpa.nongnu.org/nongnu/sweeprolog.html";
         license = lib.licenses.free;
       };
     }
@@ -4745,7 +4525,6 @@
   swift-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -4758,12 +4537,9 @@
         url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
         sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv";
       };
-      packageRequires = [
-        emacs
-        seq
-      ];
+      packageRequires = [ seq ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/swift-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/swift-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4793,7 +4569,6 @@
   symbol-overlay = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4805,9 +4580,9 @@
         url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar";
         sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/symbol-overlay.html";
+        homepage = "https://elpa.nongnu.org/nongnu/symbol-overlay.html";
         license = lib.licenses.free;
       };
     }
@@ -4815,7 +4590,6 @@
   systemd = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4827,9 +4601,9 @@
         url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar";
         sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/systemd.html";
+        homepage = "https://elpa.nongnu.org/nongnu/systemd.html";
         license = lib.licenses.free;
       };
     }
@@ -4837,7 +4611,6 @@
   tablist = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4849,9 +4622,9 @@
         url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar";
         sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tablist.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tablist.html";
         license = lib.licenses.free;
       };
     }
@@ -4872,7 +4645,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tangotango-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tangotango-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -4882,7 +4655,6 @@
       cl-generic,
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       seq,
@@ -4898,11 +4670,10 @@
       packageRequires = [
         cl-generic
         cl-lib
-        emacs
         seq
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/telephone-line.html";
+        homepage = "https://elpa.nongnu.org/nongnu/telephone-line.html";
         license = lib.licenses.free;
       };
     }
@@ -4910,7 +4681,6 @@
   testcover-mark-line = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4922,9 +4692,9 @@
         url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar";
         sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html";
+        homepage = "https://elpa.nongnu.org/nongnu/testcover-mark-line.html";
         license = lib.licenses.free;
       };
     }
@@ -4945,7 +4715,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/textile-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/textile-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -4966,7 +4736,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/toc-org.html";
+        homepage = "https://elpa.nongnu.org/nongnu/toc-org.html";
         license = lib.licenses.free;
       };
     }
@@ -4975,7 +4745,6 @@
     {
       base32,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -4987,12 +4756,9 @@
         url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar";
         sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5";
       };
-      packageRequires = [
-        base32
-        emacs
-      ];
+      packageRequires = [ base32 ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/totp-auth.html";
+        homepage = "https://elpa.nongnu.org/nongnu/totp-auth.html";
         license = lib.licenses.free;
       };
     }
@@ -5000,7 +4766,6 @@
   treeview = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5012,9 +4777,9 @@
         url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
         sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/treeview.html";
+        homepage = "https://elpa.nongnu.org/nongnu/treeview.html";
         license = lib.licenses.free;
       };
     }
@@ -5023,7 +4788,6 @@
     {
       caml,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5035,12 +4799,9 @@
         url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
         sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj";
       };
-      packageRequires = [
-        caml
-        emacs
-      ];
+      packageRequires = [ caml ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/tuareg.html";
+        homepage = "https://elpa.nongnu.org/nongnu/tuareg.html";
         license = lib.licenses.free;
       };
     }
@@ -5048,7 +4809,6 @@
   typescript-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5060,9 +4820,9 @@
         url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar";
         sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/typescript-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/typescript-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5083,7 +4843,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ujelly-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ujelly-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -5091,7 +4851,6 @@
   undo-fu = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5103,9 +4862,9 @@
         url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar";
         sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/undo-fu.html";
+        homepage = "https://elpa.nongnu.org/nongnu/undo-fu.html";
         license = lib.licenses.free;
       };
     }
@@ -5113,7 +4872,6 @@
   undo-fu-session = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5125,9 +4883,9 @@
         url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
         sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/undo-fu-session.html";
+        homepage = "https://elpa.nongnu.org/nongnu/undo-fu-session.html";
         license = lib.licenses.free;
       };
     }
@@ -5148,7 +4906,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vc-fossil.html";
+        homepage = "https://elpa.nongnu.org/nongnu/vc-fossil.html";
         license = lib.licenses.free;
       };
     }
@@ -5156,7 +4914,6 @@
   vcomplete = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5168,9 +4925,9 @@
         url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
         sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/vcomplete.html";
+        homepage = "https://elpa.nongnu.org/nongnu/vcomplete.html";
         license = lib.licenses.free;
       };
     }
@@ -5178,7 +4935,6 @@
   visual-fill-column = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5190,9 +4946,9 @@
         url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar";
         sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/visual-fill-column.html";
+        homepage = "https://elpa.nongnu.org/nongnu/visual-fill-column.html";
         license = lib.licenses.free;
       };
     }
@@ -5200,21 +4956,20 @@
   web-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "web-mode";
       ename = "web-mode";
-      version = "17.3.19";
+      version = "17.3.20";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar";
-        sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p";
+        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.20.tar";
+        sha256 = "1l4bmvc53ma2n3y143k86ip0w4am65zwxnl36lzqavs1hr55qvb2";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/web-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/web-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5223,7 +4978,6 @@
     {
       cl-lib ? null,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       request,
@@ -5238,11 +4992,10 @@
       };
       packageRequires = [
         cl-lib
-        emacs
         request
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/webpaste.html";
+        homepage = "https://elpa.nongnu.org/nongnu/webpaste.html";
         license = lib.licenses.free;
       };
     }
@@ -5250,7 +5003,6 @@
   wfnames = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5262,9 +5014,9 @@
         url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar";
         sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wfnames.html";
+        homepage = "https://elpa.nongnu.org/nongnu/wfnames.html";
         license = lib.licenses.free;
       };
     }
@@ -5272,7 +5024,6 @@
   wgrep = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5284,9 +5035,9 @@
         url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar";
         sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/wgrep.html";
+        homepage = "https://elpa.nongnu.org/nongnu/wgrep.html";
         license = lib.licenses.free;
       };
     }
@@ -5294,7 +5045,6 @@
   why-this = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5306,9 +5056,9 @@
         url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar";
         sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/why-this.html";
+        homepage = "https://elpa.nongnu.org/nongnu/why-this.html";
         license = lib.licenses.free;
       };
     }
@@ -5317,24 +5067,20 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.3.4";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
-        sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
+        url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.1.tar";
+        sha256 = "0nhlr2qjn351p0vd8vdnrwsb6wi2klh5ny84k90m8kzwcmvglhfd";
       };
-      packageRequires = [
-        compat
-        emacs
-      ];
+      packageRequires = [ compat ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/with-editor.html";
+        homepage = "https://elpa.nongnu.org/nongnu/with-editor.html";
         license = lib.licenses.free;
       };
     }
@@ -5342,7 +5088,6 @@
   with-simulated-input = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5354,9 +5099,9 @@
         url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar";
         sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/with-simulated-input.html";
+        homepage = "https://elpa.nongnu.org/nongnu/with-simulated-input.html";
         license = lib.licenses.free;
       };
     }
@@ -5365,7 +5110,6 @@
     {
       compat,
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       project,
@@ -5380,11 +5124,10 @@
       };
       packageRequires = [
         compat
-        emacs
         project
       ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/workroom.html";
+        homepage = "https://elpa.nongnu.org/nongnu/workroom.html";
         license = lib.licenses.free;
       };
     }
@@ -5405,7 +5148,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/writegood-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/writegood-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5426,7 +5169,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/ws-butler.html";
+        homepage = "https://elpa.nongnu.org/nongnu/ws-butler.html";
         license = lib.licenses.free;
       };
     }
@@ -5434,21 +5177,20 @@
   xah-fly-keys = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "25.9.20240703220947";
+      version = "25.9.20240725161125";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
-        sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240725161125.tar";
+        sha256 = "1kkis9qrfks40dlibkn4f75al0h61ixdw30a45ql09nsg4n5rzky";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xah-fly-keys.html";
         license = lib.licenses.free;
       };
     }
@@ -5470,7 +5212,7 @@
       };
       packageRequires = [ json ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xkcd.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xkcd.html";
         license = lib.licenses.free;
       };
     }
@@ -5478,7 +5220,6 @@
   xml-rpc = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5490,9 +5231,9 @@
         url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar";
         sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
+        homepage = "https://elpa.nongnu.org/nongnu/xml-rpc.html";
         license = lib.licenses.free;
       };
     }
@@ -5500,7 +5241,6 @@
   yaml-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
     }:
@@ -5512,9 +5252,9 @@
         url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar";
         sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7";
       };
-      packageRequires = [ emacs ];
+      packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yaml-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/yaml-mode.html";
         license = lib.licenses.free;
       };
     }
@@ -5536,7 +5276,7 @@
       };
       packageRequires = [ yasnippet ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html";
+        homepage = "https://elpa.nongnu.org/nongnu/yasnippet-snippets.html";
         license = lib.licenses.free;
       };
     }
@@ -5557,7 +5297,7 @@
       };
       packageRequires = [ ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zenburn-theme.html";
+        homepage = "https://elpa.nongnu.org/nongnu/zenburn-theme.html";
         license = lib.licenses.free;
       };
     }
@@ -5565,7 +5305,6 @@
   zig-mode = callPackage (
     {
       elpaBuild,
-      emacs,
       fetchurl,
       lib,
       reformatter,
@@ -5578,12 +5317,9 @@
         url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar";
         sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87";
       };
-      packageRequires = [
-        emacs
-        reformatter
-      ];
+      packageRequires = [ reformatter ];
       meta = {
-        homepage = "https://elpa.gnu.org/packages/zig-mode.html";
+        homepage = "https://elpa.nongnu.org/nongnu/zig-mode.html";
         license = lib.licenses.free;
       };
     }

From de35646e516fd72d875c51c01975b67e92a10beb Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 20 Aug 2024 23:19:18 +0800
Subject: [PATCH 225/235] nongnu-devel-packages: updated 2024-08-20 (from
 overlay)

---
 .../elisp-packages/nongnu-devel-generated.nix | 208 ++++++++++--------
 1 file changed, 118 insertions(+), 90 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index 45ab57b45f72..c416ba6cdb34 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -305,10 +305,10 @@
     elpaBuild {
       pname = "beancount";
       ename = "beancount";
-      version = "0.9.0.20240623.232746";
+      version = "0.9.0.20240801.232930";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240623.232746.tar";
-        sha256 = "0h5cfjdvm1dx5dmdz8i3nk7h2kjs3w224jjb9c1agj3m6bh2kjbm";
+        url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240801.232930.tar";
+        sha256 = "0mjf5nsp4zpck6nrqrbzk4xwkwglngs1nv8vdifdzgfdj1gxc8l0";
       };
       packageRequires = [ ];
       meta = {
@@ -544,10 +544,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "1.15.1.0.20240723.73804";
+      version = "1.15.1.0.20240815.91839";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240723.73804.tar";
-        sha256 = "0l0fj27b0xxbv3y513i6jqc92bazcgbcrr8ij7vy7r5s14cin9x3";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240815.91839.tar";
+        sha256 = "0bp0f886gmka3ryb8yr8qspwl5rxnca38yn6fhrwnm5ga8j11d90";
       };
       packageRequires = [
         clojure-mode
@@ -774,10 +774,10 @@
     elpaBuild {
       pname = "d-mode";
       ename = "d-mode";
-      version = "202405290611.0.20240722.23216";
+      version = "202408131340.0.20240813.65913";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202405290611.0.20240722.23216.tar";
-        sha256 = "1ldl6pb1dk75zgmf92x35zv5wxn6hhj9ljj33kyf3pbw3jpmaljw";
+        url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20240813.65913.tar";
+        sha256 = "1lf78x8bkb41mr5p8api0f447z9k5yd2v9w97qw6l4dxcj2dldv5";
       };
       packageRequires = [ ];
       meta = {
@@ -859,10 +859,10 @@
     elpaBuild {
       pname = "diff-ansi";
       ename = "diff-ansi";
-      version = "0.2.0.20240616.234552";
+      version = "0.2.0.20240818.235912";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240616.234552.tar";
-        sha256 = "12cb4h3w6j0hissma1p9q173q9g379b01h8359wrj9ynbyrvdbsh";
+        url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240818.235912.tar";
+        sha256 = "085h7xb75dkdmsnc572rmqgzw1pp4jmxcfrr3nnpbvirgjij8pma";
       };
       packageRequires = [ ];
       meta = {
@@ -944,10 +944,10 @@
     elpaBuild {
       pname = "drupal-mode";
       ename = "drupal-mode";
-      version = "0.7.4.0.20220125.104446";
+      version = "0.8.1.0.20240816.123653";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/drupal-mode-0.7.4.0.20220125.104446.tar";
-        sha256 = "03j8qa0yh382mr5jzlgyh60v9xaln1a3rs101cvnd9sibbw08p4g";
+        url = "https://elpa.nongnu.org/nongnu-devel/drupal-mode-0.8.1.0.20240816.123653.tar";
+        sha256 = "135h1bm7zyk2nhcx6j3nc7n0fi180sld655212sin650hidiygnl";
       };
       packageRequires = [ php-mode ];
       meta = {
@@ -1029,10 +1029,10 @@
     elpaBuild {
       pname = "editorconfig";
       ename = "editorconfig";
-      version = "0.11.0.0.20240728.171401";
+      version = "0.11.0.0.20240813.80135";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240728.171401.tar";
-        sha256 = "0hjmhg81yrbxz307id9vfys91nfsbhbsx29w00rgiy8b80c63ycy";
+        url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240813.80135.tar";
+        sha256 = "1ak09a6ay4234x4x9b8k6mqayb99129yk0p45iv782xsyc9r05h8";
       };
       packageRequires = [ ];
       meta = {
@@ -1092,10 +1092,10 @@
     elpaBuild {
       pname = "emacsql";
       ename = "emacsql";
-      version = "3.1.1.50snapshot0.20240714.182430";
+      version = "4.0.1.0.20240819.155921";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-3.1.1.50snapshot0.20240714.182430.tar";
-        sha256 = "03x0niccgc3iscz2pdbc86x4haf75kmp090knmsc1h5qwx5b2mxi";
+        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.1.0.20240819.155921.tar";
+        sha256 = "0xm5b913ja85rw7h7fjhbzz288brsgd8xiq5wi7f8s8dwkbmqdv4";
       };
       packageRequires = [ ];
       meta = {
@@ -1136,10 +1136,10 @@
     elpaBuild {
       pname = "evil";
       ename = "evil";
-      version = "1.15.0.0.20240721.204520";
+      version = "1.15.0.0.20240810.165559";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240721.204520.tar";
-        sha256 = "1fqxqzdlrm9i7ipkn0yvn18yh8yi3mqilnadm389k1lylw4aqamj";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240810.165559.tar";
+        sha256 = "0a406n947j8blv7yrx691bjfgfqmkbpszxjdvwq5hda0mrc9g2kl";
       };
       packageRequires = [
         cl-lib
@@ -1878,10 +1878,10 @@
     elpaBuild {
       pname = "geiser-guile";
       ename = "geiser-guile";
-      version = "0.28.1.0.20240712.120235";
+      version = "0.28.2.0.20240811.112008";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.1.0.20240712.120235.tar";
-        sha256 = "1hvqxzjnygsg74cjlhnk9c22rwwizwnn5zkb1g7f8ifykzmvmxr7";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.2.0.20240811.112008.tar";
+        sha256 = "144543qkxxycnailc8m7fhfqz4c8wphi9xc4b4p2cc009zn51xqs";
       };
       packageRequires = [
         geiser
@@ -1994,10 +1994,10 @@
     elpaBuild {
       pname = "git-commit";
       ename = "git-commit";
-      version = "3.3.0.50snapshot0.20240727.200453";
+      version = "4.0.0.0.20240818.190757";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/git-commit-3.3.0.50snapshot0.20240727.200453.tar";
-        sha256 = "0whszyd51qzkng3fxpbr4p6vvly6b8w6n6879dq7swv0r9al4rdf";
+        url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240818.190757.tar";
+        sha256 = "057xpp0w1hyb2c8h0sr4lnpyr5hphgb9yn27rq5jqhwkn8v9r8b2";
       };
       packageRequires = [
         compat
@@ -2021,10 +2021,10 @@
     elpaBuild {
       pname = "git-modes";
       ename = "git-modes";
-      version = "1.4.3.0.20240713.191814";
+      version = "1.4.4.0.20240805.132007";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.3.0.20240713.191814.tar";
-        sha256 = "1rlr9cvz9vnxdzrwbr9vcs5wis6a987yr465c5mhqly8m506jmn2";
+        url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.4.0.20240805.132007.tar";
+        sha256 = "0gbgjdk6gi1898nbxj2wbiifbmld42v4s2zsckgqv4r5pxdwc6ai";
       };
       packageRequires = [ compat ];
       meta = {
@@ -2033,6 +2033,34 @@
       };
     }
   ) { };
+  gnosis = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacsql,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "gnosis";
+      ename = "gnosis";
+      version = "0.4.1.0.20240818.212703";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.1.0.20240818.212703.tar";
+        sha256 = "1nw13pfbgfja5c70zpmcrm6wqvps4zchskj26x1fh171233m8wln";
+      };
+      packageRequires = [
+        compat
+        emacsql
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gnosis.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   gnu-apl-mode = callPackage (
     {
       elpaBuild,
@@ -2191,10 +2219,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.0.0.20240724.131301";
+      version = "0.9.0.0.20240814.85808";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240724.131301.tar";
-        sha256 = "0acyy66gxdm134k9k2jag69y7sk7c56x8grmq0b7xq919ixdjky4";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240814.85808.tar";
+        sha256 = "0kpd0fypky0mwfb1lfyd3jbpr2lxispx02nqiz3a61zziljgdazd";
       };
       packageRequires = [
         compat
@@ -2367,10 +2395,10 @@
     elpaBuild {
       pname = "helm";
       ename = "helm";
-      version = "3.9.9.0.20240728.45939";
+      version = "3.9.9.0.20240818.123128";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240728.45939.tar";
-        sha256 = "0gbnn8d0aki55l959pxbhzp5039zzjijxga5lbiwgh9h5dnj3kan";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240818.123128.tar";
+        sha256 = "01zj0bi9189nbpgp88sdpl61ly1xhqaf33cp8k41sfpka3v0g24f";
       };
       packageRequires = [
         helm-core
@@ -2392,10 +2420,10 @@
     elpaBuild {
       pname = "helm-core";
       ename = "helm-core";
-      version = "3.9.9.0.20240728.45939";
+      version = "3.9.9.0.20240818.123128";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240728.45939.tar";
-        sha256 = "1fz4vrk85df684vsgy38iwrsvdhz4ydriws09bkzicx3nxmyh8rj";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240818.123128.tar";
+        sha256 = "185acikmdvzlwjnac7xkh5agzihka1h6r8ng3ma05gwdxkxnb28s";
       };
       packageRequires = [ async ];
       meta = {
@@ -2525,10 +2553,10 @@
     elpaBuild {
       pname = "hyperdrive";
       ename = "hyperdrive";
-      version = "0.4pre0.20240728.163952";
+      version = "0.4pre0.20240818.142318";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240728.163952.tar";
-        sha256 = "00c67xdm2rypdcxd5v0n683csnd4abiyn85mbly66vkjiw472fi8";
+        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240818.142318.tar";
+        sha256 = "0ggsxw2s974l7m4v8p3f535fz13d0z15gwpx6pp7k3rrs5was9vp";
       };
       packageRequires = [
         compat
@@ -2797,10 +2825,10 @@
     elpaBuild {
       pname = "keycast";
       ename = "keycast";
-      version = "1.4.0.0.20240713.191915";
+      version = "1.4.1.0.20240805.132239";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.0.0.20240713.191915.tar";
-        sha256 = "13kmc4gif26mgwdvc6zid095i6qlyrhzbl3lv10hzli28n0jqqdm";
+        url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.1.0.20240805.132239.tar";
+        sha256 = "1afmj52zcr8sdh2ijw0xhxv5p713mw85f4q9rizrpbcx3pw0xmbj";
       };
       packageRequires = [ compat ];
       meta = {
@@ -2914,10 +2942,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "3.3.0.50snapshot0.20240727.200453";
+      version = "4.0.0.0.20240817.175213";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-3.3.0.50snapshot0.20240727.200453.tar";
-        sha256 = "1ba1wkw56h0srxvms02ifvvp817p6rs501grcaqkmi70cp73lvkp";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.0.0.0.20240817.175213.tar";
+        sha256 = "1abp8d21dm8ygmmmx2bhq1wsz23w259l110743zyx77jbrynizci";
       };
       packageRequires = [
         compat
@@ -2946,10 +2974,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "3.3.0.50snapshot0.20240727.200453";
+      version = "4.0.0.0.20240818.190757";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-3.3.0.50snapshot0.20240727.200453.tar";
-        sha256 = "1d16s26yzgzd9rz3jnvxj67aq5zn3hgsfksv4jb87vvnnfq2f7hk";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.0.0.0.20240818.190757.tar";
+        sha256 = "1bm8k9a8x06310099s71s11igh838fk4k26nb0gsd8xp1szima38";
       };
       packageRequires = [
         compat
@@ -2973,10 +3001,10 @@
     elpaBuild {
       pname = "mastodon";
       ename = "mastodon";
-      version = "1.0.24.0.20240701.160422";
+      version = "1.0.26.0.20240816.70908";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.24.0.20240701.160422.tar";
-        sha256 = "0h2q0wwlcsaz5ck8758l893spmg3hl6g4jpj7mgbc0qhv2bw1vzf";
+        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.26.0.20240816.70908.tar";
+        sha256 = "0nayg2py0n2m1ldpl1hwmiqv7yzvjxbbwndzxwipak0wvjzw0psl";
       };
       packageRequires = [
         persist
@@ -3048,10 +3076,10 @@
     elpaBuild {
       pname = "meow";
       ename = "meow";
-      version = "1.4.5.0.20240712.182147";
+      version = "1.4.5.0.20240818.154515";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240712.182147.tar";
-        sha256 = "1bq8aybbs0nfzinsw3l64naygsxpjvpckism0n8i3kyriq275pj8";
+        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240818.154515.tar";
+        sha256 = "0n716x8vyk44n4cw1rw68b747n2r3hvagx4asbhjck8mprnlw6z7";
       };
       packageRequires = [ ];
       meta = {
@@ -3378,10 +3406,10 @@
     elpaBuild {
       pname = "org-mime";
       ename = "org-mime";
-      version = "0.3.2.0.20240129.232731";
+      version = "0.3.3.0.20240818.24342";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.2.0.20240129.232731.tar";
-        sha256 = "1a9pjvn9w138b4417gkdvcjvw9d68pqx5g6sjplldf6z23p3d6bp";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.3.0.20240818.24342.tar";
+        sha256 = "0xg73swqd6dff1nh4z2jhhvj9ssq65wymq3jlbyb1nscm3g4lr83";
       };
       packageRequires = [ ];
       meta = {
@@ -3493,10 +3521,10 @@
     elpaBuild {
       pname = "orgit";
       ename = "orgit";
-      version = "1.9.0.0.20240713.192819";
+      version = "2.0.0.0.20240808.194549";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/orgit-1.9.0.0.20240713.192819.tar";
-        sha256 = "0gb73cyxhqi4cflnha9dzcnvs8l7nb3ksskq8psfdrs4h6ra3xhm";
+        url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.0.0.20240808.194549.tar";
+        sha256 = "14ql24z977myihyn5hv4ivayzfpj580dhr7rgwwb6yqzj8j1bz4l";
       };
       packageRequires = [
         compat
@@ -3782,10 +3810,10 @@
     elpaBuild {
       pname = "projectile";
       ename = "projectile";
-      version = "2.9.0snapshot0.20240212.110040";
+      version = "2.9.0snapshot0.20240814.185449";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240212.110040.tar";
-        sha256 = "0gbci7zwfwj8g69dla72arj3s5w49y6wgwcrilnlfmm3fc1h9lqy";
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240814.185449.tar";
+        sha256 = "059pjfr5gqmd7mrpxmkgasqaqcbhp8q0nj9dhrwqrlfm6g5xgg1q";
       };
       packageRequires = [ ];
       meta = {
@@ -3846,10 +3874,10 @@
     elpaBuild {
       pname = "racket-mode";
       ename = "racket-mode";
-      version = "1.0.20240718.150548";
+      version = "1.0.20240813.124142";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240718.150548.tar";
-        sha256 = "1kp29m0cjsq9hfy73z9rgzvl8c8ag4mb49hkh5y6w6f8pjv36va7";
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240813.124142.tar";
+        sha256 = "0ypqv36wibcagkqpjwl3mwpqa4k59wns6kb1v55w2gywnk6qgv1y";
       };
       packageRequires = [ ];
       meta = {
@@ -4189,10 +4217,10 @@
     elpaBuild {
       pname = "slime";
       ename = "slime";
-      version = "2.30snapshot0.20240705.225542";
+      version = "2.30snapshot0.20240731.151818";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240705.225542.tar";
-        sha256 = "1rl0zpip9qpkcb5hqj3xbamrarmcvpjxhnbms9kzqay3xws5i214";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240731.151818.tar";
+        sha256 = "16xbiwqbp2zpppymxxwkbg1qmahih6dfb535dfa47b26j2wschhp";
       };
       packageRequires = [ macrostep ];
       meta = {
@@ -4210,10 +4238,10 @@
     elpaBuild {
       pname = "sly";
       ename = "sly";
-      version = "1.0.43.0.20240501.111815";
+      version = "1.0.43.0.20240809.211904";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240501.111815.tar";
-        sha256 = "0zpcad35ig5ci2a4rd9v3146c12mj7c9zhafwxvbmjhzd5aqfv82";
+        url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240809.211904.tar";
+        sha256 = "1np4rciwcijr6bv13s5vvl95wl28ad60snr6wdbjh7ya922x37rv";
       };
       packageRequires = [ ];
       meta = {
@@ -4273,10 +4301,10 @@
     elpaBuild {
       pname = "spacemacs-theme";
       ename = "spacemacs-theme";
-      version = "0.2.0.20240715.144003";
+      version = "0.2.0.20240815.213429";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240715.144003.tar";
-        sha256 = "14d22bdm33jbwv9dphqydgww93scqdfbkjg80iivb48s0br86qld";
+        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240815.213429.tar";
+        sha256 = "1g7fzghy5nmz8v8vx5y6g3cwc2n9c1ryr09nrdfz3zlrv7r32df6";
       };
       packageRequires = [ ];
       meta = {
@@ -4854,10 +4882,10 @@
     elpaBuild {
       pname = "vm";
       ename = "vm";
-      version = "8.3.0snapshot0.20240724.160938";
+      version = "8.3.0snapshot0.20240814.44941";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240724.160938.tar";
-        sha256 = "14xcgbi52dbs3kiqci810l7hjvxln00ifib21d6hisx0lhs5743l";
+        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240814.44941.tar";
+        sha256 = "1w5a0jm22xr6m1i2c5gghgy159dpqndkqhkyma3sagx5bmdsldrb";
       };
       packageRequires = [
         cl-lib
@@ -4878,10 +4906,10 @@
     elpaBuild {
       pname = "web-mode";
       ename = "web-mode";
-      version = "17.3.19.0.20240413.145507";
+      version = "17.3.20.0.20240804.82110";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.19.0.20240413.145507.tar";
-        sha256 = "1vx54jl4r0nw3bpdphn206ia7x4a0pf8sdfsh46qx4jva5mgvg6j";
+        url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.20.0.20240804.82110.tar";
+        sha256 = "17r0jhcgxnc1k42yxaw1i7wwyb0sp311a1gz8bdjax0zn05ki4xc";
       };
       packageRequires = [ ];
       meta = {
@@ -4989,10 +5017,10 @@
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.4.0.0.20240725.142901";
+      version = "3.4.1.0.20240816.195813";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.0.0.20240725.142901.tar";
-        sha256 = "076a9gs6d298fvhk5sl2pf520pvknswcgbb6v7cwqhczcqj6wncm";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.1.0.20240816.195813.tar";
+        sha256 = "1z9c5ymia0g8mpx0nszrbw0yy23a7f91kyqxpvx544kbxh6k62dy";
       };
       packageRequires = [ compat ];
       meta = {

From d00775c1d9a3acbff2d121fbae54691a7f07d18a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 18 Aug 2024 14:18:02 +0200
Subject: [PATCH 226/235] stdenv: create `env-vars` file before writing data to
 it

This fixes the regression introduced by c47a1e701df7f00352b8cf401fa79c0d2f5fcc59
on Darwin. The creation of the file using `install` and process
substitution does not work on Darwin, you get the following complain:
```
install: skipping file '/dev/fd/63', as it was replaced while being copied
```

Fixes #335016
---
 pkgs/stdenv/generic/setup.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ef645e4e513e..1b4f7a89d358 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1121,7 +1121,13 @@ substituteAllInPlace() {
 # the environment used for building.
 dumpVars() {
     if [ "${noDumpEnvVars:-0}" != 1 ]; then
-        install -m 0600 <(export 2>/dev/null) "$NIX_BUILD_TOP/env-vars" || true
+        # On darwin, install(1) cannot be called with /dev/stdin or fd from process substitution
+        # so first we create the file and then write to it
+        # See https://github.com/NixOS/nixpkgs/issues/335016
+        {
+            install -m 0600 /dev/null "$NIX_BUILD_TOP/env-vars" &&
+            export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars"
+        } || true
     fi
 }
 

From 87f3fbade567e21d023651d82f8454a2de209ddc Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 21 Aug 2024 22:49:38 +0900
Subject: [PATCH 227/235] python312Packages.ipython: 8.25.0 -> 8.26.0

Changelog: https://github.com/ipython/ipython/blob/8.26.0/docs/source/whatsnew/version8.rst
---
 pkgs/development/python-modules/ipython/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index af34d35c647d..982234507d02 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -36,19 +36,19 @@
   # Test dependencies
   pickleshare,
   pytest-asyncio,
-  pytest7CheckHook,
+  pytestCheckHook,
   testpath,
 }:
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "8.25.0";
+  version = "8.26.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xu1yahQLbnJbkRUo+AQ5xTT6yRUkavPvw5RAprD51xY=";
+    hash = "sha256-HOwPu6hASvE/rOvoPQRDanQ0x0AOWfR6z0Z8ZKvQlWw=";
   };
 
   build-system = [ setuptools ];
@@ -87,13 +87,13 @@ buildPythonPackage rec {
 
     # doctests try to fetch an image from the internet
     substituteInPlace pyproject.toml \
-      --replace '"--ipdoctest-modules",' '"--ipdoctest-modules", "--ignore=IPython/core/display.py",'
+      --replace-fail '"--ipdoctest-modules",' '"--ipdoctest-modules", "--ignore=IPython/core/display.py",'
   '';
 
   nativeCheckInputs = [
     pickleshare
     pytest-asyncio
-    pytest7CheckHook
+    pytestCheckHook
     testpath
   ];
 

From 881fc844c4170099862054f0d5a854a081d275dd Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 21 Aug 2024 22:58:01 +0900
Subject: [PATCH 228/235] python312Packages.ipython: add teams.jupyter.members
 as maintainer

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

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 982234507d02..e13f14a2411e 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -117,6 +117,6 @@ buildPythonPackage rec {
     homepage = "https://ipython.org/";
     changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ bjornfor ];
+    maintainers = with maintainers; [ bjornfor ] ++ teams.jupyter.members;
   };
 }

From 007088359e7a0b438f42387cb59c0479ba81df83 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 17 Aug 2024 10:58:13 +0200
Subject: [PATCH 229/235] python3: break infinite recursion

Checking if bluez is a derivation requires evaluating whether an
emulator is available (in the case that gobject-introspection is
available), which when cross compiling requires evaluating qemu, which
requires evaluating libxml2, which requires evaluating Python.

The recursion break happens in the Python expression because it's the
thing behaving unusually, by forcing evaluation of all of its
arguments, even ones that are optional and unused.

Fixes: 8b3a4a617e54 ("bluez: fix when gobject-introspection unsupported")
---
 pkgs/development/interpreters/python/cpython/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 4128edeaa532..d753942e019f 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -130,7 +130,8 @@ let
 
   passthru = let
     # When we override the interpreter we also need to override the spliced versions of the interpreter
-    inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs;
+    # bluez is excluded manually to break an infinite recursion.
+    inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && ! lib.isDerivation v) inputs;
     override = attr: let python = attr.override (inputs' // { self = python; }); in python;
   in passthruFun rec {
     inherit self sourceVersion packageOverrides;

From a805299f6234608b064787f979f573c45738979e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 22 Aug 2024 13:17:41 +0300
Subject: [PATCH 230/235] pipewire: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 27b5eff1f1ae..2ffd9eb2bf3f 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -58,7 +58,7 @@
 
 stdenv.mkDerivation(finalAttrs: {
   pname = "pipewire";
-  version = "1.2.2";
+  version = "1.2.3";
 
   outputs = [
     "out"
@@ -74,7 +74,7 @@ stdenv.mkDerivation(finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-neLQ41p2f2QyOS3r2VxanaHbiVj6nnnkT7kx/On0azM=";
+    sha256 = "sha256-sdbv1PqLMGlRXe42pgNW5tNtQ3tEYWCwndZQQQEM6ig=";
   };
 
   patches = [

From 3c3626cc2c0b9cc7b785a0ea52ef5103338d2cbb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 22 Aug 2024 12:45:09 +0200
Subject: [PATCH 231/235] python312Packages.fastapi: disable flaky test

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

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index f4e5b5cb513f..81e51b02150f 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -104,6 +104,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Coverage test
     "test_fastapi_cli"
+    # ResourceWarning: Unclosed <MemoryObjectSendStream>
+    "test_openapi_schema"
   ];
 
   disabledTestPaths = [

From 73288a2c8a5702cfac95ab1690274f520266bbd5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 22 Aug 2024 13:10:39 +0300
Subject: [PATCH 232/235] hyprland: fix build

Apply the patch fixing wayland.xml discovery.
---
 pkgs/by-name/hy/hyprland/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index e098f80cce7a..aa38597344c0 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   makeWrapper,
   cmake,
@@ -75,6 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=";
   };
 
+  patches = [
+    # https://github.com/hyprwm/Hyprland/pull/7467
+    (fetchpatch {
+      url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff";
+      hash = "sha256-Y0P4rY6HyPN8Y5Kowlgyj0PiAHh6nqPRAQ4iFT0l4E8=";
+    })
+  ];
+
   postPatch = ''
     # Fix hardcoded paths to /usr installation
     sed -i "s#/usr#$out#" src/render/OpenGL.cpp

From cc390828efcd16cb1c32899471cafc53c0821662 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 23 Aug 2024 00:38:42 +0200
Subject: [PATCH 233/235] vim: 9.1.0679 -> 9.1.0689

Fixes GHSA-v2x2-cjcg-f9jm

https://www.openwall.com/lists/oss-security/2024/08/22/3
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index a54ad6321339..4113157d4f24 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.0679";
+  version = "9.1.0689";
 
   outputs = [ "out" "xxd" ];
 
@@ -8,7 +8,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-o8GQfHw7KNjDx4zrCfZXyViS9WGiYD3tzS8inq0xqh0=";
+    hash = "sha256-87y/STnGB2Yf64TMwCd6VCFF2kvy+DmNyaXVKPIc86E=";
   };
 
   enableParallelBuilding = true;

From ca5230ce0b5a0b75f11aeec9c61103c477b5ea6e Mon Sep 17 00:00:00 2001
From: Victor Freire <25647735+ratsclub@users.noreply.github.com>
Date: Thu, 22 Aug 2024 22:33:08 -0300
Subject: [PATCH 234/235] python3Packages.certifi: 2024.02.02 -> 2024.07.04
 (#329697)

https://github.com/certifi/python-certifi/compare/2024.02.02...2024.07.04
---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 81c083972298..e72fc1b07e45 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2024.02.02";
+  version = "2024.07.04";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python-certifi";
     rev = version;
-    hash = "sha256-gnWJjZy5E/0lvAeLftXNtcHH6RHL/dUomXOBgumiWX8=";
+    hash = "sha256-ArJB19tPpwTT1LjYo8OF1+Mo//l8FaMHTpvSvlfve3Q=";
   };
 
   patches = [

From 7d687638c5e0b09632fd70ba466ab1e544228436 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 23 Aug 2024 07:08:21 +0100
Subject: [PATCH 235/235] aquamarine: drop upstreamed patch

Without the change build fails on `staging` as:

       > applying patch /nix/store/k9x1wxd1rs8jada4lwjll841n54hd46h-CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
       > patching file CMakeLists.txt
       > Reversed (or previously applied) patch detected!  Assume -R? [n]
       > Apply anyway? [n]
       > Skipping patch.
       > 2 out of 2 hunks ignored -- saving rejects to file CMakeLists.txt.rej
---
 ...nd.xml-is-in-wayland-scanner-pkgdata.patch | 37 -------------------
 pkgs/by-name/aq/aquamarine/package.nix        |  3 --
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch

diff --git a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
deleted file mode 100644
index dbce9fe936f1..000000000000
--- a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 735130758ee6fca74115ca4ec89c6d0dd26777eb Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Mon, 19 Aug 2024 14:17:37 +0300
-Subject: [PATCH] CMakeLists: wayland.xml is in wayland-scanner pkgdatadir
-
-See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc4db31..a61e375 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,8 +71,8 @@ endif()
- # Protocols
- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
- message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
--pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir)
--message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}")
-+pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir)
-+message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}")
- 
- function(protocolNew protoPath protoName external)
-   if(external)
-@@ -94,7 +94,7 @@ function(protocolWayland)
-     OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
-            ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
-     COMMAND hyprwayland-scanner --wayland-enums --client
--            ${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
-+            ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-   target_sources(aquamarine PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
- endfunction()
--- 
-2.45.2
-
diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index 76bb6a56b81c..0bc91bde511b 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U=";
   };
 
-  # https://github.com/hyprwm/aquamarine/pull/55
-  patches = [ ./CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch ];
-
   nativeBuildInputs = [
     cmake
     hyprwayland-scanner